@softeria/ms-365-mcp-server 0.161.0 → 0.161.2

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

@@ -458,9 +458,10 @@ describe("graph-tools", () => {
         const server = createMockServer();
         const { registerGraphTools } = await loadModule();
         registerGraphTools(server, graphClient);
-        await server.tools.get("test-tool").handler({ fetchAllPages: true });
+        const result = await server.tools.get("test-tool").handler({ fetchAllPages: true });
         const [payload] = auditLogMock.mock.calls[0];
         expect(payload.result_count).toBe(2);
+        expect(JSON.parse(result.content[0].text)["@odata.nextLink"]).toBeUndefined();
         expect(payload.result_has_more).toBe(true);
         expect(payload.response_bytes).toBe(100);
       } finally {
@@ -471,6 +472,64 @@ describe("graph-tools", () => {
         }
       }
     });
+    it("reports result_has_more when a page is not a collection", async () => {
+      mockEndpoints.push(makeEndpoint());
+      mockEndpointsJson = [makeConfig()];
+      const pageThreeLink = "https://graph.microsoft.com/v1.0/me/messages?$skip=4";
+      const graphClient = createMockGraphClient([
+        {
+          content: [
+            {
+              type: "text",
+              text: JSON.stringify({
+                value: [{ id: "1" }, { id: "2" }],
+                "@odata.nextLink": "https://graph.microsoft.com/v1.0/me/messages?$skip=2"
+              })
+            }
+          ],
+          _meta: { http_status: 200, result_count: 2, result_has_more: true, response_bytes: 1e3 }
+        },
+        {
+          content: [
+            {
+              type: "text",
+              text: JSON.stringify({
+                value: [{ id: "3" }, { id: "4" }],
+                "@odata.nextLink": pageThreeLink
+              })
+            }
+          ],
+          _meta: { http_status: 200, result_count: 2, result_has_more: true, response_bytes: 900 }
+        },
+        {
+          content: [
+            {
+              type: "text",
+              text: JSON.stringify({
+                message: "OK!",
+                contentType: "application/json",
+                encoding: "base64",
+                contentLength: 9,
+                contentBytes: "eyJ2YWx1"
+              })
+            }
+          ],
+          _meta: { http_status: 200, response_bytes: 700 }
+        }
+      ]);
+      const server = createMockServer();
+      const { registerGraphTools } = await loadModule();
+      registerGraphTools(server, graphClient);
+      const result = await server.tools.get("test-tool").handler({ fetchAllPages: true });
+      expect(graphClient.graphRequest).toHaveBeenCalledTimes(3);
+      const body = JSON.parse(result.content[0].text);
+      expect(body.value.map((item) => item.id)).toEqual(["1", "2", "3", "4"]);
+      expect(body["@odata.nextLink"]).toBe(pageThreeLink);
+      const [payload] = auditLogMock.mock.calls[0];
+      expect(payload.result_count).toBe(4);
+      expect(payload.result_has_more).toBe(true);
+      expect(payload.response_bytes).toBe(1900);
+    });
     it("omits the volume fields when the client supplied none", async () => {
       const endpoint = makeEndpoint({ method: "get", path: "/me", alias: "get-current-user" });
       const config = makeConfig({

package/dist/endpoints.json

@@ -2324,6 +2324,7 @@
     "pathPattern": "/groups/{group-id}/threads/{conversationThread-id}/reply",
     "method": "post",
     "toolName": "reply-to-group-thread",
+    "descriptionOverride": "Reply to a conversation thread in a Microsoft 365 group, adding a new post to the thread. Use list-group-threads to obtain the thread ID.",
     "presets": ["work"],
     "workScopes": ["Group.ReadWrite.All"],
     "llmTip": "Legacy — Microsoft recommends Teams channels instead of group threads."

package/dist/graph-client.js

@@ -401,7 +401,7 @@ class GraphClient {
       const removeODataProps2 = (obj) => {
         if (typeof obj === "object" && obj !== null) {
           Object.keys(obj).forEach((key) => {
-            if (key.startsWith("@odata.") && key !== "@odata.nextLink" && key !== "@odata.deltaLink") {
+            if (key.startsWith("@odata.") && key !== "@odata.nextLink" && key !== "@odata.deltaLink" && key !== "@odata.count") {
               delete obj[key];
             } else if (typeof obj[key] === "object") {
               removeODataProps2(obj[key]);
@@ -430,7 +430,7 @@ class GraphClient {
     const removeODataProps = (obj) => {
       if (typeof obj === "object" && obj !== null) {
         Object.keys(obj).forEach((key) => {
-          if (key.startsWith("@odata.") && key !== "@odata.nextLink" && key !== "@odata.deltaLink") {
+          if (key.startsWith("@odata.") && key !== "@odata.nextLink" && key !== "@odata.deltaLink" && key !== "@odata.count") {
             delete obj[key];
           } else if (typeof obj[key] === "object") {
             removeODataProps(obj[key]);

package/dist/graph-tools.js

@@ -1726,6 +1726,7 @@ async function executeGraphTool(tool, config, graphClient, params, authManager,
           const maxPages = positiveIntFromEnv("MS365_MCP_MAX_PAGES", DEFAULT_MAX_PAGES);
           const maxItems = positiveIntFromEnv("MS365_MCP_MAX_ITEMS", DEFAULT_MAX_ITEMS);
           let deltaLink = combinedResponse["@odata.deltaLink"];
+          let unmergeablePage = false;
           while (nextLink && pageCount < maxPages && allItems.length < maxItems) {
             logger.info(`Fetching page ${pageCount + 1} from: ${nextLink}`);
             const url = new URL(nextLink);
@@ -1739,9 +1740,14 @@ async function executeGraphTool(tool, config, graphClient, params, authManager,
             }
             if (nextResponse?.content?.[0]?.text) {
               const nextJsonResponse = JSON.parse(nextResponse.content[0].text);
-              if (Array.isArray(nextJsonResponse.value)) {
-                allItems = allItems.concat(nextJsonResponse.value);
+              if (!Array.isArray(nextJsonResponse.value)) {
+                logger.warn(
+                  `Pagination stopped at page ${pageCount + 1}: response was not a collection`
+                );
+                unmergeablePage = true;
+                break;
               }
+              allItems = allItems.concat(nextJsonResponse.value);
               nextLink = nextJsonResponse["@odata.nextLink"];
               if (typeof totalResponseBytes === "number" && typeof nextResponse._meta?.response_bytes === "number") {
                 totalResponseBytes += nextResponse._meta.response_bytes;
@@ -1751,6 +1757,7 @@ async function executeGraphTool(tool, config, graphClient, params, authManager,
               }
               pageCount++;
             } else {
+              unmergeablePage = true;
               break;
             }
           }
@@ -1764,10 +1771,11 @@ async function executeGraphTool(tool, config, graphClient, params, authManager,
               );
             }
             combinedResponse.value = allItems;
-            if (combinedResponse["@odata.count"]) {
-              combinedResponse["@odata.count"] = allItems.length;
+            if (unmergeablePage && nextLink) {
+              combinedResponse["@odata.nextLink"] = nextLink;
+            } else {
+              delete combinedResponse["@odata.nextLink"];
             }
-            delete combinedResponse["@odata.nextLink"];
             response._meta = {
               ...response._meta,
               result_count: allItems.length,
@@ -1778,7 +1786,7 @@ async function executeGraphTool(tool, config, graphClient, params, authManager,
               combinedResponse["@odata.deltaLink"] = deltaLink;
             }
             logger.info(
-              `Pagination complete: collected ${allItems.length} items across ${pageCount} pages`
+              `Pagination ${nextLink ? "incomplete" : "complete"}: collected ${allItems.length} items across ${pageCount} pages`
             );
           }
         }

package/dist/lib/param-descriptions.js

@@ -31,7 +31,7 @@ function isFetchAllPagesApplicable(tool) {
 const FILTER_PARAM_DESCRIPTION = "OData filter expression. Add $count=true for advanced filters (flag/flagStatus, contains()). Cannot combine with $search.";
 const SEARCH_PARAM_DESCRIPTION = "KQL search query in one pair of double quotes; directory (users/groups) instead quotes each clause with no outer pair. Cannot combine with $filter.";
 const SELECT_PARAM_DESCRIPTION = "Comma-separated fields to return, e.g. id,subject,from,receivedDateTime";
-const EXPAND_PARAM_DESCRIPTION = 'Navigation properties to inline, e.g. attachments on a message or event. Only navigation properties can be expanded: expanding a non-navigation property such as a message body fails with "Parsing OData Select and Expand failed", and an unsupported value may be ignored rather than reported. Request ordinary fields with $select instead.';
+const EXPAND_PARAM_DESCRIPTION = 'Navigation properties to inline, e.g. attachments on a message or event. Only navigation properties can be expanded: expanding a non-navigation property such as a message body fails with "Parsing OData Select and Expand failed". Request ordinary fields with $select instead. Some APIs accept only one relationship per request, so prefer a single value. Some relationships support nested selection, e.g. children($select=id,name).';
 const ORDERBY_PARAM_DESCRIPTION = "Sort expression, e.g. receivedDateTime desc";
 const TOP_PARAM_DESCRIPTION = "Page size (Graph $top). Start small (e.g. 5\u201315) so responses fit the model context; raise only if needed. Use $select to return fewer fields per item. For more rows, use @odata.nextLink from the response instead of a very large $top.";
 const SKIP_PARAM_DESCRIPTION = "Items to skip for pagination. Not supported with $search.";
@@ -44,7 +44,7 @@ function isSkiptokenApplicable(tool, paramNames) {
   }
   return false;
 }
-const COUNT_PARAM_DESCRIPTION = "Set true to enable advanced query mode (ConsistencyLevel: eventual). Required for complex $filter on flag/flagStatus or contains().";
+const COUNT_PARAM_DESCRIPTION = "Set true to enable advanced query mode (ConsistencyLevel: eventual). Required for complex $filter on flag/flagStatus or contains(). The response then includes @odata.count, the total for the filtered collection, which can exceed the items returned when fetchAllPages hits its page/item cap.";
 const CONFIRM_PARAM_DESCRIPTION = 'For destructive operations when the confirm gate is enabled (MS365_MCP_REQUIRE_CONFIRM=true; off by default). Set to true only after the user has explicitly approved this action. When the gate is on, calls without confirm: true return { error: "confirmation_required" } without touching user data.';
 const TIMEZONE_PARAM_DESCRIPTION = 'IANA timezone name (e.g., "America/New_York", "Europe/London", "Asia/Tokyo") for calendar event times. If not specified, times are returned in UTC.';
 const EXPAND_EXTENDED_PROPERTIES_PARAM_DESCRIPTION = "When true, expands singleValueExtendedProperties on each event. Use this to retrieve custom extended properties (e.g., sync metadata) stored on calendar events.";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@softeria/ms-365-mcp-server",
   "mcpName": "io.github.Softeria/ms-365-mcp-server",
-  "version": "0.161.0",
+  "version": "0.161.2",
   "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",

package/src/endpoints.json

@@ -2324,6 +2324,7 @@
     "pathPattern": "/groups/{group-id}/threads/{conversationThread-id}/reply",
     "method": "post",
     "toolName": "reply-to-group-thread",
+    "descriptionOverride": "Reply to a conversation thread in a Microsoft 365 group, adding a new post to the thread. Use list-group-threads to obtain the thread ID.",
     "presets": ["work"],
     "workScopes": ["Group.ReadWrite.All"],
     "llmTip": "Legacy — Microsoft recommends Teams channels instead of group threads."