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

Author: atscott

packages/angular/cli/BUILD.bazel

@@ -125,10 +125,12 @@ ts_project(
         ":angular-cli",
         ":node_modules/@angular-devkit/core",
         ":node_modules/@angular-devkit/schematics",
+        ":node_modules/@modelcontextprotocol/sdk",
         ":node_modules/yargs",
         "//:node_modules/@types/semver",
         "//:node_modules/@types/yargs",
         "//:node_modules/semver",
+        "//:node_modules/typescript",
     ],
 )
 

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

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import type { SourceFile, Node, ImportSpecifier } from 'typescript';
+import type { ImportSpecifier, Node, SourceFile } from 'typescript';
 import { createUnsupportedZoneUsagesMessage } from './prompts';
 import { getImportSpecifier, loadTypescript } from './ts_utils';
 import { MigrationResponse } from './types';

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

@@ -6,13 +6,13 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import { glob } from 'node:fs/promises';
 import * as fs from 'node:fs';
+import { glob } from 'node:fs/promises';
 import { dirname, join } from 'node:path';
 import type { SourceFile } from 'typescript';
 import { createFixResponseForZoneTests, createProvideZonelessForTestsSetupPrompt } from './prompts';
-import { MigrationResponse } from './types';
 import { loadTypescript } from './ts_utils';
+import { MigrationResponse } from './types';
 
 export async function migrateTestFile(sourceFile: SourceFile): Promise<MigrationResponse | null> {
   const ts = await loadTypescript();
@@ -50,7 +50,7 @@ export async function searchForGlobalZoneless(startPath: string): Promise<boolea
   }
 
   try {
-    const files = await glob(`${angularJsonDir}/**/*.ts`);
+    const files = glob(`${angularJsonDir}/**/*.ts`);
     for await (const file of files) {
       const content = fs.readFileSync(file, 'utf-8');
       if (

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

@@ -7,8 +7,8 @@
  */
 
 import type { Node, SourceFile } from 'typescript';
-import { MigrationResponse } from './types';
 import { loadTypescript } from './ts_utils';
+import { MigrationResponse } from './types';
 
 /* eslint-disable max-len */
 
@@ -35,31 +35,13 @@ export function createProvideZonelessForTestsSetupPrompt(testFilePath: string):
       });
     \`\`\`
 
-    #### Step 2: Identify and Isolate Failing Tests
-
-    After enabling zoneless detection for the suite, some tests will likely fail. Your next task is to identify these failing tests and temporarily revert them to use Zone.js-based change detection. This isolates them for a future fix.
-
-    For each test (\`it\` block) or group of tests (\`describe\` block) that fails, override the testbed configuration to use \`provideZoneChangeDetection\`.
-
-    \`\`\`typescript
-    // Example for a single failing test
-    it('should do something that fails in zoneless', () => {
-      TestBed.configureTestingModule({
-        providers: [provideZoneChangeDetection()] 
-      });
-      // ... rest of the test
-    });
-    \`\`\`
+    #### Step 2: Identify and fix Failing Tests
 
-    ### IMPORTANT: Rules and Constraints
+    After enabling zoneless detection for the suite, some tests will likely fail. Your next task is to identify these failing tests and fix them.
 
-    You must follow these rules without exception:
-    1.  **DO** add \`provideZonelessChangeDetection()\` _once_ to the top-most \`describe\` in a \`beforeEach\` block as instructed in Step 1.
-    2.  **DO** run the tests after adding \`provideZonelessChangeDetection\` to see which ones fail. **DO NOT** make assumptions about which tests will might fail.
-    3.  **DO** add \`provideZoneChangeDetection()\` to the providers for each individual test or group of tests that fail after the change in Step 1.
-    4.  **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.
-    5.  **DO NOT** make any other changes to the test file or any application code.
-    6.  **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.
+    ${testDebuggingGuideText(testFilePath)}
+    8.  **DO** add \`provideZonelessChangeDetection()\` _once_ to the top-most \`describe\` in a \`beforeEach\` block as instructed in Step 1.
+    9.  **DO** run the tests after adding \`provideZonelessChangeDetection\` to see which ones fail. **DO NOT** make assumptions about which tests will might fail.
 
     ### 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.`;

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

@@ -7,7 +7,7 @@
  */
 
 import * as fs from 'node:fs';
-import type { NodeArray, ImportSpecifier, SourceFile } from 'typescript';
+import type { ImportSpecifier, NodeArray, SourceFile } from 'typescript';
 import type ts from 'typescript';
 
 let typescriptModule: typeof ts;
@@ -121,5 +121,6 @@ export async function createSourceFile(file: string) {
   const content = fs.readFileSync(file, 'utf8');
 
   const ts = await loadTypescript();
+
   return ts.createSourceFile(file, content, ts.ScriptTarget.Latest, true);
 }

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 'node:fs/promises';
 import * as fs from 'node:fs';
+import { glob } from 'node:fs/promises';
 import { type SourceFile } from 'typescript';
 import { z } from 'zod';
 import { declareTool } from '../tool-registry';