feat: resolve the todos

Author: L-Qun

apps/rush-mcp-server/src/pluginFramework/IRushMcpTool.ts

@@ -9,7 +9,9 @@ import type { CallToolResult } from './zodTypes';
  * MCP plugins should implement this interface.
  * @public
  */
-export interface IRushMcpTool<TSchema extends zod.ZodTypeAny = zod.ZodTypeAny> {
+export interface IRushMcpTool<
+  TSchema extends zod.ZodObject<zod.ZodRawShape> = zod.ZodObject<zod.ZodRawShape>
+> {
   readonly schema: TSchema;
   executeAsync(input: zod.infer<TSchema>): Promise<CallToolResult>;
 }

apps/rush-mcp-server/src/pluginFramework/RushMcpPluginLoader.ts

@@ -2,10 +2,11 @@
 // See LICENSE in the project root for license information.
 
 import * as path from 'path';
-import { FileSystem, Import, JsonFile, JsonSchema } from '@rushstack/node-core-library';
+import { FileSystem, Import, JsonFile, type JsonObject, JsonSchema } from '@rushstack/node-core-library';
 import { Autoinstaller } from '@rushstack/rush-sdk/lib/logic/Autoinstaller';
 import { RushGlobalFolder } from '@rushstack/rush-sdk/lib/api/RushGlobalFolder';
 import { RushConfiguration } from '@rushstack/rush-sdk/lib/api/RushConfiguration';
+import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp';
 
 import type { IRushMcpPlugin, RushMcpPluginFactory } from './IRushMcpPlugin';
 import { RushMcpPluginSessionInternal } from './RushMcpPluginSession';
@@ -38,6 +39,11 @@ export interface IJsonRushMcpPlugin {
    * @rushstack/mcp-server will ensure this folder is installed before loading the plugin.
    */
   autoinstaller: string;
+
+  /**
+   * The name of the plugin. This is used to identify the plugin in the MCP server.
+   */
+  pluginName: string;
 }
 
 /**
@@ -72,9 +78,11 @@ export class RushMcpPluginLoader {
     JsonSchema.fromLoadedObject(rushMcpPluginSchemaObject);
 
   private readonly _rushWorkspacePath: string;
+  private readonly _mcpServer: McpServer;
 
-  public constructor(rushWorkspacePath: string) {
+  public constructor(rushWorkspacePath: string, mcpServer: McpServer) {
     this._rushWorkspacePath = rushWorkspacePath;
+    this._mcpServer = mcpServer;
   }
 
   public async loadAsync(): Promise<void> {
@@ -84,7 +92,6 @@ export class RushMcpPluginLoader {
     );
 
     if (!(await FileSystem.existsAsync(rushMcpFilePath))) {
-      // Should we report an error here?
       return;
     }
 
@@ -135,7 +142,23 @@ export class RushMcpPluginLoader {
         RushMcpPluginLoader._rushMcpPluginSchemaObject
       );
 
-      // TODO: Load and validate config file if defined by the manifest
+      let rushMcpPluginOptions: JsonObject = {};
+      if (jsonManifest.configFileSchema) {
+        const mcpPluginSchemaFilePath: string = path.resolve(
+          installedPluginPackageFolder,
+          jsonManifest.configFileSchema
+        );
+        const mcpPluginSchema: JsonSchema = await JsonSchema.fromFile(mcpPluginSchemaFilePath);
+        const rushMcpPluginOptionsFilePath: string = path.resolve(
+          this._rushWorkspacePath,
+          `common/config/rush-mcp/${jsonMcpPlugin.pluginName}.json`
+        );
+        // Example: /path/to/my-repo/common/config/rush-mcp/rush-mcp-example-plugin.json
+        rushMcpPluginOptions = await JsonFile.loadAndValidateAsync(
+          rushMcpPluginOptionsFilePath,
+          mcpPluginSchema
+        );
+      }
 
       const fullEntryPointPath: string = path.join(installedPluginPackageFolder, jsonManifest.entryPoint);
       let pluginFactory: RushMcpPluginFactory;
@@ -149,12 +172,11 @@ export class RushMcpPluginLoader {
         throw new Error(`Unable to load plugin entry point at ${fullEntryPointPath}: ` + e.toString());
       }
 
-      const session: RushMcpPluginSessionInternal = new RushMcpPluginSessionInternal();
+      const session: RushMcpPluginSessionInternal = new RushMcpPluginSessionInternal(this._mcpServer);
 
       let plugin: IRushMcpPlugin;
       try {
-        // TODO: Replace "{}" with the plugin's parsed config file JSON
-        plugin = pluginFactory(session, {});
+        plugin = pluginFactory(session, rushMcpPluginOptions);
       } catch (e) {
         throw new Error(`Error invoking entry point for plugin ${jsonManifest.pluginName}:` + e.toString());
       }

apps/rush-mcp-server/src/pluginFramework/RushMcpPluginSession.ts

@@ -1,8 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
 // See LICENSE in the project root for license information.
 
-import type { IRushMcpTool } from './IRushMcpTool';
 import * as zod from 'zod';
+import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp';
+
+import type { IRushMcpTool } from './IRushMcpTool';
 import type { zodModule } from './zodTypes';
 
 /**
@@ -26,11 +28,23 @@ export abstract class RushMcpPluginSession {
 }
 
 export class RushMcpPluginSessionInternal extends RushMcpPluginSession {
-  public constructor() {
+  private readonly _mcpServer: McpServer;
+
+  public constructor(mcpServer: McpServer) {
     super();
+    this._mcpServer = mcpServer;
   }
 
   public override registerTool(options: IRegisterToolOptions, tool: IRushMcpTool): void {
-    // TODO: Register the tool
+    if (options.description) {
+      this._mcpServer.tool(
+        options.toolName,
+        options.description,
+        tool.schema.shape,
+        tool.executeAsync.bind(tool)
+      );
+    } else {
+      this._mcpServer.tool(options.toolName, tool.schema.shape, tool.executeAsync.bind(tool));
+    }
   }
 }

apps/rush-mcp-server/src/schemas/rush-mcp.schema.json

@@ -16,6 +16,10 @@
           "autoinstaller": {
             "type": "string",
             "description": "The name of a Rush autoinstaller with this package as its dependency."
+          },
+          "pluginName": {
+            "type": "string",
+            "description": "The name of the plugin. This is used to identify the plugin in the MCP server."
           }
         },
         "required": ["packageName", "autoinstaller"],

apps/rush-mcp-server/src/server.ts

@@ -25,7 +25,7 @@ export class RushMCPServer extends McpServer {
     });
 
     this._rushWorkspacePath = rushWorkspacePath;
-    this._pluginLoader = new RushMcpPluginLoader(this._rushWorkspacePath);
+    this._pluginLoader = new RushMcpPluginLoader(this._rushWorkspacePath, this);
   }
 
   public async startAsync(): Promise<void> {

common/reviews/api/mcp-server.api.md

@@ -27,7 +27,7 @@ export interface IRushMcpPlugin {
 }
 
 // @public
-export interface IRushMcpTool<TSchema extends zodModule.ZodTypeAny = zodModule.ZodTypeAny> {
+export interface IRushMcpTool<TSchema extends zodModule.ZodObject<zodModule.ZodRawShape> = zodModule.ZodObject<zodModule.ZodRawShape>> {
     // (undocumented)
     executeAsync(input: zodModule.infer<TSchema>): Promise<CallToolResult>;
     // (undocumented)