fixup! refactor(@angular/cli): add a get Zoneless/OnPush MCP tool

Author: atscott

packages/angular/cli/BUILD.bazel

@@ -70,7 +70,6 @@ ts_project(
         "//:node_modules/@types/semver",
         "//:node_modules/@types/yargs",
         "//:node_modules/@types/yarnpkg__lockfile",
-        "//:node_modules/fast-glob",
         "//:node_modules/listr2",
         "//:node_modules/semver",
         "//:node_modules/typescript",

packages/angular/cli/src/commands/mcp/tools/onpush-zoneless-migration/migrate_test_file.ts

@@ -6,9 +6,9 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import { glob } from 'fast-glob';
-import * as fs from 'fs';
-import { dirname, join } from 'path';
+import { glob } from 'node:fs/promises';
+import * as fs from 'node:fs';
+import { dirname, join } from 'node:path';
 import ts from 'typescript';
 import { createFixResponseForZoneTests, createProvideZonelessForTestsSetupPrompt } from './prompts';
 import { MigrationResponse } from './types';
@@ -51,7 +51,7 @@ export async function searchForGlobalZoneless(startPath: string): Promise<boolea
 
   try {
     const files = await glob(`${angularJsonDir}/**/*.ts`);
-    for (const file of files) {
+    for await (const file of files) {
       const content = fs.readFileSync(file, 'utf-8');
       if (
         content.includes('initTestEnvironment') &&

packages/angular/cli/src/commands/mcp/tools/onpush-zoneless-migration/prompts.ts

@@ -54,17 +54,6 @@ export function createProvideZonelessForTestsSetupPrompt(testFilePath: string):
       });
       // ... rest of the test
     });
-
-    // Example for a group of failing tests
-    describe('tests that require Zone.js', () => {
-      beforeEach(() => {
-        TestBed.configureTestingModule({
-      providers: [provideZoneChangeDetection()]
-        });
-      });
-
-      // ... all failing tests go here
-    });
     \`\`\`
 
     ### IMPORTANT: Rules and Constraints
@@ -74,6 +63,7 @@ export function createProvideZonelessForTestsSetupPrompt(testFilePath: string):
     2.  **DO** add \`provideZoneChangeDetection()\` to the providers for each individual test or group of tests that fail after the change in Step 1.
     3.  **DO NOT** attempt to fix the logic of the failing tests at this stage. The goal is only to enable zoneless for the suite and isolate the incompatible tests.
     4.  **DO NOT** make any other changes to the test file or any application code.
+    5.  **DO NOT** move tests around or create new describe blocks if it can be avoided. Changes are easier to review when code moves around less.
 
     ### Final Step
     After you have applied all the required changes and followed all the rules, consult this tool again for the next steps in the migration process.`;
@@ -221,8 +211,9 @@ When running tests in a zoneless environment, you may encounter new types of fai
 You must follow these rules without exception:
 1.  **DO** focus only on fixing the tests for the code in \`${fileOrDirPath}\`.
 2.  **DO** apply the solutions described in the debugging guide to fix test failures.
-3.  **DO NOT** make changes to application code unless it is to fix a bug revealed by the zoneless migration (e.g., converting a property to a signal to fix an \`ExpressionChangedAfterItHasBeenCheckedError\`).
-4.  **DO NOT** re-introduce \`provideZoneChangeDetection()\` into tests that are already using \`provideZonelessChangeDetection()\`.
+3.  **DO** update properties of test components to use signals. Tests often use plain objects and values and update the component state directly before calling \`fixture.detectChanges\`. This will not work and will result in \`ExpressionChangedAfterItHasBeenCheckedError\` because Angular was not notifed of the change.
+4.  **DO NOT** make changes to application code unless it is to fix a bug revealed by the zoneless migration (e.g., converting a property to a signal to fix an \`ExpressionChangedAfterItHasBeenCheckedError\`).
+5.  **DO NOT** re-introduce \`provideZoneChangeDetection()\` into tests that are already using \`provideZonelessChangeDetection()\`.
 `;
 
   return createResponse(text);

packages/angular/cli/src/commands/mcp/tools/onpush-zoneless-migration/ts_utils.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import * as fs from 'fs';
+import * as fs from 'node:fs';
 import ts from 'typescript';
 
 /**

packages/angular/cli/src/commands/mcp/tools/onpush-zoneless-migration/zoneless-migration.ts

@@ -8,8 +8,8 @@
 
 import { RequestHandlerExtra } from '@modelcontextprotocol/sdk/shared/protocol';
 import { ServerNotification, ServerRequest } from '@modelcontextprotocol/sdk/types';
-import { glob } from 'fast-glob';
-import * as fs from 'fs';
+import { glob } from 'node:fs/promises';
+import * as fs from 'node:fs';
 import ts from 'typescript';
 import { z } from 'zod';
 import { declareTool } from '../tool-registry';
@@ -53,8 +53,10 @@ export async function registerZonelessMigrationTool(
   const zoneFiles = new Set<ts.SourceFile>();
 
   if (fs.statSync(fileOrDirPath).isDirectory()) {
-    const allFiles = await glob(`${fileOrDirPath}/**/*.ts`);
-    files = allFiles.map(createSourceFile);
+    const allFiles = glob(`${fileOrDirPath}/**/*.ts`);
+    for await (const file of allFiles) {
+      files.push(createSourceFile(file));
+    }
   } else {
     files = [createSourceFile(fileOrDirPath)];
     const maybeTestFile = await getTestFilePath(fileOrDirPath);
@@ -67,7 +69,11 @@ export async function registerZonelessMigrationTool(
     const content = sourceFile.getFullText();
     const componentSpecifier = getImportSpecifier(sourceFile, '@angular/core', 'Component');
     const zoneSpecifier = getImportSpecifier(sourceFile, '@angular/core', 'NgZone');
-    const testBedSpecifier = getImportSpecifier(sourceFile, '@angular/core/testing', 'TestBed');
+    const testBedSpecifier = getImportSpecifier(
+      sourceFile,
+      /(@angular\/core)?\/testing/,
+      'TestBed',
+    );
     if (testBedSpecifier) {
       componentTestFiles.add(sourceFile);
     } else if (componentSpecifier) {