nx 22.5.0-beta.0 → 22.5.0-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "22.5.0-beta.0",
+  "version": "22.5.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": {
@@ -45,6 +45,7 @@
     "cliui": "^8.0.1",
     "dotenv": "~16.4.5",
     "dotenv-expand": "~11.0.6",
+    "ejs": "^3.1.7",
     "enquirer": "~2.3.6",
     "figures": "3.2.0",
     "flat": "^5.0.2",
@@ -71,8 +72,8 @@
     "yargs-parser": "21.1.1"
   },
   "peerDependencies": {
-    "@swc-node/register": "^1.8.0",
-    "@swc/core": "^1.3.85"
+    "@swc-node/register": "^1.11.1",
+    "@swc/core": "^1.15.5"
   },
   "peerDependenciesMeta": {
     "@swc-node/register": {
@@ -83,16 +84,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-arm64": "22.5.0-beta.0",
-    "@nx/nx-darwin-x64": "22.5.0-beta.0",
-    "@nx/nx-freebsd-x64": "22.5.0-beta.0",
-    "@nx/nx-linux-arm-gnueabihf": "22.5.0-beta.0",
-    "@nx/nx-linux-arm64-gnu": "22.5.0-beta.0",
-    "@nx/nx-linux-arm64-musl": "22.5.0-beta.0",
-    "@nx/nx-linux-x64-gnu": "22.5.0-beta.0",
-    "@nx/nx-linux-x64-musl": "22.5.0-beta.0",
-    "@nx/nx-win32-arm64-msvc": "22.5.0-beta.0",
-    "@nx/nx-win32-x64-msvc": "22.5.0-beta.0"
+    "@nx/nx-darwin-arm64": "22.5.0-beta.2",
+    "@nx/nx-darwin-x64": "22.5.0-beta.2",
+    "@nx/nx-freebsd-x64": "22.5.0-beta.2",
+    "@nx/nx-linux-arm-gnueabihf": "22.5.0-beta.2",
+    "@nx/nx-linux-arm64-gnu": "22.5.0-beta.2",
+    "@nx/nx-linux-arm64-musl": "22.5.0-beta.2",
+    "@nx/nx-linux-x64-gnu": "22.5.0-beta.2",
+    "@nx/nx-linux-x64-musl": "22.5.0-beta.2",
+    "@nx/nx-win32-arm64-msvc": "22.5.0-beta.2",
+    "@nx/nx-win32-x64-msvc": "22.5.0-beta.2"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/src/ai/clone-ai-config-repo.d.ts

@@ -0,0 +1,12 @@
+/**
+ * Get the path to the cached nx-ai-agents-config repository.
+ * Uses a commit-hash based caching strategy:
+ * 1. Fetches the latest commit hash from the remote repository
+ * 2. Checks if a cached version exists for that hash
+ * 3. If not, clones the repository and cleans up old caches
+ *
+ * @returns The path to the cached repository
+ * @throws Error if unable to fetch or clone the repository
+ */
+export declare function getAiConfigRepoPath(): string;
+//# sourceMappingURL=clone-ai-config-repo.d.ts.map

package/src/ai/clone-ai-config-repo.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"clone-ai-config-repo.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/ai/clone-ai-config-repo.ts"],"names":[],"mappings":"AAuHA;;;;;;;;;GASG;AACH,wBAAgB,mBAAmB,IAAI,MAAM,CAiB5C"}

package/src/ai/clone-ai-config-repo.js

