Follow-ups to #5215

Author: L-Qun

apps/rush-mcp-server/src/tools/docs.tool.ts

@@ -2,6 +2,8 @@
 // See LICENSE in the project root for license information.
 
 import { z } from 'zod';
+import { JsonFile } from '@rushstack/node-core-library';
+import path from 'path';
 
 import { BaseTool, type CallToolResult } from './base.tool';
 
@@ -20,30 +22,35 @@ export class RushDocsTool extends BaseTool {
     super({
       name: 'rush_docs',
       description:
-        'Search and retrieve relevant sections from Rush official documentation based on user queries.',
+        'Search and retrieve relevant sections from the official Rush documentation based on user queries.',
       schema: {
         userQuery: z.string().describe('The user query to search for relevant documentation sections.')
       }
     });
   }
 
-  public async executeAsync({ userQuery }: { userQuery: string }): Promise<CallToolResult> {
-    // An example of a knowledge base that can run, but needs to be replaced with Microsoft’s service.
-    const response: Response = await fetch('http://47.120.46.115/search', {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json'
-      },
-      body: JSON.stringify({ query: userQuery, topK: 10 })
-    });
+  // TODO: replace with Microsoft's service
+  private searchDocs(query: string): IDocsResult {
+    const startTime = Date.now();
+
+    const results = JsonFile.load(path.join(__dirname, '../rush-doc-fragment.mock.json'));
+
+    return {
+      query,
+      results,
+      count: results.length,
+      searchTimeMs: Date.now() - startTime
+    };
+  }
 
-    const result: IDocsResult = (await response.json()) as IDocsResult;
+  public async executeAsync({ userQuery }: { userQuery: string }): Promise<CallToolResult> {
+    const docSearchResult: IDocsResult = this.searchDocs(userQuery);
 
     return {
       content: [
         {
           type: 'text',
-          text: result.results.map((item) => item.text).join('\n')
+          text: docSearchResult.results.map((item) => item.text).join('\n\n')
         }
       ]
     };

apps/rush-mcp-server/src/tools/migrate-project.tool.ts

@@ -125,8 +125,8 @@ export class RushMigrateProjectTool extends BaseTool {
           type: 'text',
           text:
             `Project "${projectName}" migrated to subspace "${targetSubspaceName}" successfully. ` +
-            `You can ask whether user wants to run "rush update --subspace ${targetSubspaceName}" to update the project. ` +
-            `If user says "yes" you can run "rush update --subspace ${targetSubspaceName}" directly for them.`
+            `You can ask whether the user wants to run "rush update --subspace ${targetSubspaceName}" to update the project. ` +
+            `If the user says "yes", you can run "rush update --subspace ${targetSubspaceName}" directly for them.`
         }
       ]
     };

apps/rush-mcp-server/src/tools/rush-command-validator.tool.ts

@@ -88,7 +88,7 @@ export class RushCommandValidatorTool extends BaseTool {
             content: [
               {
                 type: 'text',
-                text: `The package "${packageName}" does not exist in the Rush workspace. You can retrive package name from 'package.json' file in the project folder.`
+                text: `The package "${packageName}" does not exist in the Rush workspace. You can retrieve the package name from the 'package.json' file in the project folder.`
               }
             ]
           };

common/changes/@rushstack/mcp-server/main_2025-05-02-03-43.json

@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@rushstack/mcp-server",
+      "comment": "Follow-ups to #5215",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@rushstack/mcp-server"
+}

common/config/rush/nonbrowser-approved-packages.json

@@ -969,6 +969,10 @@
     {
       "name": "xmldoc",
       "allowedCategories": [ "libraries" ]
+    },
+    {
+      "name": "zod",
+      "allowedCategories": [ "libraries" ]
     }
   ]
 }