fixup! feat(@schematics/angular): update ai-config to include Angular MCP server config

Author: hawkgs

BUILD.bazel

@@ -15,6 +15,7 @@ exports_files([
     "tsconfig-build-ng.json",
     "tsconfig-build.json",
     "package.json",
+    "node_modules/@angular/core/resources/best-practices.md",
 ])
 
 npm_link_all_packages()

packages/schematics/angular/BUILD.bazel

@@ -3,6 +3,7 @@
 # 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
 
+load("@bazel_skylib//rules:copy_file.bzl", "copy_file")
 load("@npm//:defs.bzl", "npm_link_all_packages")
 load("//tools:defaults.bzl", "copy_to_bin", "jasmine_test", "npm_package", "ts_project")
 load("//tools:ts_json_schema.bzl", "ts_json_schema")
@@ -45,15 +46,10 @@ copy_to_bin(
     srcs = glob(["**/schema.json"]),
 )
 
-genrule(
+copy_file(
     name = "angular_best_practices",
-    srcs = [
-        "//:node_modules/@angular/core/dir",
-    ],
-    outs = ["ai-config/files/__bestPracticesName__.template"],
-    cmd = """
-        cp "$(location //:node_modules/@angular/core/dir)/resources/best-practices.md" $@
-    """,
+    src = "//:node_modules/@angular/core/resources/best-practices.md",
+    out = "ai-config/files/__bestPracticesName__.template",
 )
 
 RUNTIME_ASSETS = [

packages/schematics/angular/ai-config/file_utils.ts

@@ -18,6 +18,8 @@ import {
   strings,
   url,
 } from '@angular-devkit/schematics';
+import { parse } from 'jsonc-parser';
+import { JSONFile } from '../utility/json-file';
 import { FileConfigurationHandlerOptions } from './types';
 
 const TOML_MCP_SERVERS_PROP = '[mcp_servers.angular-cli]';
@@ -26,7 +28,7 @@ const TOML_MCP_SERVERS_PROP = '[mcp_servers.angular-cli]';
  * Create or update a JSON MCP configuration file to include the Angular MCP server.
  */
 export function addJsonMcpConfig(
-  { tree, context, fileInfo, tool }: FileConfigurationHandlerOptions,
+  { tree, fileInfo }: FileConfigurationHandlerOptions,
   mcpServersProperty: string,
 ): Rule {
   const { name, directory } = fileInfo;
@@ -45,43 +47,18 @@ export function addJsonMcpConfig(
           return file;
         }
 
-        const existingFileBuffer = tree.read(file.path);
-
         // If we have an existing file, update the server property with
         // Angular MCP server configuration.
-        if (existingFileBuffer) {
-          // The JSON config file should be record-like.
-          let existing: Record<string, unknown>;
-          try {
-            existing = JSON.parse(existingFileBuffer.toString());
-          } catch {
-            const path = `${directory}/${name}`;
-            const toolName = strings.classify(tool);
-            context.logger.warn(
-              `Skipping Angular MCP server configuration for '${toolName}'.\n` +
-                `Unable to modify '${path}'. ` +
-                'Make sure that the file has a valid JSON syntax.\n',
-            );
+        const existingConfig = new JSONFile(tree, file.path);
+        const existingMcpServers = existingConfig.get([mcpServersProperty]) ?? {};
+        const templateServersProp = parse(file.content.toString())[mcpServersProperty];
 
-            return null;
-          }
-          const existingServersProp = existing[mcpServersProperty];
-          const templateServersProp = JSON.parse(file.content.toString())[mcpServersProperty];
-
-          // Note: If the Angular MCP server config already exists, we'll overwrite it.
-          existing[mcpServersProperty] = existingServersProp
-            ? {
-                ...existingServersProp,
-                ...templateServersProp,
-              }
-            : templateServersProp;
-
-          tree.overwrite(file.path, JSON.stringify(existing, null, 2));
+        existingConfig.modify([mcpServersProperty], {
+          ...existingMcpServers,
+          ...templateServersProp,
+        });
 
-          return null;
-        }
-
-        return file;
+        return null;
       }),
     ]),
   );

packages/schematics/angular/ai-config/index_spec.ts

@@ -7,6 +7,7 @@
  */
 
 import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
+import { parse } from 'jsonc-parser';
 import { Schema as WorkspaceOptions } from '../workspace/schema';
 import { Schema as ConfigOptions, Tool as ConfigTool } from './schema';
 
@@ -129,7 +130,9 @@ describe('AI Config Schematic', () => {
       },
     };
 
-    expect(tree.readContent('.mcp.json')).toBe(JSON.stringify(modifiedConfig, null, 2));
+    const actualConfig = parse(tree.readContent('.mcp.json'));
+
+    expect(JSON.stringify(actualConfig, null, 2)).toBe(JSON.stringify(modifiedConfig, null, 2));
   });
 
   it('should handle invalid JSON MCP server config', async () => {