@@ -0,0 +1,136 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getAiConfigRepoPath = getAiConfigRepoPath;
+const child_process_1 = require("child_process");
+const fs_1 = require("fs");
+const os_1 = require("os");
+const path_1 = require("path");
+const REPO_URL = 'https://github.com/nrwl/nx-ai-agents-config';
+const CACHE_DIR = (0, path_1.join)((0, os_1.tmpdir)(), 'nx-ai-agents-config');
+/**
+ * Get the latest commit hash from the remote repository.
+ * Uses `git ls-remote` to fetch the HEAD commit hash without cloning.
+ */
+function getLatestCommitHash() {
+    try {
+        const output = (0, child_process_1.execSync)(`git ls-remote ${REPO_URL} HEAD`, {
+            encoding: 'utf-8',
+            stdio: ['pipe', 'pipe', 'pipe'],
+            timeout: 30000, // 30 second timeout
+        });
+        const hash = output.split('\t')[0];
+        if (!hash || hash.length < 10) {
+            throw new Error('Invalid commit hash received');
+        }
+        // Return first 10 characters of the commit hash
+        return hash.substring(0, 10);
+    }
+    catch (error) {
+        throw new Error(`Failed to fetch latest commit hash from ${REPO_URL}. Please check your network connection.`);
+    }
+}
+/**
+ * Clone the repository to the specified path using shallow clone.
+ */
+function cloneRepo(targetPath) {
+    try {
+        // Ensure parent directory exists
+        (0, fs_1.mkdirSync)(CACHE_DIR, { recursive: true });
+        // Use a temporary path first to avoid race conditions
+        const tempPath = `${targetPath}.tmp.${process.pid}`;
+        // Clean up any leftover temp directory
+        if ((0, fs_1.existsSync)(tempPath)) {
+            (0, fs_1.rmSync)(tempPath, { recursive: true, force: true });
+        }
+        (0, child_process_1.execSync)(`git clone --depth 1 ${REPO_URL} "${tempPath}"`, {
+            encoding: 'utf-8',
+            stdio: ['pipe', 'pipe', 'pipe'],
+            timeout: 120000, // 2 minute timeout for clone
+        });
+        // Remove .git directory after clone
+        const gitDir = (0, path_1.join)(tempPath, '.git');
+        if ((0, fs_1.existsSync)(gitDir)) {
+            (0, fs_1.rmSync)(gitDir, { recursive: true, force: true });
+        }
+        // Atomically move temp directory to final location
+        // If targetPath already exists (race condition), just clean up temp
+        if ((0, fs_1.existsSync)(targetPath)) {
+            (0, fs_1.rmSync)(tempPath, { recursive: true, force: true });
+        }
+        else {
+            // Rename is atomic on the same filesystem
+            try {
+                (0, fs_1.renameSync)(tempPath, targetPath);
+            }
+            catch {
+                // Rename failed - check if another process won the race
+                if ((0, fs_1.existsSync)(targetPath)) {
+                    // Another process created it, clean up our temp
+                    (0, fs_1.rmSync)(tempPath, { recursive: true, force: true });
+                }
+                else {
+                    // targetPath still doesn't exist - retry once
+                    try {
+                        (0, fs_1.renameSync)(tempPath, targetPath);
+                    }
+                    catch (retryError) {
+                        // Clean up and fail
+                        (0, fs_1.rmSync)(tempPath, { recursive: true, force: true });
+                        throw new Error(`Failed to move cloned repository to cache location: ${retryError.message}`);
+                    }
+                }
+            }
+        }
+    }
+    catch (error) {
+        // Re-throw if it's already our error (from rename failure)
+        if (error instanceof Error && error.message.startsWith('Failed to move')) {
+            throw error;
+        }
+        throw new Error(`Failed to clone ${REPO_URL}. Please check your network connection.`);
+    }
+}
+/**
+ * Clean up old cached versions, keeping only the current one.
+ */
+function cleanupOldCaches(currentCommitHash) {
+    if (!(0, fs_1.existsSync)(CACHE_DIR)) {
+        return;
+    }
+    try {
+        const entries = (0, fs_1.readdirSync)(CACHE_DIR, { withFileTypes: true });
+        for (const entry of entries) {
+            if (entry.isDirectory() && entry.name !== currentCommitHash) {
+                const oldCachePath = (0, path_1.join)(CACHE_DIR, entry.name);
+                (0, fs_1.rmSync)(oldCachePath, { recursive: true, force: true });
+            }
+        }
+    }
+    catch {
+        // Ignore cleanup errors - not critical
+    }
+}
+/**
+ * Get the path to the cached nx-ai-agents-config repository.
+ * Uses a commit-hash based caching strategy:
+ * 1. Fetches the latest commit hash from the remote repository
+ * 2. Checks if a cached version exists for that hash
+ * 3. If not, clones the repository and cleans up old caches
+ *
+ * @returns The path to the cached repository
+ * @throws Error if unable to fetch or clone the repository
+ */
+function getAiConfigRepoPath() {
+    // 1. Get latest commit hash (first 10 chars)
+    const commitHash = getLatestCommitHash();
+    // 2. Check if cached version exists
+    const cachedPath = (0, path_1.join)(CACHE_DIR, commitHash);
+    if ((0, fs_1.existsSync)(cachedPath)) {
+        return cachedPath;
+    }
+    // 3. Clone fresh
+    cloneRepo(cachedPath);
+    // 4. Clean up old cached versions
+    cleanupOldCaches(commitHash);
+    return cachedPath;
+}

