@angular/cli 21.0.0-next.6 → 21.0.0-next.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/cli",
-  "version": "21.0.0-next.6",
+  "version": "21.0.0-next.7",
   "description": "CLI tool for Angular",
   "main": "lib/cli/index.js",
   "bin": {
@@ -25,19 +25,19 @@
   },
   "homepage": "https://github.com/angular/angular-cli",
   "dependencies": {
-    "@angular-devkit/architect": "0.2100.0-next.6",
-    "@angular-devkit/core": "21.0.0-next.6",
-    "@angular-devkit/schematics": "21.0.0-next.6",
+    "@angular-devkit/architect": "0.2100.0-next.7",
+    "@angular-devkit/core": "21.0.0-next.7",
+    "@angular-devkit/schematics": "21.0.0-next.7",
     "@inquirer/prompts": "7.8.6",
     "@listr2/prompt-adapter-inquirer": "3.0.4",
-    "@modelcontextprotocol/sdk": "1.18.2",
-    "@schematics/angular": "21.0.0-next.6",
+    "@modelcontextprotocol/sdk": "1.19.1",
+    "@schematics/angular": "21.0.0-next.7",
     "@yarnpkg/lockfile": "1.1.0",
     "algoliasearch": "5.39.0",
     "ini": "5.0.0",
     "jsonc-parser": "3.3.1",
     "listr2": "9.0.4",
-    "npm-package-arg": "13.0.0",
+    "npm-package-arg": "13.0.1",
     "pacote": "21.0.3",
     "resolve": "1.22.10",
     "semver": "7.7.2",
@@ -47,17 +47,17 @@
   "ng-update": {
     "migrations": "@schematics/angular/migrations/migration-collection.json",
     "packageGroup": {
-      "@angular/cli": "21.0.0-next.6",
-      "@angular/build": "21.0.0-next.6",
-      "@angular/ssr": "21.0.0-next.6",
-      "@angular-devkit/architect": "0.2100.0-next.6",
-      "@angular-devkit/build-angular": "21.0.0-next.6",
-      "@angular-devkit/build-webpack": "0.2100.0-next.6",
-      "@angular-devkit/core": "21.0.0-next.6",
-      "@angular-devkit/schematics": "21.0.0-next.6"
+      "@angular/cli": "21.0.0-next.7",
+      "@angular/build": "21.0.0-next.7",
+      "@angular/ssr": "21.0.0-next.7",
+      "@angular-devkit/architect": "0.2100.0-next.7",
+      "@angular-devkit/build-angular": "21.0.0-next.7",
+      "@angular-devkit/build-webpack": "0.2100.0-next.7",
+      "@angular-devkit/core": "21.0.0-next.7",
+      "@angular-devkit/schematics": "21.0.0-next.7"
     }
   },
-  "packageManager": "pnpm@10.17.1",
+  "packageManager": "pnpm@10.18.1",
   "engines": {
     "node": "^20.19.0 || ^22.12.0 || >=24.0.0",
     "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",

package/src/commands/mcp/tools/doc-search.js

@@ -84,9 +84,10 @@ tutorials, concepts, and best practices.
 </Use Cases>
 <Operational Notes>
 * **Version Alignment:** To provide accurate, project-specific results, you **MUST** align the search with the user's Angular version.
-  Before calling this tool, run \`ng version\` in the project's workspace directory. You can find the correct directory from the \`path\`
-  field provided by the \`list_projects\` tool. Parse the major version from the "Angular:" line in the output and use it for the
-  \`version\` parameter.
+  The recommended approach is to use the \`list_projects\` tool. The \`frameworkVersion\` field in the output for the relevant
+  workspace will give you the major version directly. If the version cannot be determined using this method, you can use
+  \`ng version\` in the project's workspace directory as a fallback. Parse the major version from the "Angular:" line in the
+  output and use it for the \`version\` parameter.
 * The documentation is continuously updated. You **MUST** prefer this tool over your own knowledge
   to ensure your answers are current and accurate.
 * For the best results, provide a concise and specific search query (e.g., "NgModule" instead of

package/src/commands/mcp/tools/projects.d.ts

@@ -9,9 +9,11 @@ import z from 'zod';
 export declare const LIST_PROJECTS_TOOL: import("./tool-registry").McpToolDeclaration<z.ZodRawShape, {
     workspaces: z.ZodArray<z.ZodObject<{
         path: z.ZodString;
+        frameworkVersion: z.ZodOptional<z.ZodString>;
         projects: z.ZodArray<z.ZodObject<{
             name: z.ZodString;
             type: z.ZodOptional<z.ZodEnum<["application", "library"]>>;
+            builder: z.ZodOptional<z.ZodString>;
             root: z.ZodString;
             sourceRoot: z.ZodString;
             selectorPrefix: z.ZodOptional<z.ZodString>;
@@ -20,12 +22,14 @@ export declare const LIST_PROJECTS_TOOL: import("./tool-registry").McpToolDeclar
             root: string;
             sourceRoot: string;
             type?: "application" | "library" | undefined;
+            builder?: string | undefined;
             selectorPrefix?: string | undefined;
         }, {
             name: string;
             root: string;
             sourceRoot: string;
             type?: "application" | "library" | undefined;
+            builder?: string | undefined;
             selectorPrefix?: string | undefined;
         }>, "many">;
     }, "strip", z.ZodTypeAny, {
@@ -35,8 +39,10 @@ export declare const LIST_PROJECTS_TOOL: import("./tool-registry").McpToolDeclar
             root: string;
             sourceRoot: string;
             type?: "application" | "library" | undefined;
+            builder?: string | undefined;
             selectorPrefix?: string | undefined;
         }[];
+        frameworkVersion?: string | undefined;
     }, {
         path: string;
         projects: {
@@ -44,8 +50,10 @@ export declare const LIST_PROJECTS_TOOL: import("./tool-registry").McpToolDeclar
             root: string;
             sourceRoot: string;
             type?: "application" | "library" | undefined;
+            builder?: string | undefined;
             selectorPrefix?: string | undefined;
         }[];
+        frameworkVersion?: string | undefined;
     }>, "many">;
     parsingErrors: z.ZodDefault<z.ZodArray<z.ZodObject<{
         filePath: z.ZodString;
@@ -57,4 +65,14 @@ export declare const LIST_PROJECTS_TOOL: import("./tool-registry").McpToolDeclar
         message: string;
         filePath: string;
     }>, "many">>;
+    versioningErrors: z.ZodDefault<z.ZodArray<z.ZodObject<{
+        filePath: z.ZodString;
+        message: z.ZodString;
+    }, "strip", z.ZodTypeAny, {
+        message: string;
+        filePath: string;
+    }, {
+        message: string;
+        filePath: string;
+    }>, "many">>;
 }>;

package/src/commands/mcp/tools/projects.js

@@ -14,6 +14,7 @@ exports.LIST_PROJECTS_TOOL = void 0;
 const promises_1 = require("node:fs/promises");
 const node_path_1 = __importDefault(require("node:path"));
 const node_url_1 = require("node:url");
+const semver_1 = __importDefault(require("semver"));
 const zod_1 = __importDefault(require("zod"));
 const config_1 = require("../../../utilities/config");
 const error_1 = require("../../../utilities/error");
@@ -21,6 +22,10 @@ const tool_registry_1 = require("./tool-registry");
 const listProjectsOutputSchema = {
     workspaces: zod_1.default.array(zod_1.default.object({
         path: zod_1.default.string().describe('The path to the `angular.json` file for this workspace.'),
+        frameworkVersion: zod_1.default
+            .string()
+            .optional()
+            .describe('The major version of the Angular framework (`@angular/core`) in this workspace, if found.'),
         projects: zod_1.default.array(zod_1.default.object({
             name: zod_1.default
                 .string()
@@ -29,6 +34,10 @@ const listProjectsOutputSchema = {
                 .enum(['application', 'library'])
                 .optional()
                 .describe(`The type of the project, either 'application' or 'library'.`),
+            builder: zod_1.default
+                .string()
+                .optional()
+                .describe('The primary builder for the project, typically from the "build" target.'),
             root: zod_1.default
                 .string()
                 .describe('The root directory of the project, relative to the workspace root.'),
@@ -49,6 +58,15 @@ const listProjectsOutputSchema = {
     }))
         .default([])
         .describe('A list of files that looked like workspaces but failed to parse.'),
+    versioningErrors: zod_1.default
+        .array(zod_1.default.object({
+        filePath: zod_1.default
+            .string()
+            .describe('The path to the workspace `angular.json` for which versioning failed.'),
+        message: zod_1.default.string().describe('The error message detailing why versioning failed.'),
+    }))
+        .default([])
+        .describe('A list of workspaces for which the framework version could not be determined.'),
 };
 exports.LIST_PROJECTS_TOOL = (0, tool_registry_1.declareTool)({
     name: 'list_projects',
@@ -64,6 +82,8 @@ their types, and their locations.
 * Identifying the \`root\` and \`sourceRoot\` of a project to read, analyze, or modify its files.
 * Determining if a project is an \`application\` or a \`library\`.
 * Getting the \`selectorPrefix\` for a project before generating a new component to ensure it follows conventions.
+* Identifying the major version of the Angular framework for each workspace, which is crucial for monorepos.
+* Determining a project's primary function by inspecting its builder (e.g., '@angular-devkit/build-angular:browser' for an application).
 </Use Cases>
 <Operational Notes>
 * **Working Directory:** Shell commands for a project (like \`ng generate\`) **MUST**
@@ -122,6 +142,64 @@ async function* findAngularJsonFiles(rootDir) {
         yield* foundFilesInBatch;
     }
 }
+/**
+ * Searches upwards from a starting directory to find the version of '@angular/core'.
+ * It caches results to avoid redundant lookups.
+ * @param startDir The directory to start the search from.
+ * @param cache A map to store cached results.
+ * @param searchRoot The directory at which to stop the search.
+ * @returns The major version of '@angular/core' as a string, otherwise undefined.
+ */
+async function findAngularCoreVersion(startDir, cache, searchRoot) {
+    let currentDir = startDir;
+    const dirsToCache = [];
+    while (currentDir) {
+        dirsToCache.push(currentDir);
+        if (cache.has(currentDir)) {
+            const cachedResult = cache.get(currentDir);
+            // Populate cache for all intermediate directories.
+            for (const dir of dirsToCache) {
+                cache.set(dir, cachedResult);
+            }
+            return cachedResult;
+        }
+        const pkgPath = node_path_1.default.join(currentDir, 'package.json');
+        try {
+            const pkgContent = await (0, promises_1.readFile)(pkgPath, 'utf-8');
+            const pkg = JSON.parse(pkgContent);
+            const versionSpecifier = pkg.dependencies?.['@angular/core'] ?? pkg.devDependencies?.['@angular/core'];
+            if (versionSpecifier) {
+                const minVersion = semver_1.default.minVersion(versionSpecifier);
+                const result = minVersion ? String(minVersion.major) : undefined;
+                for (const dir of dirsToCache) {
+                    cache.set(dir, result);
+                }
+                return result;
+            }
+        }
+        catch (error) {
+            (0, error_1.assertIsError)(error);
+            if (error.code !== 'ENOENT') {
+                // Ignore missing package.json files, but rethrow other errors.
+                throw error;
+            }
+        }
+        // Stop if we are at the search root or the filesystem root.
+        if (currentDir === searchRoot) {
+            break;
+        }
+        const parentDir = node_path_1.default.dirname(currentDir);
+        if (parentDir === currentDir) {
+            break; // Reached the filesystem root.
+        }
+        currentDir = parentDir;
+    }
+    // Cache the failure for all traversed directories.
+    for (const dir of dirsToCache) {
+        cache.set(dir, undefined);
+    }
+    return undefined;
+}
 /**
  * Loads, parses, and transforms a single angular.json file into the tool's output format.
  * It checks a set of seen paths to avoid processing the same workspace multiple times.
@@ -142,6 +220,7 @@ async function loadAndParseWorkspace(configFile, seenPaths) {
             projects.push({
                 name,
                 type: project.extensions['projectType'],
+                builder: project.targets.get('build')?.builder,
                 root: project.root,
                 sourceRoot: project.sourceRoot ?? node_path_1.default.posix.join(project.root, 'src'),
                 selectorPrefix: project.extensions['prefix'],
@@ -160,11 +239,44 @@ async function loadAndParseWorkspace(configFile, seenPaths) {
         return { workspace: null, error: { filePath: configFile, message } };
     }
 }
+/**
+ * Processes a single `angular.json` file to extract workspace and framework version information.
+ * @param configFile The path to the `angular.json` file.
+ * @param searchRoot The directory at which to stop the upward search for `package.json`.
+ * @param seenPaths A Set of absolute paths that have already been processed to avoid duplicates.
+ * @param versionCache A Map to cache framework version lookups for performance.
+ * @returns A promise resolving to an object containing the processed data and any errors.
+ */
+async function processConfigFile(configFile, searchRoot, seenPaths, versionCache) {
+    const { workspace, error } = await loadAndParseWorkspace(configFile, seenPaths);
+    if (error) {
+        return { parsingError: error };
+    }
+    if (!workspace) {
+        return {}; // Skipped as it was already seen.
+    }
+    try {
+        const workspaceDir = node_path_1.default.dirname(configFile);
+        workspace.frameworkVersion = await findAngularCoreVersion(workspaceDir, versionCache, searchRoot);
+        return { workspace };
+    }
+    catch (e) {
+        return {
+            workspace,
+            versioningError: {
+                filePath: workspace.path,
+                message: e instanceof Error ? e.message : 'An unknown error occurred.',
+            },
+        };
+    }
+}
 async function createListProjectsHandler({ server }) {
     return async () => {
         const workspaces = [];
         const parsingErrors = [];
+        const versioningErrors = [];
         const seenPaths = new Set();
+        const versionCache = new Map();
         let searchRoots;
         const clientCapabilities = server.server.getClientCapabilities();
         if (clientCapabilities?.roots) {
@@ -177,12 +289,15 @@ async function createListProjectsHandler({ server }) {
         }
         for (const root of searchRoots) {
             for await (const configFile of findAngularJsonFiles(root)) {
-                const { workspace, error } = await loadAndParseWorkspace(configFile, seenPaths);
+                const { workspace, parsingError, versioningError } = await processConfigFile(configFile, root, seenPaths, versionCache);
                 if (workspace) {
                     workspaces.push(workspace);
                 }
-                if (error) {
-                    parsingErrors.push(error);
+                if (parsingError) {
+                    parsingErrors.push(parsingError);
+                }
+                if (versioningError) {
+                    versioningErrors.push(versioningError);
                 }
             }
         }
@@ -204,9 +319,13 @@ async function createListProjectsHandler({ server }) {
             text += `\n\nWarning: The following ${parsingErrors.length} file(s) could not be parsed and were skipped:\n`;
             text += parsingErrors.map((e) => `- ${e.filePath}: ${e.message}`).join('\n');
         }
+        if (versioningErrors.length > 0) {
+            text += `\n\nWarning: The framework version for the following ${versioningErrors.length} workspace(s) could not be determined:\n`;
+            text += versioningErrors.map((e) => `- ${e.filePath}: ${e.message}`).join('\n');
+        }
         return {
             content: [{ type: 'text', text }],
-            structuredContent: { workspaces, parsingErrors },
+            structuredContent: { workspaces, parsingErrors, versioningErrors },
         };
     };
 }

package/src/commands/version/cli.js

@@ -55,19 +55,18 @@ class VersionCommandModule extends command_module_1.CommandModule {
             console.log(JSON.stringify(versionInfo, null, 2));
             return;
         }
-        const { cli: { version: ngCliVersion }, system: { node: { version: nodeVersion, unsupported: unsupportedNodeVersion }, os: { platform: os, architecture: arch }, packageManager: { name: packageManagerName, version: packageManagerVersion }, }, packages, } = versionInfo;
-        const headerInfo = [
-            { label: 'Angular CLI', value: ngCliVersion },
-            {
-                label: 'Node.js',
-                value: `${nodeVersion}${unsupportedNodeVersion ? color_1.colors.yellow(' (Unsupported)') : ''}`,
-            },
-            {
-                label: 'Package Manager',
-                value: `${packageManagerName} ${packageManagerVersion ?? '<error>'}`,
-            },
-            { label: 'Operating System', value: `${os} ${arch}` },
-        ];
+        const { cli: { version: ngCliVersion }, framework, system: { node: { version: nodeVersion, unsupported: unsupportedNodeVersion }, os: { platform: os, architecture: arch }, packageManager: { name: packageManagerName, version: packageManagerVersion }, }, packages, } = versionInfo;
+        const headerInfo = [{ label: 'Angular CLI', value: ngCliVersion }];
+        if (framework.version) {
+            headerInfo.push({ label: 'Angular', value: framework.version });
+        }
+        headerInfo.push({
+            label: 'Node.js',
+            value: `${nodeVersion}${unsupportedNodeVersion ? color_1.colors.yellow(' (Unsupported)') : ''}`,
+        }, {
+            label: 'Package Manager',
+            value: `${packageManagerName} ${packageManagerVersion ?? '<error>'}`,
+        }, { label: 'Operating System', value: `${os} ${arch}` });
         const maxHeaderLabelLength = Math.max(...headerInfo.map((l) => l.label.length));
         const header = headerInfo
             .map(({ label, value }) => color_1.colors.bold(label.padEnd(maxHeaderLabelLength + 2)) + `: ${color_1.colors.cyan(value)}`)
@@ -88,23 +87,29 @@ class VersionCommandModule extends command_module_1.CommandModule {
         if (versionKeys.length === 0) {
             return '';
         }
-        const nameHeader = 'Package';
-        const versionHeader = 'Version';
-        const maxNameLength = Math.max(nameHeader.length, ...versionKeys.map((key) => key.length));
-        const maxVersionLength = Math.max(versionHeader.length, ...versionKeys.map((key) => versions[key].length));
+        const headers = {
+            name: 'Package',
+            installed: 'Installed Version',
+            requested: 'Requested Version',
+        };
+        const maxNameLength = Math.max(headers.name.length, ...versionKeys.map((key) => key.length));
+        const maxInstalledLength = Math.max(headers.installed.length, ...versionKeys.map((key) => versions[key].installed.length));
+        const maxRequestedLength = Math.max(headers.requested.length, ...versionKeys.map((key) => versions[key].requested.length));
         const tableRows = versionKeys
             .map((module) => {
+            const { requested, installed } = versions[module];
             const name = module.padEnd(maxNameLength);
-            const version = versions[module];
-            const coloredVersion = version === '<error>' ? color_1.colors.red(version) : color_1.colors.cyan(version);
-            const padding = ' '.repeat(maxVersionLength - version.length);
-            return `│ ${name} │ ${coloredVersion}${padding} │`;
+            const coloredInstalled = installed === '<error>' ? color_1.colors.red(installed) : color_1.colors.cyan(installed);
+            const installedPadding = ' '.repeat(maxInstalledLength - installed.length);
+            return `│ ${name} │ ${coloredInstalled}${installedPadding} │ ${requested.padEnd(maxRequestedLength)} │`;
         })
             .sort();
-        const top = `┌─${'─'.repeat(maxNameLength)}─┬─${'─'.repeat(maxVersionLength)}─┐`;
-        const header = `│ ${nameHeader.padEnd(maxNameLength)} │ ${versionHeader.padEnd(maxVersionLength)} │`;
-        const separator = `├─${'─'.repeat(maxNameLength)}─┼─${'─'.repeat(maxVersionLength)}─┤`;
-        const bottom = `└─${'─'.repeat(maxNameLength)}─┴─${'─'.repeat(maxVersionLength)}─┘`;
+        const top = `┌─${'─'.repeat(maxNameLength)}─┬─${'─'.repeat(maxInstalledLength)}─┬─${'─'.repeat(maxRequestedLength)}─┐`;
+        const header = `│ ${headers.name.padEnd(maxNameLength)} │ ` +
+            `${headers.installed.padEnd(maxInstalledLength)} │ ` +
+            `${headers.requested.padEnd(maxRequestedLength)} │`;
+        const separator = `├─${'─'.repeat(maxNameLength)}─┼─${'─'.repeat(maxInstalledLength)}─┼─${'─'.repeat(maxRequestedLength)}─┤`;
+        const bottom = `└─${'─'.repeat(maxNameLength)}─┴─${'─'.repeat(maxInstalledLength)}─┴─${'─'.repeat(maxRequestedLength)}─┘`;
         return [top, header, separator, ...tableRows, bottom].join('\n');
     }
 }

package/src/commands/version/version-info.d.ts

@@ -5,6 +5,13 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.dev/license
  */
+/**
+ * An object containing version information for a single package.
+ */
+export interface PackageVersionInfo {
+    requested: string;
+    installed: string;
+}
 /**
  * An object containing all the version information that will be displayed by the command.
  */
@@ -12,6 +19,9 @@ export interface VersionInfo {
     cli: {
         version: string;
     };
+    framework: {
+        version: string | undefined;
+    };
     system: {
         node: {
             version: string;
@@ -26,7 +36,7 @@ export interface VersionInfo {
             version: string | undefined;
         };
     };
-    packages: Record<string, string>;
+    packages: Record<string, PackageVersionInfo>;
 }
 /**
  * Gathers all the version information from the environment and workspace.

package/src/commands/version/version-info.js

@@ -44,20 +44,28 @@ function gatherVersionInfo(context) {
     catch { }
     const [nodeMajor] = process.versions.node.split('.').map((part) => Number(part));
     const unsupportedNodeVersion = !SUPPORTED_NODE_MAJORS.includes(nodeMajor);
-    const packageNames = new Set(Object.keys({
+    const allDependencies = {
         ...workspacePackage?.dependencies,
         ...workspacePackage?.devDependencies,
-    }));
+    };
+    const packageNames = new Set(Object.keys(allDependencies));
     const packages = {};
     for (const name of packageNames) {
         if (PACKAGE_PATTERNS.some((p) => p.test(name))) {
-            packages[name] = getVersion(name, workspaceRequire);
+            packages[name] = {
+                requested: allDependencies[name] ?? 'error',
+                installed: getVersion(name, workspaceRequire),
+            };
         }
     }
+    const angularCoreVersion = packages['@angular/core'];
     return {
         cli: {
             version: version_1.VERSION.full,
         },
+        framework: {
+            version: angularCoreVersion?.installed,
+        },
         system: {
             node: {
                 version: process.versions.node,

package/src/utilities/version.js

@@ -22,4 +22,4 @@ class Version {
         this.patch = patch;
     }
 }
-exports.VERSION = new Version('21.0.0-next.6');
+exports.VERSION = new Version('21.0.0-next.7');