fix(@angular/cli): address comments

amishne · amishne · commit 1a842e547945 · 2025-08-08T12:22:24.000-07:00
diff --git a/packages/angular/cli/src/commands/mcp/tools/modernize.ts b/packages/angular/cli/src/commands/mcp/tools/modernize.ts
@@ -87,72 +87,42 @@ const modernizeInputSchema = z.object({
 
 export type ModernizeInput = z.infer<typeof modernizeInputSchema>;
 
-export async function runModernization(input: ModernizeInput) {
-  try {
-    if (!input.transformations || input.transformations.length === 0) {
-      const instructions = [
-        'See https://angular.dev/best-practices for Angular best practices. ' +
-          'You can call this tool if you have specific transformation you want to run.',
-      ];
-
-      return {
-        content: [
-          {
-            type: 'text' as const,
-            text: JSON.stringify({
-              instructions,
-            }),
-          },
-        ],
-        structuredContent: {
-          instructions,
-        },
-      };
-    }
-
-    const transformationsToRun = TRANSFORMATIONS.filter((t) =>
-      input.transformations?.includes(t.name),
-    );
+function generateInstructions(transformationNames: string[]): string[] {
+  if (transformationNames.length === 0) {
+    return [
+      'See https://angular.dev/best-practices for Angular best practices. ' +
+        'You can call this tool if you have specific transformation you want to run.',
+    ];
+  }
 
-    const allInstructions: string[] = [];
+  const instructions: string[] = [];
+  const transformationsToRun = TRANSFORMATIONS.filter((t) => transformationNames?.includes(t.name));
 
-    for (const transformation of transformationsToRun) {
-      let transformationInstructions = '';
-      if (transformation.instructions) {
-        transformationInstructions = transformation.instructions;
-      } else {
-        // If no instructions are included, default to running a cli schematic with the transformation name.
-        const command = `ng generate @angular/core:${transformation.name}`;
-        transformationInstructions = `To run the ${transformation.name} migration, execute the following command: \`${command}\`.`;
-      }
-      if (transformation.documentationUrl) {
-        transformationInstructions += `\nFor more information, see ${transformation.documentationUrl}.`;
-      }
-      allInstructions.push(transformationInstructions);
+  for (const transformation of transformationsToRun) {
+    let transformationInstructions = '';
+    if (transformation.instructions) {
+      transformationInstructions = transformation.instructions;
+    } else {
+      // If no instructions are included, default to running a cli schematic with the transformation name.
+      const command = `ng generate @angular/core:${transformation.name}`;
+      transformationInstructions = `To run the ${transformation.name} migration, execute the following command: \`${command}\`.`;
     }
+    if (transformation.documentationUrl) {
+      transformationInstructions += `\nFor more information, see ${transformation.documentationUrl}.`;
+    }
+    instructions.push(transformationInstructions);
+  }
 
-    const structuredContent = {
-      instructions: allInstructions.length ? allInstructions : undefined,
-    };
+  return instructions;
+}
 
-    return {
-      content: [{ type: 'text' as const, text: JSON.stringify(structuredContent) }],
-      structuredContent,
-    };
-  } catch (e) {
-    const message = e instanceof Error ? e.message : 'An unknown error occurred.';
+export async function runModernization(input: ModernizeInput) {
+  const structuredContent = { instructions: generateInstructions(input.transformations ?? []) };
 
-    return {
-      content: [
-        {
-          type: 'text' as const,
-          text: `Failed to run modernization migrations: ${message}`,
-        },
-      ],
-      structuredContent: {},
-      isError: true,
-    };
-  }
+  return {
+    content: [{ type: 'text' as const, text: JSON.stringify(structuredContent) }],
+    structuredContent,
+  };
 }
 
 export function registerModernizeTool(server: McpServer): void {
