@softeria/ms-365-mcp-server 0.97.0 → 0.98.0

package/dist/__tests__/graph-tools.test.js

@@ -643,4 +643,86 @@ describe("graph-tools", () => {
       expect(payload.error).toMatch(/not found/i);
     });
   });
+  describe("discovery mode: --enabled-tools filter", () => {
+    it("search-tools only surfaces Graph tools matching the regex", async () => {
+      mockEndpoints.push(
+        {
+          alias: "list-mail-messages",
+          method: "get",
+          path: "/me/messages",
+          description: "List mail",
+          parameters: []
+        },
+        {
+          alias: "list-calendar-events",
+          method: "get",
+          path: "/me/events",
+          description: "List events",
+          parameters: []
+        }
+      );
+      mockEndpointsJson = [
+        { toolName: "list-mail-messages", method: "get", pathPattern: "/me/messages" },
+        { toolName: "list-calendar-events", method: "get", pathPattern: "/me/events" }
+      ];
+      const server = createMockServer();
+      const { registerDiscoveryTools } = await loadModule();
+      registerDiscoveryTools(server, {}, false, false, void 0, false, [], "mail");
+      const result = await server.tools.get("search-tools").handler({ limit: 50 });
+      const found = JSON.parse(result.content[0].text).tools.map((t) => t.name);
+      expect(found).toContain("list-mail-messages");
+      expect(found).not.toContain("list-calendar-events");
+    });
+    it("utility tools obey the regex too", async () => {
+      mockEndpoints.length = 0;
+      mockEndpointsJson = [];
+      const server = createMockServer();
+      const { registerDiscoveryTools } = await loadModule();
+      registerDiscoveryTools(
+        server,
+        {},
+        false,
+        false,
+        void 0,
+        false,
+        [],
+        "^download-bytes$"
+      );
+      const result = await server.tools.get("search-tools").handler({ limit: 50 });
+      const found = JSON.parse(result.content[0].text).tools.map((t) => t.name);
+      expect(found).toContain("download-bytes");
+      expect(found).not.toContain("parse-teams-url");
+    });
+    it("invalid regex pattern is ignored, all tools surface", async () => {
+      mockEndpoints.length = 0;
+      mockEndpointsJson = [];
+      const server = createMockServer();
+      const { registerDiscoveryTools } = await loadModule();
+      registerDiscoveryTools(
+        server,
+        {},
+        false,
+        false,
+        void 0,
+        false,
+        [],
+        "[invalid"
+      );
+      const result = await server.tools.get("search-tools").handler({ limit: 50 });
+      const found = JSON.parse(result.content[0].text).tools.map((t) => t.name);
+      expect(found).toContain("download-bytes");
+      expect(found).toContain("parse-teams-url");
+    });
+  });
+  describe("utility tools in read-only mode", () => {
+    it("skips utility tools whose readOnlyHint is not true", async () => {
+      mockEndpoints.length = 0;
+      mockEndpointsJson = [];
+      const server = createMockServer();
+      const { registerGraphTools } = await loadModule();
+      registerGraphTools(server, {}, true);
+      expect(server.tools.has("download-bytes")).toBe(true);
+      expect(server.tools.has("parse-teams-url")).toBe(true);
+    });
+  });
 });

package/dist/graph-tools.js

@@ -543,6 +543,7 @@ function registerGraphTools(server, graphClient, readOnly = false, enabledToolsP
     accountNames
   };
   for (const utility of UTILITY_TOOLS) {
+    if (readOnly && !utility.readOnlyHint) continue;
     if (enabledToolsRegex && !enabledToolsRegex.test(utility.name)) continue;
     try {
       registerUtilityToolWithMcp(server, utility, utilityCtx);
@@ -557,7 +558,7 @@ function registerGraphTools(server, graphClient, readOnly = false, enabledToolsP
   );
   return registeredCount;
 }
-function buildToolsRegistry(readOnly, orgMode) {
+function buildToolsRegistry(readOnly, orgMode, enabledToolsRegex) {
   const toolsMap = /* @__PURE__ */ new Map();
   for (const tool of api.endpoints) {
     const endpointConfig = endpointsData.find((e) => e.toolName === tool.alias);
@@ -570,6 +571,9 @@ function buildToolsRegistry(readOnly, orgMode) {
         continue;
       }
     }
+    if (enabledToolsRegex && !enabledToolsRegex.test(tool.alias)) {
+      continue;
+    }
     toolsMap.set(tool.alias, { tool, config: endpointConfig });
   }
   return toolsMap;
@@ -631,9 +635,24 @@ function scoreDiscoveryQuery(query, index) {
   ranked.sort((a, b) => b.score - a.score);
   return ranked;
 }
-function registerDiscoveryTools(server, graphClient, readOnly = false, orgMode = false, authManager, multiAccount = false, accountNames = []) {
-  const toolsRegistry = buildToolsRegistry(readOnly, orgMode);
-  const utilityTools = UTILITY_TOOLS;
+function registerDiscoveryTools(server, graphClient, readOnly = false, orgMode = false, authManager, multiAccount = false, accountNames = [], enabledTools) {
+  let enabledToolsRegex;
+  if (enabledTools) {
+    try {
+      enabledToolsRegex = new RegExp(enabledTools, "i");
+      logger.info(`Discovery mode: filtering tools with pattern ${enabledTools}`);
+    } catch (error) {
+      logger.error(
+        `Invalid --enabled-tools regex ${JSON.stringify(enabledTools)} \u2014 ignoring filter: ${error.message}`
+      );
+    }
+  }
+  const toolsRegistry = buildToolsRegistry(readOnly, orgMode, enabledToolsRegex);
+  const utilityTools = UTILITY_TOOLS.filter((u) => {
+    if (readOnly && !u.readOnlyHint) return false;
+    if (enabledToolsRegex && !enabledToolsRegex.test(u.name)) return false;
+    return true;
+  });
   const searchIndex = buildDiscoverySearchIndex(toolsRegistry, utilityTools);
   const totalCount = toolsRegistry.size + utilityTools.length;
   logger.info(

package/dist/server.js

@@ -75,7 +75,8 @@ class MicrosoftGraphServer {
         this.options.orgMode,
         this.authManager,
         this.multiAccount,
-        this.accountNames
+        this.accountNames,
+        this.options.enabledTools
       );
     } else {
       registerGraphTools(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@softeria/ms-365-mcp-server",
-  "version": "0.97.0",
+  "version": "0.98.0",
   "description": " A Model Context Protocol (MCP) server for interacting with Microsoft 365 and Office services through the Graph API",
   "type": "module",
   "main": "dist/index.js",