package/src/ai/constants.d.ts

@@ -3,7 +3,7 @@ export declare function geminiMdPath(root: string): string;
 export declare function parseGeminiSettings(root: string): any | undefined;
 export declare function geminiSettingsPath(root: string): string;
 export declare function claudeMdPath(root: string): string;
-export declare function claudeMcpPath(root: string): string;
+export declare function opencodeMcpPath(root: string): string;
 export declare const codexConfigTomlPath: string;
 export declare const nxRulesMarkerCommentStart = "<!-- nx configuration start-->";
 export declare const nxRulesMarkerCommentDescription = "<!-- Leave the start & end comments to automatically receive updates. -->";

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,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAElD;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":"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,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"}

package/src/ai/constants.js

@@ -6,7 +6,7 @@ exports.geminiMdPath = geminiMdPath;
 exports.parseGeminiSettings = parseGeminiSettings;
 exports.geminiSettingsPath = geminiSettingsPath;
 exports.claudeMdPath = claudeMdPath;
-exports.claudeMcpPath = claudeMcpPath;
+exports.opencodeMcpPath = opencodeMcpPath;
 exports.getNxMcpTomlConfig = getNxMcpTomlConfig;
 const os_1 = require("os");
 const path_1 = require("path");
@@ -34,8 +34,8 @@ function geminiSettingsPath(root) {
 function claudeMdPath(root) {
     return (0, path_1.join)(root, 'CLAUDE.md');
 }
-function claudeMcpPath(root) {
-    return (0, path_1.join)(root, '.mcp.json');
+function opencodeMcpPath(root) {
+    return (0, path_1.join)(root, 'opencode.json');
 }
 exports.codexConfigTomlPath = (0, path_1.join)((0, os_1.homedir)(), '.codex', 'config.toml');
 exports.nxRulesMarkerCommentStart = `<!-- nx configuration start-->`;

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,UAY7C"}
+{"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,UAU7C"}

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

@@ -7,10 +7,8 @@ function getAgentRules(nxCloud) {
 
 - 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
 - You have access to the Nx MCP server and its tools, use them to help the user
-- When answering questions about the repository, use the \`nx_workspace\` tool first to gain an understanding of the workspace architecture where applicable.
-- When working in individual projects, use the \`nx_project_details\` mcp tool to analyze and understand the specific project structure and dependencies
-- For questions around nx configuration, best practices or if you're unsure, use the \`nx_docs\` tool to get relevant, up-to-date docs. Always use this instead of assuming things about nx configuration
-- If the user needs help with an Nx configuration or project graph error, use the \`nx_workspace\` tool to get any errors
+- For understanding the workspace structure, projects, or available tasks, use the \`/nx-workspace\` skill which provides guidance on exploring Nx workspaces
+- For questions around nx configuration, best practices or if you're unsure, use the \`nx_docs\` MCP tool to get relevant, up-to-date docs. Always use this instead of assuming things about nx configuration
 - For Nx plugin best practices, check \`node_modules/@nx/<plugin>/PLUGIN.md\`. Not all plugins have this file - proceed without it if unavailable.
 `;
 }

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

@@ -1,3 +1,5 @@
+import type { Agent } from '../utils';
+
 export type SetupAiAgentsGeneratorSchema = {
   directory: string;
   writeNxCloudRules?: boolean;

package/src/ai/set-up-ai-agents/schema.json

@@ -25,9 +25,9 @@
       "description": "The agents to setup Nx configuration for.",
       "items": {
         "type": "string",
-        "enum": ["claude", "gemini", "codex", "cursor", "copilot"]
+        "enum": ["claude", "gemini", "codex", "cursor", "copilot", "opencode"]
       },
-      "default": ["claude", "gemini", "codex", "cursor", "copilot"]
+      "default": ["claude", "gemini", "codex", "cursor", "copilot", "opencode"]
     }
   },
   "required": ["directory"]

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;AAQ7C,OAAO,EACL,qBAAqB,EACrB,oBAAoB,EACrB,MAAM,oBAAoB,CAAC;AAkB5B,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,CAwJ7C;AA2DD,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":"AAWA,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,CAuN7C;AAkFD,eAAe,sBAAsB,CAAC"}

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

@@ -7,12 +7,14 @@ 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");
+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 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");
 /**
@@ -76,17 +78,43 @@ async function setupAiAgentsGeneratorImpl(tree, options) {
     const nxVersion = getNxVersion();
     const agentsMd = (0, constants_1.agentsMdPath)(options.directory);
     // write AGENTS.md for most agents
-    if (hasAgent('cursor') || hasAgent('copilot') || hasAgent('codex')) {
+    if (hasAgent('cursor') ||
+        hasAgent('copilot') ||
+        hasAgent('codex') ||
+        hasAgent('opencode')) {
         writeAgentRules(tree, agentsMd, options.writeNxCloudRules);
     }
     if (hasAgent('claude')) {
         const claudePath = (0, path_1.join)(options.directory, 'CLAUDE.md');
         writeAgentRules(tree, claudePath, options.writeNxCloudRules);
-        const mcpJsonPath = (0, path_1.join)(options.directory, '.mcp.json');
-        if (!tree.exists(mcpJsonPath)) {
-            (0, json_1.writeJson)(tree, mcpJsonPath, {});
+        // Configure Claude plugin via marketplace (plugin includes MCP server)
+        const claudeSettingsPath = (0, path_1.join)(options.directory, '.claude', 'settings.json');
+        if (!tree.exists(claudeSettingsPath)) {
+            (0, json_1.writeJson)(tree, claudeSettingsPath, {});
         }
-        (0, json_1.updateJson)(tree, mcpJsonPath, (json) => mcpConfigUpdater(json, nxVersion));
+        (0, json_1.updateJson)(tree, claudeSettingsPath, (json) => ({
+            ...json,
+            extraKnownMarketplaces: {
+                ...json.extraKnownMarketplaces,
+                'nx-claude-plugins': {
+                    source: {
+                        source: 'github',
+                        repo: 'nrwl/nx-ai-agents-config',
+                    },
+                },
+            },
+            enabledPlugins: {
+                ...json.enabledPlugins,
+                'nx@nx-claude-plugins': true,
+            },
+        }));
+    }
+    if (hasAgent('opencode')) {
+        const opencodeMcpJsonPath = (0, constants_1.opencodeMcpPath)(options.directory);
+        if (!tree.exists(opencodeMcpJsonPath)) {
+            (0, json_1.writeJson)(tree, opencodeMcpJsonPath, {});
+        }
+        (0, json_1.updateJson)(tree, opencodeMcpJsonPath, (json) => opencodeMcpConfigUpdater(json, nxVersion));
     }
     if (hasAgent('gemini')) {
         const geminiSettingsPath = (0, path_1.join)(options.directory, '.gemini', 'settings.json');
@@ -108,6 +136,29 @@ async function setupAiAgentsGeneratorImpl(tree, options) {
             writeAgentRules(tree, contextFileName ?? geminiMd, options.writeNxCloudRules);
         }
     }
+    // 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)();
+        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/.codex', dest: '.codex' },
+            { agent: 'gemini', src: 'generated/.gemini', dest: '.gemini' },
+        ];
+        for (const { agent, src, dest } of agentDirs) {
+            if (hasAgent(agent)) {
+                const srcPath = (0, path_1.join)(repoPath, src);
+                if ((0, fs_1.existsSync)(srcPath)) {
+                    (0, generate_files_1.generateFiles)(tree, srcPath, (0, path_1.join)(options.directory, dest), {});
+                }
+            }
+        }
+    }
     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) => {
@@ -244,4 +295,25 @@ function mcpConfigUpdater(existing, nxVersion) {
     }
     return existing;
 }
+function opencodeMcpConfigUpdater(existing, nxVersion) {
+    const majorVersion = (0, semver_1.major)(nxVersion);
+    const mcpCommand = majorVersion >= 22 ? ['npx', 'nx', 'mcp'] : ['npx', 'nx-mcp'];
+    if (existing.mcp) {
+        existing.mcp['nx-mcp'] = {
+            type: 'local',
+            command: mcpCommand,
+            enabled: true,
+        };
+    }
+    else {
+        existing.mcp = {
+            'nx-mcp': {
+                type: 'local',
+                command: mcpCommand,
+                enabled: true,
+            },
+        };
+    }
+    return existing;
+}
 exports.default = setupAiAgentsGenerator;

package/src/ai/utils.d.ts

@@ -1,4 +1,4 @@
-export declare const supportedAgents: readonly ["claude", "codex", "copilot", "cursor", "gemini"];
+export declare const supportedAgents: readonly ["claude", "codex", "copilot", "cursor", "gemini", "opencode"];
 export type Agent = (typeof supportedAgents)[number];
 export declare const agentDisplayMap: Record<Agent, string>;
 export type AgentConfiguration = {

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,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;AAyJD,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;AAoLD,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

@@ -21,6 +21,7 @@ exports.supportedAgents = [
     'copilot',
     'cursor',
     'gemini',
+    'opencode',
 ];
 exports.agentDisplayMap = {
     claude: 'Claude Code',
@@ -28,6 +29,7 @@ exports.agentDisplayMap = {
     codex: 'OpenAI Codex',
     copilot: 'GitHub Copilot for VSCode',
     cursor: 'Cursor',
+    opencode: 'OpenCode',
 };
 async function getAgentConfigurations(agentsToConsider, workspaceRoot) {
     const nonConfiguredAgents = [];
@@ -61,22 +63,24 @@ async function getAgentConfiguration(agent, workspaceRoot) {
     let agentConfiguration;
     switch (agent) {
         case 'claude': {
-            const mcpPath = (0, constants_1.claudeMcpPath)(workspaceRoot);
-            let mcpConfigured;
+            // Claude uses a plugin from marketplace which includes the MCP server
+            const claudeSettingsPath = (0, path_1.resolve)(workspaceRoot, '.claude', 'settings.json');
+            let pluginConfigured;
             try {
-                const mcpContents = (0, fileutils_1.readJsonFile)(mcpPath);
-                mcpConfigured = !!mcpContents?.['mcpServers']?.['nx-mcp'];
+                const settingsContents = (0, fileutils_1.readJsonFile)(claudeSettingsPath);
+                pluginConfigured =
+                    !!settingsContents?.['enabledPlugins']?.['nx@nx-claude-plugins'];
             }
             catch {
-                mcpConfigured = false;
+                pluginConfigured = false;
             }
             const rulesPath = (0, constants_1.claudeMdPath)(workspaceRoot);
             const rulesExists = (0, fs_1.existsSync)(rulesPath);
             agentConfiguration = {
                 rules: rulesExists,
-                mcp: mcpConfigured,
+                mcp: pluginConfigured,
                 rulesPath: rulesPath,
-                mcpPath: mcpPath,
+                mcpPath: claudeSettingsPath,
             };
             break;
         }
@@ -154,6 +158,27 @@ async function getAgentConfiguration(agent, workspaceRoot) {
             };
             break;
         }
+        case 'opencode': {
+            const rulesPath = (0, constants_1.agentsMdPath)(workspaceRoot);
+            const agentsMdExists = (0, fs_1.existsSync)(rulesPath);
+            const mcpPath = (0, constants_1.opencodeMcpPath)(workspaceRoot);
+            let mcpConfigured;
+            try {
+                const mcpContents = (0, fileutils_1.readJsonFile)(mcpPath);
+                // OpenCode uses 'mcp' property, not 'mcpServers'
+                mcpConfigured = !!mcpContents?.['mcp']?.['nx-mcp'];
+            }
+            catch {
+                mcpConfigured = false;
+            }
+            agentConfiguration = {
+                mcp: mcpConfigured,
+                rules: agentsMdExists,
+                rulesPath,
+                mcpPath,
+            };
+            break;
+        }
     }
     return {
         ...agentConfiguration,

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

@@ -10,7 +10,7 @@ exports.yargsConfigureAiAgentsCommand = {
         type: 'array',
         string: true,
         description: 'List of AI agents to set up.',
-        choices: ['claude', 'codex', 'copilot', 'cursor', 'gemini'],
+        choices: ['claude', 'codex', 'copilot', 'cursor', 'gemini', 'opencode'],
     })
         .option('interactive', {
         type: 'boolean',

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

@@ -1 +1 @@
-{"version":3,"file":"import.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/import/import.ts"],"names":[],"mappings":"AAsCA,MAAM,WAAW,aAAa;IAC5B;;OAEG;IACH,gBAAgB,EAAE,MAAM,CAAC;IACzB;;OAEG;IACH,GAAG,EAAE,MAAM,CAAC;IACZ;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;IACpB;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,OAAO,CAAC;CACtB;AAED,wBAAsB,aAAa,CAAC,OAAO,EAAE,aAAa,iBA4TzD"}
+{"version":3,"file":"import.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/import/import.ts"],"names":[],"mappings":"AAwCA,MAAM,WAAW,aAAa;IAC5B;;OAEG;IACH,gBAAgB,EAAE,MAAM,CAAC;IACzB;;OAEG;IACH,GAAG,EAAE,MAAM,CAAC;IACZ;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;IACpB;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,OAAO,CAAC;CACtB;AAED,wBAAsB,aAAa,CAAC,OAAO,EAAE,aAAa,iBAmUzD"}

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

@@ -12,6 +12,7 @@ const output_1 = require("../../utils/output");
 const createSpinner = require('ora');
 const init_v2_1 = require("../init/init-v2");
 const nx_json_1 = require("../../config/nx-json");
+const fileutils_1 = require("../../utils/fileutils");
 const workspace_root_1 = require("../../utils/workspace-root");
 const package_manager_1 = require("../../utils/package-manager");
 const workspace_context_1 = require("../../utils/workspace-context");
@@ -154,7 +155,14 @@ async function importHandler(options) {
     const pmc = (0, package_manager_1.getPackageManagerCommand)();
     const nxJson = (0, nx_json_1.readNxJson)(workspace_root_1.workspaceRoot);
     (0, workspace_context_1.resetWorkspaceContext)();
-    const { plugins, updatePackageScripts } = await (0, init_v2_1.detectPlugins)(nxJson, options.interactive, true);
+    let packageJson;
+    try {
+        packageJson = (0, fileutils_1.readJsonFile)('package.json');
+    }
+    catch {
+        packageJson = null;
+    }
+    const { plugins, updatePackageScripts } = await (0, init_v2_1.detectPlugins)(nxJson, packageJson, options.interactive, true);
     if (packageManager !== sourcePackageManager) {
         output_1.output.warn({
             title: `Mismatched package managers`,

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

@@ -66,7 +66,7 @@ async function withInitOptions(yargs) {
             type: 'array',
             string: true,
             description: 'List of AI agents to set up.',
-            choices: ['claude', 'codex', 'copilot', 'cursor', 'gemini'],
+            choices: ['claude', 'codex', 'copilot', 'cursor', 'gemini', 'opencode'],
         });
     }
     else {

package/src/command-line/init/init-v2.d.ts

@@ -1,4 +1,5 @@
 import { NxJsonConfiguration } from '../../config/nx-json';
+import { PackageJson } from '../../utils/package-json';
 import { Agent } from '../../ai/utils';
 export interface InitArgs {
     interactive: boolean;
@@ -10,7 +11,7 @@ export interface InitArgs {
     aiAgents?: Agent[];
 }
 export declare function initHandler(options: InitArgs, inner?: boolean): Promise<void>;
-export declare function detectPlugins(nxJson: NxJsonConfiguration, interactive: boolean, includeAngularCli?: boolean): Promise<{
+export declare function detectPlugins(nxJson: NxJsonConfiguration, packageJson: PackageJson | null, interactive: boolean, includeAngularCli?: boolean): Promise<{
     plugins: string[];
     updatePackageScripts: boolean;
 }>;

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

@@ -1 +1 @@
-{"version":3,"file":"init-v2.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/init/init-v2.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,mBAAmB,EAAc,MAAM,sBAAsB,CAAC;AAavE,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAkBvC,MAAM,WAAW,QAAQ;IACvB,WAAW,EAAE,OAAO,CAAC;IACrB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,QAAQ,CAAC,EAAE,KAAK,EAAE,CAAC;CACpB;AAED,wBAAsB,WAAW,CAC/B,OAAO,EAAE,QAAQ,EACjB,KAAK,UAAQ,GACZ,OAAO,CAAC,IAAI,CAAC,CA2Bf;AAsMD,wBAAsB,aAAa,CACjC,MAAM,EAAE,mBAAmB,EAC3B,WAAW,EAAE,OAAO,EACpB,iBAAiB,CAAC,EAAE,OAAO,GAC1B,OAAO,CAAC;IACT,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,oBAAoB,EAAE,OAAO,CAAC;CAC/B,CAAC,CA2JD"}
+{"version":3,"file":"init-v2.d.ts","sourceRoot":"","sources":["../../../../../../packages/nx/src/command-line/init/init-v2.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,mBAAmB,EAAc,MAAM,sBAAsB,CAAC;AAIvE,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AASvD,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAkBvC,MAAM,WAAW,QAAQ;IACvB,WAAW,EAAE,OAAO,CAAC;IACrB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,QAAQ,CAAC,EAAE,KAAK,EAAE,CAAC;CACpB;AAED,wBAAsB,WAAW,CAC/B,OAAO,EAAE,QAAQ,EACjB,KAAK,UAAQ,GACZ,OAAO,CAAC,IAAI,CAAC,CA2Bf;AAsMD,wBAAsB,aAAa,CACjC,MAAM,EAAE,mBAAmB,EAC3B,WAAW,EAAE,WAAW,GAAG,IAAI,EAC/B,WAAW,EAAE,OAAO,EACpB,iBAAiB,CAAC,EAAE,OAAO,GAC1B,OAAO,CAAC;IACT,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,oBAAoB,EAAE,OAAO,CAAC;CAC/B,CAAC,CAsKD"}

package/src/command-line/init/init-v2.js

@@ -143,7 +143,7 @@ async function initHandlerImpl(options) {
             updatePackageScripts = true;
         }
         else {
-            const { plugins: _plugins, updatePackageScripts: _updatePackageScripts } = await detectPlugins(nxJson, options.interactive);
+            const { plugins: _plugins, updatePackageScripts: _updatePackageScripts } = await detectPlugins(nxJson, packageJson, options.interactive);
             plugins = _plugins;
             updatePackageScripts = _updatePackageScripts;
         }
@@ -212,12 +212,22 @@ const npmPackageToPluginMap = {
     '@rsbuild/core': '@nx/rsbuild',
     '@react-router/dev': '@nx/react',
 };
-async function detectPlugins(nxJson, interactive, includeAngularCli) {
+async function detectPlugins(nxJson, packageJson, interactive, includeAngularCli) {
     let files = ['package.json'].concat((0, workspace_context_1.globWithWorkspaceContextSync)(process.cwd(), ['**/*/package.json']));
     const currentPlugins = new Set((nxJson.plugins ?? []).map((p) => {
         const plugin = typeof p === 'string' ? p : p.plugin;
         return (0, get_package_name_from_import_path_1.getPackageNameFromImportPath)(plugin);
     }));
+    // Also treat already-installed @nx/* and @nrwl/* packages as current plugins
+    const rootDeps = {
+        ...packageJson?.dependencies,
+        ...packageJson?.devDependencies,
+    };
+    for (const dep of Object.keys(rootDeps)) {
+        if (dep.startsWith('@nx/') || dep.startsWith('@nrwl/')) {
+            currentPlugins.add((0, get_package_name_from_import_path_1.getPackageNameFromImportPath)(dep));
+        }
+    }
     const detectedPlugins = new Set();
     for (const file of files) {
         if (!(0, fs_1.existsSync)(file))

package/src/command-line/release/utils/release-graph.d.ts

@@ -63,7 +63,7 @@ export declare class ReleaseGraph {
     readonly projectToReleaseGroup: Map<string, ReleaseGroupWithName>;
     readonly projectToDependents: Map<string, Set<string>>;
     readonly projectToDependencies: Map<string, Set<string>>;
-    readonly projectToUpdateDependentsSetting: Map<string, "never" | "auto" | "always">;
+    readonly projectToUpdateDependentsSetting: Map<string, "auto" | "always" | "never">;
     readonly groupGraph: Map<string, GroupNode>;
     sortedReleaseGroups: string[];
     readonly sortedProjects: Map<string, string[]>;