refactor(@angular/cli): separate MCP tool declaration assembly into helper function

The logic to assemble the list of active tools for the MCP server has been extracted into a new `assembleToolDeclarations` helper function. This improves the structure and readability of the `createMcpServer` function.

The tool lists have also been moved to module-level, `readonly` variables with JSDoc comments to improve clarity and prevent accidental modifications.

Author: clydin

packages/angular/cli/src/commands/mcp/mcp-server.ts

@@ -16,10 +16,22 @@ import { DOC_SEARCH_TOOL } from './tools/doc-search';
 import { FIND_EXAMPLE_TOOL } from './tools/examples';
 import { MODERNIZE_TOOL } from './tools/modernize';
 import { LIST_PROJECTS_TOOL } from './tools/projects';
-import { McpToolDeclaration, registerTools } from './tools/tool-registry';
+import { AnyMcpToolDeclaration, registerTools } from './tools/tool-registry';
+
+/**
+ * The set of tools that are enabled by default for the MCP server.
+ * These tools are considered stable and suitable for general use.
+ */
+const STABLE_TOOLS = [BEST_PRACTICES_TOOL, DOC_SEARCH_TOOL, LIST_PROJECTS_TOOL] as const;
+
+/**
+ * The set of tools that are available but not enabled by default.
+ * These tools are considered experimental and may have limitations.
+ */
+const EXPERIMENTAL_TOOLS = [FIND_EXAMPLE_TOOL, MODERNIZE_TOOL] as const;
 
 export async function createMcpServer(
-  context: {
+  options: {
     workspace?: AngularWorkspace;
     readOnly?: boolean;
     localOnly?: boolean;
@@ -46,51 +58,61 @@ export async function createMcpServer(
 
   registerInstructionsResource(server);
 
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  let toolDeclarations: McpToolDeclaration<any, any>[] = [
-    BEST_PRACTICES_TOOL,
-    DOC_SEARCH_TOOL,
-    LIST_PROJECTS_TOOL,
-  ];
-  const experimentalToolDeclarations = [FIND_EXAMPLE_TOOL, MODERNIZE_TOOL];
+  const toolDeclarations = assembleToolDeclarations(STABLE_TOOLS, EXPERIMENTAL_TOOLS, {
+    ...options,
+    logger,
+  });
 
-  if (context.readOnly) {
+  await registerTools(
+    server,
+    {
+      workspace: options.workspace,
+      logger,
+      exampleDatabasePath: path.join(__dirname, '../../../lib/code-examples.db'),
+    },
+    toolDeclarations,
+  );
+
+  return server;
+}
+
+export function assembleToolDeclarations(
+  stableDeclarations: readonly AnyMcpToolDeclaration[],
+  experimentalDeclarations: readonly AnyMcpToolDeclaration[],
+  options: {
+    readOnly?: boolean;
+    localOnly?: boolean;
+    experimentalTools?: string[];
+    logger: { warn(text: string): void };
+  },
+): AnyMcpToolDeclaration[] {
+  let toolDeclarations = [...stableDeclarations];
+
+  if (options.readOnly) {
     toolDeclarations = toolDeclarations.filter((tool) => tool.isReadOnly);
   }
 
-  if (context.localOnly) {
+  if (options.localOnly) {
     toolDeclarations = toolDeclarations.filter((tool) => tool.isLocalOnly);
   }
 
-  const enabledExperimentalTools = new Set(context.experimentalTools);
+  const enabledExperimentalTools = new Set(options.experimentalTools);
   if (process.env['NG_MCP_CODE_EXAMPLES'] === '1') {
     enabledExperimentalTools.add('find_examples');
   }
 
   if (enabledExperimentalTools.size > 0) {
-    const experimentalToolsMap = new Map(
-      experimentalToolDeclarations.map((tool) => [tool.name, tool]),
-    );
+    const experimentalToolsMap = new Map(experimentalDeclarations.map((tool) => [tool.name, tool]));
 
     for (const toolName of enabledExperimentalTools) {
       const tool = experimentalToolsMap.get(toolName);
       if (tool) {
         toolDeclarations.push(tool);
       } else {
-        logger.warn(`Unknown experimental tool: ${toolName}`);
+        options.logger.warn(`Unknown experimental tool: ${toolName}`);
       }
     }
   }
 
-  await registerTools(
-    server,
-    {
-      workspace: context.workspace,
-      logger,
-      exampleDatabasePath: path.join(__dirname, '../../../lib/code-examples.db'),
-    },
-    toolDeclarations,
-  );
-
-  return server;
+  return toolDeclarations;
 }

packages/angular/cli/src/commands/mcp/tools/tool-registry.ts

@@ -35,6 +35,9 @@ export interface McpToolDeclaration<TInput extends ZodRawShape, TOutput extends
   isLocalOnly?: boolean;
 }
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export type AnyMcpToolDeclaration = McpToolDeclaration<any, any>;
+
 export function declareTool<TInput extends ZodRawShape, TOutput extends ZodRawShape>(
   declaration: McpToolDeclaration<TInput, TOutput>,
 ): McpToolDeclaration<TInput, TOutput> {
@@ -44,8 +47,7 @@ export function declareTool<TInput extends ZodRawShape, TOutput extends ZodRawSh
 export async function registerTools(
   server: McpServer,
   context: McpToolContext,
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  declarations: McpToolDeclaration<any, any>[],
+  declarations: AnyMcpToolDeclaration[],
 ): Promise<void> {
   for (const declaration of declarations) {
     if (declaration.shouldRegister && !(await declaration.shouldRegister(context))) {