@softeria/ms-365-mcp-server 0.169.3 → 0.170.1

package/.env.example

@@ -15,7 +15,7 @@ MS365_MCP_CLIENT_SECRET=your-azure-ad-app-client-secret-here
 # Tenant ID - use "common" for multi-tenant or your specific tenant ID
 MS365_MCP_TENANT_ID=common
 
-# Cloud environment: global (default) or china (21Vianet)
+# Cloud environment: global (default), china (21Vianet) or gcc-high (US Government)
 # MS365_MCP_CLOUD_TYPE=global
 
 # Instructions for Global Cloud:
@@ -37,6 +37,11 @@ MS365_MCP_TENANT_ID=common
 # 3. Follow the same steps as above
 # 4. Set MS365_MCP_CLOUD_TYPE=china
 
+# Instructions for GCC High:
+# 1. Go to https://portal.azure.us
+# 2. Register an app in your government tenant (no default client ID exists)
+# 3. Set MS365_MCP_CLIENT_ID, MS365_MCP_TENANT_ID and MS365_MCP_CLOUD_TYPE=gcc-high
+
 # -------------------------------------------------------------------
 # Azure Key Vault Integration (Optional)
 # -------------------------------------------------------------------

package/README.md

@@ -11,10 +11,13 @@ API.
 
 This server supports multiple Microsoft cloud environments:
 
-| Cloud                | Description                        | Auth Endpoint             | Graph API Endpoint              |
-| -------------------- | ---------------------------------- | ------------------------- | ------------------------------- |
-| **Global** (default) | International Microsoft 365        | login.microsoftonline.com | graph.microsoft.com             |
-| **China** (21Vianet) | Microsoft 365 operated by 21Vianet | login.chinacloudapi.cn    | microsoftgraph.chinacloudapi.cn |
+| Cloud                | Description                          | Auth Endpoint             | Graph API Endpoint              |
+| -------------------- | ------------------------------------ | ------------------------- | ------------------------------- |
+| **Global** (default) | International Microsoft 365          | login.microsoftonline.com | graph.microsoft.com             |
+| **China** (21Vianet) | Microsoft 365 operated by 21Vianet   | login.chinacloudapi.cn    | microsoftgraph.chinacloudapi.cn |
+| **GCC High**         | Microsoft 365 US Government GCC High | login.microsoftonline.us  | graph.microsoft.us              |
+
+GCC High has no pre-registered client: register an app in your government tenant and set `MS365_MCP_CLIENT_ID` (and `MS365_MCP_TENANT_ID`), then use `--cloud gcc-high`.
 
 To route Graph traffic through a proxy of your own (one that terminates the client's plain HTTP and originates TLS to Microsoft), set `MS365_MCP_GRAPH_BASE_URL` to its base URL; see the environment variable list under CLI Options, including what still bypasses it.
 
@@ -673,7 +676,7 @@ The following options can be used when running ms-365-mcp-server directly from t
 --org-mode        Enable organization/work mode from start (includes Teams, SharePoint, etc.)
 --work-mode       Alias for --org-mode
 --force-work-scopes Backwards compatibility alias for --org-mode (deprecated)
---cloud <type>    Microsoft cloud environment: global (default) or china (21Vianet)
+--cloud <type>    Microsoft cloud environment: global (default), china (21Vianet) or gcc-high
 --allowed-scopes <scopes> Limit exposed tools to Graph scopes covered by this allowlist
 --extra-scopes <scopes> Append additional Graph scopes to the token request (for use with your own app registration + graph-batch)
 --expected-username <username> Require local MSAL auth to use this account username
@@ -745,7 +748,7 @@ Environment variables:
 - `MS365_MCP_ATTACHMENT_HOST=<host>`: Interface the `MS365_MCP_ATTACHMENT_PORT` listener binds (alternative to --attachment-host; requires `--attachment-port`). Defaults to the host `--http` bound — which for a wildcard `--http` means both ports answer everywhere and the port split isolates nothing. See "Splitting the attachment listener"
 - `MS365_MCP_HTTP_LOCAL_FILE_TOOLS=true|1`: Register download-bytes-to-file, and upload-attachment-from-file when `MS365_MCP_UPLOAD_DIRS` is set, over HTTP (alternative to --http-local-file-tools; same restrictions)
 - `MS365_MCP_UPLOAD_DIRS=<dirs>`: Directories `upload-attachment-from-file` may read from, as absolute paths separated like `PATH`. Unset (the default) leaves the tool unregistered. See "Attaching a local file in stdio mode"
-- `MS365_MCP_CLOUD_TYPE=global|china`: Microsoft cloud environment (alternative to --cloud flag)
+- `MS365_MCP_CLOUD_TYPE=global|china|gcc-high`: Microsoft cloud environment (alternative to --cloud flag)
 - `MS365_MCP_GRAPH_BASE_URL=<url>`: Send Graph API requests to this base URL instead of the cloud's `graph.microsoft.com` (e.g. `http://127.0.0.1:10255/tenant-a/graph` for an egress proxy that originates TLS itself). Absolute http(s) URL without query or fragment; a path prefix is kept, so requests go to `<url>/v1.0/...`. The login authority and the On-Behalf-Of token resource are unchanged. Two things bypass it: `get-download-url` returns Graph's pre-authenticated SharePoint URL, and the `302` from `/content` points straight at SharePoint, so whoever follows either connects to SharePoint directly; if you control egress, allow those SharePoint hosts or disable those tools. Not read from `.env`
 - `LOG_LEVEL`: Set logging level (default: 'info')
 - `SILENT=true|1`: Disable console output

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

@@ -1167,7 +1167,9 @@ describe("graph-tools", () => {
       "rejects mixed-case top values before Graph dispatch for %s",
       async (alias) => {
         mockEndpoints.push(makeEndpoint({ alias }));
-        mockEndpointsJson = [makeConfig({ toolName: alias })];
+        mockEndpointsJson = [
+          makeConfig({ toolName: alias, queryParams: ["startDateTime", "skiptoken"] })
+        ];
         const graphClient = createMockGraphClient();
         const server = createMockServer();
         const { registerGraphTools } = await loadModule();
@@ -1183,7 +1185,7 @@ describe("graph-tools", () => {
       "rejects unsupported query options before Graph dispatch for %s",
       async (alias) => {
         mockEndpoints.push(makeEndpoint({ alias }));
-        mockEndpointsJson = [makeConfig({ toolName: alias })];
+        mockEndpointsJson = [makeConfig({ toolName: alias, queryParams: [] })];
         const graphClient = createMockGraphClient();
         const server = createMockServer();
         const { registerGraphTools } = await loadModule();
@@ -1198,7 +1200,7 @@ describe("graph-tools", () => {
     );
     it("rejects oversized chat pages before Graph dispatch, including dollar-prefixed input", async () => {
       mockEndpoints.push(makeEndpoint({ alias: "list-chats" }));
-      mockEndpointsJson = [makeConfig({ toolName: "list-chats" })];
+      mockEndpointsJson = [makeConfig({ toolName: "list-chats", maxTop: 50 })];
       const graphClient = createMockGraphClient();
       const server = createMockServer();
       const { registerGraphTools } = await loadModule();
@@ -1274,7 +1276,8 @@ describe("graph-tools", () => {
         endpoint,
         makeConfig({
           toolName: "list-calendar-events-delta",
-          pathPattern: "/me/calendarView/delta"
+          pathPattern: "/me/calendarView/delta",
+          queryParams: ["startDateTime", "skiptoken"]
         })
       );
       const schema = server.tools.get("list-calendar-events-delta").schema;
@@ -4291,7 +4294,7 @@ describe("graph-tools", () => {
       ["reply-to-chat-message", "post"],
       ["update-chat-message", "patch"]
     ];
-    async function call(alias, method, body) {
+    async function call(alias, method, body, flagged = true) {
       mockEndpoints.push(
         makeEndpoint({
           alias,
@@ -4301,7 +4304,12 @@ describe("graph-tools", () => {
         })
       );
       mockEndpointsJson = [
-        makeConfig({ toolName: alias, method, pathPattern: "/chats/{chat-id}/messages" })
+        makeConfig({
+          toolName: alias,
+          method,
+          pathPattern: "/chats/{chat-id}/messages",
+          mentionShorthand: flagged
+        })
       ];
       const graphClient = createMockGraphClient([
         { content: [{ type: "text", text: JSON.stringify({ id: "m1" }) }] }
@@ -4335,10 +4343,13 @@ describe("graph-tools", () => {
       expect(result.content[0].text).toContain("not an Entra object id");
       expect(graphClient.graphRequest).not.toHaveBeenCalled();
     });
-    it("does not rewrite on a tool outside the seven", async () => {
-      const { graphClient } = await call("create-draft-email", "post", {
-        body: { contentType: "html", content: `<at user-id="${U1}">Jane</at>` }
-      });
+    it("does not rewrite on a tool without mentionShorthand", async () => {
+      const { graphClient } = await call(
+        "create-draft-email",
+        "post",
+        { body: { contentType: "html", content: `<at user-id="${U1}">Jane</at>` } },
+        false
+      );
       expect(sent(graphClient).body.content).toBe(`<at user-id="${U1}">Jane</at>`);
     });
     it("lists only tools that exist in endpoints.json and documents the shorthand", async () => {
@@ -4410,7 +4421,7 @@ describe("graph-tools", () => {
     const ids = (result) => JSON.parse(result.content[0].text).value.map((m) => m.id);
     async function run(args, responses = [page(membersBody)], alias = "list-team-members", path = "/teams/{team-id}/members", outputFormat = "json") {
       mockEndpoints.push(makeEndpoint({ alias, path }));
-      mockEndpointsJson = [makeConfig({ toolName: alias, pathPattern: path })];
+      mockEndpointsJson = [makeConfig({ toolName: alias, pathPattern: path, nameFilter: true })];
       const graphClient = createMockGraphClient(responses, outputFormat);
       const server = createMockServer();
       const { registerGraphTools } = await loadModule();

package/dist/cli.js

@@ -55,7 +55,10 @@ program.name("ms-365-mcp-server").description("Microsoft 365 MCP Server").versio
 ).option("--list-presets", "List all available presets and exit").option("--list-permissions", "List all required Graph API permissions and exit").option(
   "--org-mode",
   "Enable organization/work mode from start (includes Teams, SharePoint, etc.)"
-).option("--work-mode", "Alias for --org-mode").option("--force-work-scopes", "Backwards compatibility alias for --org-mode (deprecated)").option("--toon", "(experimental) Enable TOON output format for 30-60% token reduction").option("--discovery", "Enable runtime tool discovery and loading (experimental feature)").option("--cloud <type>", "Microsoft cloud environment: global (default) or china (21Vianet)").option(
+).option("--work-mode", "Alias for --org-mode").option("--force-work-scopes", "Backwards compatibility alias for --org-mode (deprecated)").option("--toon", "(experimental) Enable TOON output format for 30-60% token reduction").option("--discovery", "Enable runtime tool discovery and loading (experimental feature)").option(
+  "--cloud <type>",
+  "Microsoft cloud environment: global (default), china (21Vianet) or gcc-high (US Government GCC High)"
+).option(
   "--enable-dynamic-registration",
   "Enable OAuth Dynamic Client Registration endpoint (kept for backwards compatibility, now enabled by default in HTTP mode)"
 ).option(

package/dist/cloud-config.js

@@ -8,6 +8,11 @@ const CLOUD_ENDPOINTS = {
     authority: "https://login.chinacloudapi.cn",
     graphApi: "https://microsoftgraph.chinacloudapi.cn",
     portal: "https://portal.azure.cn"
+  },
+  "gcc-high": {
+    authority: "https://login.microsoftonline.us",
+    graphApi: "https://graph.microsoft.us",
+    portal: "https://portal.azure.us"
   }
 };
 const DEFAULT_CLIENT_IDS = {
@@ -15,7 +20,13 @@ const DEFAULT_CLIENT_IDS = {
   china: "f3e61a6e-bc26-4281-8588-2c7359a02141"
 };
 function getDefaultClientId(cloudType = "global") {
-  return DEFAULT_CLIENT_IDS[cloudType];
+  const clientId = DEFAULT_CLIENT_IDS[cloudType];
+  if (!clientId) {
+    throw new Error(
+      `No default client ID exists for the ${cloudType} cloud. Register an app in the ${cloudType} tenant and set MS365_MCP_CLIENT_ID.`
+    );
+  }
+  return clientId;
 }
 const GRAPH_BASE_URL_ENV = "MS365_MCP_GRAPH_BASE_URL";
 function getGraphBaseUrlOverride() {

package/dist/endpoints.json

@@ -1330,7 +1330,8 @@
     "toolName": "list-todo-task-lists",
     "presets": ["personal", "tasks"],
     "scopes": ["Tasks.Read"],
-    "llmTip": "Lists all To Do task lists. Returns todoTaskList-id needed for all task operations. The default list is typically called 'Tasks'. NOTE: $select is NOT supported by this endpoint — do not pass select parameter, Graph returns 400."
+    "queryParams": ["top", "skip", "filter", "skiptoken"],
+    "llmTip": "Lists all To Do task lists. Returns todoTaskList-id needed for all task operations. The default list is typically called 'Tasks'."
   },
   {
     "pathPattern": "/me/todo/lists/{todoTaskList-id}/tasks",
@@ -1338,7 +1339,8 @@
     "toolName": "list-todo-tasks",
     "presets": ["personal", "tasks"],
     "scopes": ["Tasks.Read"],
-    "llmTip": "Lists tasks in a To Do list. Requires todoTaskList-id — use list-todo-task-lists to find it. NOTE: $select is NOT supported — do not pass select, Graph returns 400. Use $filter=status eq 'notStarted' or $filter=status eq 'completed' to filter by status. Use $top to limit results. Status values: 'notStarted', 'inProgress', 'completed', 'waitingOnOthers', 'deferred'."
+    "queryParams": ["top", "skip", "filter", "orderby", "expand", "skiptoken"],
+    "llmTip": "Lists tasks in a To Do list. Requires todoTaskList-id — use list-todo-task-lists to find it. Use $filter=status eq 'notStarted' or $filter=status eq 'completed' to filter by status. Use $top to limit results. Status values: 'notStarted', 'inProgress', 'completed', 'waitingOnOthers', 'deferred'. $orderby works on createdDateTime, lastModifiedDateTime, importance, status and reminderDateTime/dateTime, not on title or isReminderOn. A $filter on isReminderOn can also return 400; filter it client-side."
   },
   {
     "pathPattern": "/me/todo/lists/{todoTaskList-id}/tasks/{todoTask-id}",
@@ -1346,7 +1348,8 @@
     "toolName": "get-todo-task",
     "presets": ["personal", "tasks"],
     "scopes": ["Tasks.Read"],
-    "llmTip": "Returns a single To Do task. NOTE: $select is NOT supported — do not pass select parameter, Graph returns RequestBroker--ParseUri (400). Use $expand=linkedResources to include linked email/resource. Returns body content (HTML format), checklist items, and linked resources."
+    "queryParams": ["expand"],
+    "llmTip": "Returns a single To Do task. Use $expand=linkedResources to include linked email/resource. Returns body content (HTML format), checklist items, and linked resources."
   },
   {
     "pathPattern": "/me/todo/lists/{todoTaskList-id}/tasks",
@@ -1377,6 +1380,7 @@
     "toolName": "list-todo-linked-resources",
     "presets": ["personal", "tasks"],
     "scopes": ["Tasks.Read"],
+    "queryParams": ["top", "skip", "filter", "orderby", "skiptoken"],
     "llmTip": "Lists resources linked to a To Do task (emails, URLs, etc.). Each linked resource has displayName, webUrl, applicationName, and externalId."
   },
   {
@@ -1401,7 +1405,8 @@
     "toolName": "list-todo-checklist-items",
     "presets": ["personal", "tasks"],
     "scopes": ["Tasks.Read"],
-    "llmTip": "Lists the steps (checklist items) of a To Do task. Each item has id, displayName, isChecked, checkedDateTime, and createdDateTime. Graph supports no OData query parameters on this endpoint, so do not pass select, filter, orderby, or top. Requires todoTaskListId from list-todo-task-lists and todoTaskId from list-todo-tasks."
+    "queryParams": [],
+    "llmTip": "Lists the steps (checklist items) of a To Do task. Each item has id, displayName, isChecked, checkedDateTime, and createdDateTime. Requires todoTaskListId from list-todo-task-lists and todoTaskId from list-todo-tasks."
   },
   {
     "pathPattern": "/me/todo/lists/{todoTaskList-id}/tasks/{todoTask-id}/checklistItems",
@@ -1722,6 +1727,7 @@
     "toolName": "list-chats",
     "presets": ["teams", "teams-write", "work"],
     "workScopes": ["Chat.ReadBasic"],
+    "maxTop": 50,
     "llmTip": "Lists the signed-in user's chats. Only $filter, $top (max 50), $expand (members, lastMessagePreview) and $orderby are supported; $orderby accepts just lastMessagePreview/createdDateTime in descending order. Other options are rejected: $search returns 400 'Query option Search is not allowed', and ordering by lastUpdatedDateTime returns 400 BadRequest. Meeting chats have chatType=meeting and carry the meeting subject in topic."
   },
   {
@@ -1737,6 +1743,7 @@
     "toolName": "list-chat-members",
     "presets": ["teams", "work"],
     "workScopes": ["ChatMember.Read"],
+    "nameFilter": true,
     "llmTip": "Lists members of a chat. Each member has displayName, email, roles (owner/guest), and visibleHistoryStartDateTime. For meeting chats, use the chatInfo.threadId from get-online-meeting as the chat-id to see who participated in the meeting chat. Pass name to keep only members whose displayName or email contains that text (case-insensitive); use the returned userId in an @mention."
   },
   {
@@ -1760,6 +1767,7 @@
     "toolName": "update-chat-message",
     "presets": ["teams", "work"],
     "workScopes": ["Chat.ReadWrite"],
+    "mentionShorthand": true,
     "llmTip": "To @mention someone, put <at user-id=\"<aad-user-id>\">Display Name</at> in the html content; the server numbers the tag and builds the mentions array. Use the userId field (not id) from list-team-members or list-chat-members. Use contentType html in the body."
   },
   {
@@ -1776,6 +1784,7 @@
     "toolName": "send-chat-message",
     "presets": ["teams", "teams-write", "work"],
     "workScopes": ["ChatMessage.Send"],
+    "mentionShorthand": true,
     "llmTip": "To @mention someone, put <at user-id=\"<aad-user-id>\">Display Name</at> in the html content; the server numbers the tag and builds the mentions array. Use the userId field (not id) from list-team-members or list-chat-members. Use contentType 'html' in the body — plain text contentType gets mangled by Graph API. Alternatively, hand-build the raw form: put an <at id=\"0\">Name</at> tag in the html content and add a mentions array to the request body, as a sibling of the body property (not a separate top-level tool parameter): { body: { contentType: 'html', content: 'Hi <at id=\"0\">Name</at>' }, mentions: [{ id: 0, mentionText: 'Name', mentioned: { user: { id: '<aad-user-id>', displayName: 'Name', userIdentityType: 'aadUser' } } }] }. Each mention id must match its <at id> value; include userIdentityType: 'aadUser' or Graph returns 400 'value without a type name'."
   },
   {
@@ -1783,7 +1792,8 @@
     "method": "get",
     "toolName": "list-joined-teams",
     "presets": ["teams", "teams-write", "work"],
-    "workScopes": ["Team.ReadBasic.All"]
+    "workScopes": ["Team.ReadBasic.All"],
+    "queryParams": []
   },
   {
     "pathPattern": "/teamwork/messaging/customEmojis",
@@ -1792,6 +1802,7 @@
     "apiVersion": "beta",
     "presets": ["teams", "work"],
     "workScopes": ["TeamworkCustomEmoji.Read"],
+    "queryParams": ["top", "filter", "select", "skiptoken"],
     "llmTip": "Lists the organization's custom Teams emojis, including displayName, createdBy and createdDateTime. Graph can return contentBytes: null by default; request select='displayName,contentBytes' (or a string array) to retrieve base64 PNG/GIF images. Supports $top, $filter and $select. Image bytes can make responses large: use a small $top when selecting contentBytes; use fetchAllPages only for an explicitly requested export. displayName is the unique key, not an id. Work/school accounts only. Microsoft Graph beta API: subject to change."
   },
   {
@@ -1865,7 +1876,8 @@
     "method": "get",
     "toolName": "list-channel-messages",
     "presets": ["teams", "work"],
-    "workScopes": ["ChannelMessage.Read.All"]
+    "workScopes": ["ChannelMessage.Read.All"],
+    "queryParams": ["top", "expand", "skiptoken"]
   },
   {
     "pathPattern": "/teams/{team-id}/channels/{channel-id}/messages/{chatMessage-id}",
@@ -1880,6 +1892,7 @@
     "toolName": "update-channel-message",
     "presets": ["teams", "work"],
     "workScopes": ["ChannelMessage.ReadWrite"],
+    "mentionShorthand": true,
     "llmTip": "To @mention someone, put <at user-id=\"<aad-user-id>\">Display Name</at> in the html content; the server numbers the tag and builds the mentions array. Use the userId field (not id) from list-team-members or list-chat-members. Use contentType html in the body."
   },
   {
@@ -1896,6 +1909,7 @@
     "toolName": "send-channel-message",
     "presets": ["teams", "teams-write", "work"],
     "workScopes": ["ChannelMessage.Send"],
+    "mentionShorthand": true,
     "llmTip": "To @mention someone, put <at user-id=\"<aad-user-id>\">Display Name</at> in the html content; the server numbers the tag and builds the mentions array. Use the userId field (not id) from list-team-members or list-chat-members. Use contentType 'html' in the body — plain text contentType gets mangled by Graph API. Alternatively, hand-build the raw form: put an <at id=\"0\">Name</at> tag in the html content and add a mentions array to the request body, as a sibling of the body property (not a separate top-level tool parameter): { body: { contentType: 'html', content: 'Hi <at id=\"0\">Name</at>' }, mentions: [{ id: 0, mentionText: 'Name', mentioned: { user: { id: '<aad-user-id>', displayName: 'Name', userIdentityType: 'aadUser' } } }] }. Each mention id must match its <at id> value; include userIdentityType: 'aadUser' or Graph returns 400 'value without a type name'."
   },
   {
@@ -1904,6 +1918,7 @@
     "toolName": "reply-to-channel-message",
     "presets": ["teams", "teams-write", "work"],
     "workScopes": ["ChannelMessage.Send"],
+    "mentionShorthand": true,
     "llmTip": "To @mention someone, put <at user-id=\"<aad-user-id>\">Display Name</at> in the html content; the server numbers the tag and builds the mentions array. Use the userId field (not id) from list-team-members or list-chat-members. Use contentType 'html' in the body — plain text contentType gets mangled by Graph API. Alternatively, hand-build the raw form: put an <at id=\"0\">Name</at> tag in the html content and add a mentions array to the request body, as a sibling of the body property (not a separate top-level tool parameter): { body: { contentType: 'html', content: 'Hi <at id=\"0\">Name</at>' }, mentions: [{ id: 0, mentionText: 'Name', mentioned: { user: { id: '<aad-user-id>', displayName: 'Name', userIdentityType: 'aadUser' } } }] }. Each mention id must match its <at id> value; include userIdentityType: 'aadUser' or Graph returns 400 'value without a type name'."
   },
   {
@@ -1911,7 +1926,8 @@
     "method": "get",
     "toolName": "list-channel-message-replies",
     "presets": ["teams", "work"],
-    "workScopes": ["ChannelMessage.Read.All"]
+    "workScopes": ["ChannelMessage.Read.All"],
+    "queryParams": ["top", "skiptoken"]
   },
   {
     "pathPattern": "/teams/{team-id}/channels/{channel-id}/messages/{chatMessage-id}/replies/{chatMessage-id1}",
@@ -1919,6 +1935,7 @@
     "toolName": "update-channel-message-reply",
     "presets": ["teams", "work"],
     "workScopes": ["ChannelMessage.ReadWrite"],
+    "mentionShorthand": true,
     "llmTip": "To @mention someone, put <at user-id=\"<aad-user-id>\">Display Name</at> in the html content; the server numbers the tag and builds the mentions array. Use the userId field (not id) from list-team-members or list-chat-members. Use contentType html in the body."
   },
   {
@@ -1962,6 +1979,7 @@
     "toolName": "list-team-members",
     "presets": ["teams", "work"],
     "workScopes": ["TeamMember.Read.All"],
+    "nameFilter": true,
     "llmTip": "Lists members of a team. Each member has displayName, email, roles and userId. Pass name to keep only members whose displayName or email contains that text (case-insensitive); use the returned userId in an @mention."
   },
   {
@@ -1985,6 +2003,7 @@
     "toolName": "reply-to-chat-message",
     "presets": ["teams", "work"],
     "workScopes": ["ChatMessage.Send"],
+    "mentionShorthand": true,
     "llmTip": "To @mention someone, put <at user-id=\"<aad-user-id>\">Display Name</at> in the html content; the server numbers the tag and builds the mentions array. Use the userId field (not id) from list-team-members or list-chat-members. Use contentType 'html' in the body — plain text contentType gets mangled by Graph API. Alternatively, hand-build the raw form: put an <at id=\"0\">Name</at> tag in the html content and add a mentions array to the request body, as a sibling of the body property (not a separate top-level tool parameter): { body: { contentType: 'html', content: 'Hi <at id=\"0\">Name</at>' }, mentions: [{ id: 0, mentionText: 'Name', mentioned: { user: { id: '<aad-user-id>', displayName: 'Name', userIdentityType: 'aadUser' } } }] }. Each mention id must match its <at id> value; include userIdentityType: 'aadUser' or Graph returns 400 'value without a type name'."
   },
   {
@@ -2543,6 +2562,7 @@
     "toolName": "list-calendar-events-delta",
     "presets": ["calendar", "outlook", "personal"],
     "scopes": ["Calendars.Read"],
+    "queryParams": ["startDateTime", "skiptoken"],
     "llmTip": "Incremental sync of events across the default calendar. First call returns all events plus @odata.deltaLink. Subsequent calls with that link return only additions/updates/removals. Deltas expire after ~30 days — start over if the server returns 410 Gone. For a time-bounded view with delta semantics, use list-calendar-view-delta instead."
   },
   {
@@ -2552,6 +2572,7 @@
     "presets": ["calendar", "outlook", "personal"],
     "scopes": ["Calendars.Read"],
     "supportsTimezone": true,
+    "queryParams": ["startDateTime", "endDateTime", "skiptoken"],
     "llmTip": "Incremental sync of events within a time window. Required query params on first call: startDateTime, endDateTime (ISO 8601). Returns events in the window plus @odata.deltaLink; subsequent calls with that link return only changes. Expands recurring events to individual occurrences (unlike list-calendar-events-delta which returns the series master). Use this for calendar UIs showing a week/month view."
   },
   {
@@ -2948,6 +2969,7 @@
     "toolName": "list-my-associated-teams",
     "presets": ["teams", "work"],
     "workScopes": ["Team.ReadBasic.All"],
+    "queryParams": [],
     "llmTip": "Lists Teams the current user is associated with — both joined teams and host teams of shared channels the user is a direct member of. Returns associatedTeamInfo objects with id, displayName, and tenantId. Broader than list-joined-teams because it includes shared-channel host teams."
   },
   {

package/dist/graph-tools.js

@@ -36,6 +36,7 @@ import {
   getMaxPages,
   isFetchAllPagesApplicable,
   isSkiptokenApplicable,
+  MEMBER_NAME_PARAM_DESCRIPTION,
   paginationAllowed,
   positiveIntFromEnv,
   SKIPTOKEN_PARAM_DESCRIPTION,
@@ -213,8 +214,6 @@ function rewriteMailSearchQuotes(expr) {
   }
   return balanceTrailingSlashes(out.trim());
 }
-const MEMBER_NAME_FILTER_TOOLS = /* @__PURE__ */ new Set(["list-team-members", "list-chat-members"]);
-const MEMBER_NAME_PARAM_DESCRIPTION = "Case-insensitive text to match against each member's displayName and email. Applied after $select projection, so only fields you can see are matched. Without fetchAllPages only the fetched page is filtered, and @odata.count still reports the unfiltered total.";
 function filterMembersByName(parsed, name) {
   const needle = name.trim().toLowerCase();
   if (needle === "" || !isPlainObject(parsed) || !Array.isArray(parsed.value)) return parsed;
@@ -407,15 +406,6 @@ function collectRecipients(node, domains, counter, depth = 0) {
     collectRecipients(value, domains, counter, depth + 1);
   }
 }
-const MENTION_SHORTHAND_TOOLS = /* @__PURE__ */ new Set([
-  "send-channel-message",
-  "reply-to-channel-message",
-  "update-channel-message",
-  "update-channel-message-reply",
-  "send-chat-message",
-  "reply-to-chat-message",
-  "update-chat-message"
-]);
 const AAD_GUID = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
 const SHORTHAND_AT = /<at\s+user-id="([^"]*)">([^<]*)<\/at>/gi;
 const HAS_SHORTHAND = /<at\b[^>]*\buser-id\b/i;
@@ -1773,10 +1763,10 @@ async function executeGraphTool(tool, config, graphClient, params, authManager,
       parameterDefinitions.find((p) => p.type === "Body")?.schema
     );
     const strayBodyFields = {};
-    const memberNameFilter = MEMBER_NAME_FILTER_TOOLS.has(tool.alias) && typeof params.name === "string" ? params.name : void 0;
+    const memberNameFilter = config?.nameFilter && typeof params.name === "string" ? params.name : void 0;
     for (const [paramName, paramValue] of Object.entries(params)) {
       if (paramName === "fileName" && config?.blobOutput) continue;
-      if (paramName === "name" && MEMBER_NAME_FILTER_TOOLS.has(tool.alias)) continue;
+      if (paramName === "name" && config?.nameFilter) continue;
       if ([
         "account",
         "confirm",
@@ -1811,9 +1801,9 @@ async function executeGraphTool(tool, config, graphClient, params, authManager,
       const isQuery = paramDef?.type === "Query" || isOdataParam;
       if (isQuery && paramValue != null && paramValue !== "") {
         const schema = queryParameterSchema(
-          tool.alias,
           normalizedParamName,
-          paramDef?.schema ?? z.any()
+          paramDef?.schema ?? z.any(),
+          config
         );
         if (!schema || !schema.safeParse(paramValue).success) {
           return {
@@ -1950,7 +1940,7 @@ async function executeGraphTool(tool, config, graphClient, params, authManager,
         );
       }
     }
-    if (MENTION_SHORTHAND_TOOLS.has(tool.alias)) {
+    if (config?.mentionShorthand) {
       const rewritten = rewriteMentionShorthand(body);
       if (rewritten.error) {
         return {
@@ -2362,7 +2352,7 @@ function registerGraphTools(server, graphClient, options = {}) {
     if (tool.parameters && tool.parameters.length > 0) {
       for (const param of tool.parameters) {
         if (param.type === "Query") {
-          const schema = queryParameterSchema(tool.alias, param.name, param.schema || z.any());
+          const schema = queryParameterSchema(param.name, param.schema || z.any(), endpointConfig);
           if (schema) paramSchema[param.name] = schema;
           continue;
         }
@@ -2386,12 +2376,12 @@ function registerGraphTools(server, graphClient, options = {}) {
     }
     if (isFetchAllPagesApplicable(tool)) {
       const maxPages = getMaxPages();
-      paramSchema["fetchAllPages"] = z.boolean().describe(getFetchAllPagesParamDescription(maxPages, tool.alias)).optional();
+      paramSchema["fetchAllPages"] = z.boolean().describe(getFetchAllPagesParamDescription(maxPages, endpointConfig)).optional();
     }
-    if (MEMBER_NAME_FILTER_TOOLS.has(tool.alias)) {
+    if (endpointConfig?.nameFilter) {
       paramSchema["name"] = z.string().describe(MEMBER_NAME_PARAM_DESCRIPTION).optional();
     }
-    if (isSkiptokenApplicable(tool, Object.keys(paramSchema))) {
+    if (isSkiptokenApplicable(tool, Object.keys(paramSchema), endpointConfig)) {
       paramSchema["skiptoken"] = z.string().describe(SKIPTOKEN_PARAM_DESCRIPTION).optional();
     }
     if (multiAccount) {

package/dist/lib/param-descriptions.js

@@ -1,23 +1,6 @@
 import logger from "../logger.js";
-const SUPPORTED_QUERY_PARAMS = {
-  // https://learn.microsoft.com/en-us/graph/api/user-list-joinedteams
-  "list-joined-teams": [],
-  // https://learn.microsoft.com/en-us/graph/api/associatedteaminfo-list
-  "list-my-associated-teams": [],
-  // Documents only $top/$filter; $select is needed to opt in to image bytes.
-  // https://learn.microsoft.com/graph/api/teamworkmessaging-list-customemojis?view=graph-rest-beta
-  "list-custom-emojis": ["top", "filter", "select", "skiptoken"],
-  // https://learn.microsoft.com/en-us/graph/api/channel-list-messages
-  "list-channel-messages": ["top", "expand", "skiptoken"],
-  // https://learn.microsoft.com/en-us/graph/api/chatmessage-list-replies
-  "list-channel-message-replies": ["top", "skiptoken"],
-  // Delta rejects $select/$expand/$filter/$orderby/$search and documents no $top/$skip/$count;
-  // events delta takes no endDateTime. https://learn.microsoft.com/graph/api/event-delta?view=graph-rest-beta
-  "list-calendar-events-delta": ["startdatetime", "skiptoken"],
-  "list-calendar-view-delta": ["startdatetime", "enddatetime", "skiptoken"]
-};
-function isQueryParamSupported(toolAlias, bareName) {
-  return SUPPORTED_QUERY_PARAMS[toolAlias]?.includes(bareName) ?? true;
+function isQueryParamSupported(config, bareName) {
+  return config?.queryParams?.some((name) => name.toLowerCase() === bareName) ?? true;
 }
 function paginationAllowed() {
   const raw = process.env.MS365_MCP_ALLOW_PAGINATION;
@@ -41,25 +24,49 @@ function getMaxPages() {
 function isFetchAllPagesApplicable(tool) {
   return tool.method.toUpperCase() === "GET" && tool.path.includes("/") && paginationAllowed();
 }
-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.";
+function describeWith(sentences, config) {
+  return sentences.filter((s) => typeof s === "string" || isQueryParamSupported(config, s[1])).map((s) => typeof s === "string" ? s : s[0]).join(" ");
+}
+const FILTER_SENTENCES = [
+  "OData filter expression.",
+  ["Add $count=true for advanced filters (flag/flagStatus, contains()).", "count"],
+  ["Cannot combine with $search.", "search"]
+];
+const SEARCH_SENTENCES = [
+  "KQL search query in one pair of double quotes; directory (users/groups) instead quotes each clause with no outer pair.",
+  ["Cannot combine with $filter.", "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". 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 EXPAND_SENTENCES = [
+  "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.", "select"],
+  "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.";
+const TOP_SENTENCES = [
+  "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.", "select"],
+  "For more rows, use @odata.nextLink from the response instead of a very large $top."
+];
+const SKIP_SENTENCES = [
+  "Items to skip for pagination.",
+  ["Not supported with $search.", "search"]
+];
 const SKIPTOKEN_PARAM_DESCRIPTION = "Next page: the @odata.nextLink from the previous response. Keep the other arguments the same.";
 const COLLECTION_QUERY_PARAMS = /* @__PURE__ */ new Set(["top", "filter", "orderby", "count"]);
-function isSkiptokenApplicable(tool, paramNames) {
+function isSkiptokenApplicable(tool, paramNames, config) {
   if (tool.method.toUpperCase() !== "GET") return false;
-  const supported = tool.alias ? SUPPORTED_QUERY_PARAMS[tool.alias] : void 0;
-  if (supported) return supported.includes("skiptoken");
+  if (config?.queryParams) return isQueryParamSupported(config, "skiptoken");
   for (const name of paramNames) {
     if (COLLECTION_QUERY_PARAMS.has(name.replace(/^\$/, "").toLowerCase())) return true;
   }
   return false;
 }
 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 MEMBER_NAME_PARAM_DESCRIPTION = "Case-insensitive text to match against each member's displayName and email. Applied after $select projection, so only fields you can see are matched. Without fetchAllPages only the fetched page is filtered, and @odata.count still reports the unfiltered total.";
 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.";
@@ -70,26 +77,31 @@ function getAccountParamDescription(accountNames) {
   const accountHint = accountNames.length > 0 ? `Known accounts: ${accountNames.join(", ")}. ` : "";
   return `${accountHint}Microsoft account email to use for this request. Required when multiple accounts are configured. Use the list-accounts tool to discover all currently available accounts.`;
 }
-function getFetchAllPagesParamDescription(maxPages, toolAlias) {
-  const narrowingOptions = toolAlias === "list-custom-emojis" ? "$filter" : "$filter/$search";
-  return `Follow @odata.nextLink and merge up to ${maxPages} pages into one response. Can return enormous payloads\u2014only when the user explicitly needs a full export. Prefer a small $top first, then paginate or narrow with ${narrowingOptions}.`;
+function getFetchAllPagesParamDescription(maxPages, config) {
+  const narrowing = ["filter", "search"].filter((option) => isQueryParamSupported(config, option)).map((option) => `$${option}`).join("/");
+  const advice = isQueryParamSupported(config, "top") ? `Prefer a small $top first, then paginate${narrowing ? ` or narrow with ${narrowing}` : ""}.` : narrowing && `Narrow with ${narrowing} first.`;
+  return [
+    `Follow @odata.nextLink and merge up to ${maxPages} pages into one response.`,
+    "Can return enormous payloads\u2014only when the user explicitly needs a full export.",
+    advice
+  ].filter(Boolean).join(" ");
 }
-function getODataParamDescription(bareName) {
+function getODataParamDescription(bareName, config) {
   switch (bareName) {
     case "filter":
-      return FILTER_PARAM_DESCRIPTION;
+      return describeWith(FILTER_SENTENCES, config);
     case "search":
-      return SEARCH_PARAM_DESCRIPTION;
+      return describeWith(SEARCH_SENTENCES, config);
     case "select":
       return SELECT_PARAM_DESCRIPTION;
     case "expand":
-      return EXPAND_PARAM_DESCRIPTION;
+      return describeWith(EXPAND_SENTENCES, config);
     case "orderby":
       return ORDERBY_PARAM_DESCRIPTION;
     case "top":
-      return TOP_PARAM_DESCRIPTION;
+      return describeWith(TOP_SENTENCES, config);
     case "skip":
-      return SKIP_PARAM_DESCRIPTION;
+      return describeWith(SKIP_SENTENCES, config);
     case "count":
       return COUNT_PARAM_DESCRIPTION;
     default:
@@ -101,15 +113,11 @@ export {
   COUNT_PARAM_DESCRIPTION,
   DEFAULT_MAX_PAGES,
   EXPAND_EXTENDED_PROPERTIES_PARAM_DESCRIPTION,
-  EXPAND_PARAM_DESCRIPTION,
-  FILTER_PARAM_DESCRIPTION,
+  MEMBER_NAME_PARAM_DESCRIPTION,
   ORDERBY_PARAM_DESCRIPTION,
-  SEARCH_PARAM_DESCRIPTION,
   SELECT_PARAM_DESCRIPTION,
   SKIPTOKEN_PARAM_DESCRIPTION,
-  SKIP_PARAM_DESCRIPTION,
   TIMEZONE_PARAM_DESCRIPTION,
-  TOP_PARAM_DESCRIPTION,
   getAcceptParamDescription,
   getAccountParamDescription,
   getFetchAllPagesParamDescription,

package/dist/lib/query-parameter-schema.js

@@ -1,13 +1,11 @@
 import { z } from "zod";
-import { getODataParamDescription, isQueryParamSupported } from "./param-descriptions.js";
-const CUSTOM_EMOJI_QUERY_DESCRIPTIONS = {
-  top: "Number of custom emojis to return in one page. Base64 image content is opt-in with select; use a small page size when selecting contentBytes.",
-  filter: "OData filter expression for custom emojis, forwarded to Microsoft Graph. Filter support is determined by the beta API.",
-  select: "Properties to return as a comma-separated string or string array. Explicitly select contentBytes to retrieve base64 PNG/GIF images, for example displayName,contentBytes. Graph can return contentBytes: null when it is not explicitly selected."
-};
-function queryParameterSchema(toolName, name, providerSchema) {
+import {
+  getODataParamDescription,
+  isQueryParamSupported
+} from "./param-descriptions.js";
+function queryParameterSchema(name, providerSchema, config) {
   const bareName = name.replace(/^\$/, "").toLowerCase();
-  if (!isQueryParamSupported(toolName, bareName)) return void 0;
+  if (!isQueryParamSupported(config, bareName)) return void 0;
   const source = providerSchema instanceof z.ZodOptional ? providerSchema.unwrap() : providerSchema;
   let schema = source;
   switch (bareName) {
@@ -24,11 +22,11 @@ function queryParameterSchema(toolName, name, providerSchema) {
       schema = z.string();
       break;
     case "top":
-      if (toolName === "list-chats") schema = source.and(z.number().max(50));
+      if (config?.maxTop !== void 0) schema = source.and(z.number().max(config.maxTop));
       break;
   }
   if (providerSchema.isOptional()) schema = schema.optional();
-  const description = toolName === "list-custom-emojis" && CUSTOM_EMOJI_QUERY_DESCRIPTIONS[bareName] || getODataParamDescription(bareName);
+  const description = getODataParamDescription(bareName, config);
   return description ? schema.describe(description) : schema;
 }
 export {

package/dist/lib/tool-schema.js

@@ -11,7 +11,8 @@ import {
   CONFIRM_PARAM_DESCRIPTION,
   TIMEZONE_PARAM_DESCRIPTION,
   EXPAND_EXTENDED_PROPERTIES_PARAM_DESCRIPTION,
-  getAcceptParamDescription
+  getAcceptParamDescription,
+  MEMBER_NAME_PARAM_DESCRIPTION
 } from "./param-descriptions.js";
 function unwrapOptional(schema) {
   const def = schema._def;
@@ -23,7 +24,7 @@ function unwrapOptional(schema) {
 }
 function describeToolSchema(tool, config, ctx = {}) {
   const params = (tool.parameters ?? []).flatMap((p) => {
-    const effectiveSchema = p.type === "Query" ? queryParameterSchema(tool.alias, p.name, p.schema) : p.schema;
+    const effectiveSchema = p.type === "Query" ? queryParameterSchema(p.name, p.schema, config) : p.schema;
     if (!effectiveSchema) return [];
     const { inner, optional } = unwrapOptional(effectiveSchema);
     const isPath = p.type === "Path";
@@ -53,13 +54,23 @@ function describeToolSchema(tool, config, ctx = {}) {
       name: "fetchAllPages",
       in: "Query",
       required: false,
-      description: getFetchAllPagesParamDescription(getMaxPages(), tool.alias),
+      description: getFetchAllPagesParamDescription(getMaxPages(), config),
       schema: { type: "boolean" }
     });
   }
+  if (config?.nameFilter) {
+    params.push({
+      name: "name",
+      in: "Query",
+      required: false,
+      description: MEMBER_NAME_PARAM_DESCRIPTION,
+      schema: { type: "string" }
+    });
+  }
   if (isSkiptokenApplicable(
-    { method: tool.method, alias: tool.alias },
-    params.map((p) => p.name)
+    tool,
+    params.map((p) => p.name),
+    config
   )) {
     params.push({
       name: "skiptoken",

package/package.json

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

@@ -1330,7 +1330,8 @@
     "toolName": "list-todo-task-lists",
     "presets": ["personal", "tasks"],
     "scopes": ["Tasks.Read"],
-    "llmTip": "Lists all To Do task lists. Returns todoTaskList-id needed for all task operations. The default list is typically called 'Tasks'. NOTE: $select is NOT supported by this endpoint — do not pass select parameter, Graph returns 400."
+    "queryParams": ["top", "skip", "filter", "skiptoken"],
+    "llmTip": "Lists all To Do task lists. Returns todoTaskList-id needed for all task operations. The default list is typically called 'Tasks'."
   },
   {
     "pathPattern": "/me/todo/lists/{todoTaskList-id}/tasks",
@@ -1338,7 +1339,8 @@
     "toolName": "list-todo-tasks",
     "presets": ["personal", "tasks"],
     "scopes": ["Tasks.Read"],
-    "llmTip": "Lists tasks in a To Do list. Requires todoTaskList-id — use list-todo-task-lists to find it. NOTE: $select is NOT supported — do not pass select, Graph returns 400. Use $filter=status eq 'notStarted' or $filter=status eq 'completed' to filter by status. Use $top to limit results. Status values: 'notStarted', 'inProgress', 'completed', 'waitingOnOthers', 'deferred'."
+    "queryParams": ["top", "skip", "filter", "orderby", "expand", "skiptoken"],
+    "llmTip": "Lists tasks in a To Do list. Requires todoTaskList-id — use list-todo-task-lists to find it. Use $filter=status eq 'notStarted' or $filter=status eq 'completed' to filter by status. Use $top to limit results. Status values: 'notStarted', 'inProgress', 'completed', 'waitingOnOthers', 'deferred'. $orderby works on createdDateTime, lastModifiedDateTime, importance, status and reminderDateTime/dateTime, not on title or isReminderOn. A $filter on isReminderOn can also return 400; filter it client-side."
   },
   {
     "pathPattern": "/me/todo/lists/{todoTaskList-id}/tasks/{todoTask-id}",
@@ -1346,7 +1348,8 @@
     "toolName": "get-todo-task",
     "presets": ["personal", "tasks"],
     "scopes": ["Tasks.Read"],
-    "llmTip": "Returns a single To Do task. NOTE: $select is NOT supported — do not pass select parameter, Graph returns RequestBroker--ParseUri (400). Use $expand=linkedResources to include linked email/resource. Returns body content (HTML format), checklist items, and linked resources."
+    "queryParams": ["expand"],
+    "llmTip": "Returns a single To Do task. Use $expand=linkedResources to include linked email/resource. Returns body content (HTML format), checklist items, and linked resources."
   },
   {
     "pathPattern": "/me/todo/lists/{todoTaskList-id}/tasks",
@@ -1377,6 +1380,7 @@
     "toolName": "list-todo-linked-resources",
     "presets": ["personal", "tasks"],
     "scopes": ["Tasks.Read"],
+    "queryParams": ["top", "skip", "filter", "orderby", "skiptoken"],
     "llmTip": "Lists resources linked to a To Do task (emails, URLs, etc.). Each linked resource has displayName, webUrl, applicationName, and externalId."
   },
   {
@@ -1401,7 +1405,8 @@
     "toolName": "list-todo-checklist-items",
     "presets": ["personal", "tasks"],
     "scopes": ["Tasks.Read"],
-    "llmTip": "Lists the steps (checklist items) of a To Do task. Each item has id, displayName, isChecked, checkedDateTime, and createdDateTime. Graph supports no OData query parameters on this endpoint, so do not pass select, filter, orderby, or top. Requires todoTaskListId from list-todo-task-lists and todoTaskId from list-todo-tasks."
+    "queryParams": [],
+    "llmTip": "Lists the steps (checklist items) of a To Do task. Each item has id, displayName, isChecked, checkedDateTime, and createdDateTime. Requires todoTaskListId from list-todo-task-lists and todoTaskId from list-todo-tasks."
   },
   {
     "pathPattern": "/me/todo/lists/{todoTaskList-id}/tasks/{todoTask-id}/checklistItems",
@@ -1722,6 +1727,7 @@
     "toolName": "list-chats",
     "presets": ["teams", "teams-write", "work"],
     "workScopes": ["Chat.ReadBasic"],
+    "maxTop": 50,
     "llmTip": "Lists the signed-in user's chats. Only $filter, $top (max 50), $expand (members, lastMessagePreview) and $orderby are supported; $orderby accepts just lastMessagePreview/createdDateTime in descending order. Other options are rejected: $search returns 400 'Query option Search is not allowed', and ordering by lastUpdatedDateTime returns 400 BadRequest. Meeting chats have chatType=meeting and carry the meeting subject in topic."
   },
   {
@@ -1737,6 +1743,7 @@
     "toolName": "list-chat-members",
     "presets": ["teams", "work"],
     "workScopes": ["ChatMember.Read"],
+    "nameFilter": true,
     "llmTip": "Lists members of a chat. Each member has displayName, email, roles (owner/guest), and visibleHistoryStartDateTime. For meeting chats, use the chatInfo.threadId from get-online-meeting as the chat-id to see who participated in the meeting chat. Pass name to keep only members whose displayName or email contains that text (case-insensitive); use the returned userId in an @mention."
   },
   {
@@ -1760,6 +1767,7 @@
     "toolName": "update-chat-message",
     "presets": ["teams", "work"],
     "workScopes": ["Chat.ReadWrite"],
+    "mentionShorthand": true,
     "llmTip": "To @mention someone, put <at user-id=\"<aad-user-id>\">Display Name</at> in the html content; the server numbers the tag and builds the mentions array. Use the userId field (not id) from list-team-members or list-chat-members. Use contentType html in the body."
   },
   {
@@ -1776,6 +1784,7 @@
     "toolName": "send-chat-message",
     "presets": ["teams", "teams-write", "work"],
     "workScopes": ["ChatMessage.Send"],
+    "mentionShorthand": true,
     "llmTip": "To @mention someone, put <at user-id=\"<aad-user-id>\">Display Name</at> in the html content; the server numbers the tag and builds the mentions array. Use the userId field (not id) from list-team-members or list-chat-members. Use contentType 'html' in the body — plain text contentType gets mangled by Graph API. Alternatively, hand-build the raw form: put an <at id=\"0\">Name</at> tag in the html content and add a mentions array to the request body, as a sibling of the body property (not a separate top-level tool parameter): { body: { contentType: 'html', content: 'Hi <at id=\"0\">Name</at>' }, mentions: [{ id: 0, mentionText: 'Name', mentioned: { user: { id: '<aad-user-id>', displayName: 'Name', userIdentityType: 'aadUser' } } }] }. Each mention id must match its <at id> value; include userIdentityType: 'aadUser' or Graph returns 400 'value without a type name'."
   },
   {
@@ -1783,7 +1792,8 @@
     "method": "get",
     "toolName": "list-joined-teams",
     "presets": ["teams", "teams-write", "work"],
-    "workScopes": ["Team.ReadBasic.All"]
+    "workScopes": ["Team.ReadBasic.All"],
+    "queryParams": []
   },
   {
     "pathPattern": "/teamwork/messaging/customEmojis",
@@ -1792,6 +1802,7 @@
     "apiVersion": "beta",
     "presets": ["teams", "work"],
     "workScopes": ["TeamworkCustomEmoji.Read"],
+    "queryParams": ["top", "filter", "select", "skiptoken"],
     "llmTip": "Lists the organization's custom Teams emojis, including displayName, createdBy and createdDateTime. Graph can return contentBytes: null by default; request select='displayName,contentBytes' (or a string array) to retrieve base64 PNG/GIF images. Supports $top, $filter and $select. Image bytes can make responses large: use a small $top when selecting contentBytes; use fetchAllPages only for an explicitly requested export. displayName is the unique key, not an id. Work/school accounts only. Microsoft Graph beta API: subject to change."
   },
   {
@@ -1865,7 +1876,8 @@
     "method": "get",
     "toolName": "list-channel-messages",
     "presets": ["teams", "work"],
-    "workScopes": ["ChannelMessage.Read.All"]
+    "workScopes": ["ChannelMessage.Read.All"],
+    "queryParams": ["top", "expand", "skiptoken"]
   },
   {
     "pathPattern": "/teams/{team-id}/channels/{channel-id}/messages/{chatMessage-id}",
@@ -1880,6 +1892,7 @@
     "toolName": "update-channel-message",
     "presets": ["teams", "work"],
     "workScopes": ["ChannelMessage.ReadWrite"],
+    "mentionShorthand": true,
     "llmTip": "To @mention someone, put <at user-id=\"<aad-user-id>\">Display Name</at> in the html content; the server numbers the tag and builds the mentions array. Use the userId field (not id) from list-team-members or list-chat-members. Use contentType html in the body."
   },
   {
@@ -1896,6 +1909,7 @@
     "toolName": "send-channel-message",
     "presets": ["teams", "teams-write", "work"],
     "workScopes": ["ChannelMessage.Send"],
+    "mentionShorthand": true,
     "llmTip": "To @mention someone, put <at user-id=\"<aad-user-id>\">Display Name</at> in the html content; the server numbers the tag and builds the mentions array. Use the userId field (not id) from list-team-members or list-chat-members. Use contentType 'html' in the body — plain text contentType gets mangled by Graph API. Alternatively, hand-build the raw form: put an <at id=\"0\">Name</at> tag in the html content and add a mentions array to the request body, as a sibling of the body property (not a separate top-level tool parameter): { body: { contentType: 'html', content: 'Hi <at id=\"0\">Name</at>' }, mentions: [{ id: 0, mentionText: 'Name', mentioned: { user: { id: '<aad-user-id>', displayName: 'Name', userIdentityType: 'aadUser' } } }] }. Each mention id must match its <at id> value; include userIdentityType: 'aadUser' or Graph returns 400 'value without a type name'."
   },
   {
@@ -1904,6 +1918,7 @@
     "toolName": "reply-to-channel-message",
     "presets": ["teams", "teams-write", "work"],
     "workScopes": ["ChannelMessage.Send"],
+    "mentionShorthand": true,
     "llmTip": "To @mention someone, put <at user-id=\"<aad-user-id>\">Display Name</at> in the html content; the server numbers the tag and builds the mentions array. Use the userId field (not id) from list-team-members or list-chat-members. Use contentType 'html' in the body — plain text contentType gets mangled by Graph API. Alternatively, hand-build the raw form: put an <at id=\"0\">Name</at> tag in the html content and add a mentions array to the request body, as a sibling of the body property (not a separate top-level tool parameter): { body: { contentType: 'html', content: 'Hi <at id=\"0\">Name</at>' }, mentions: [{ id: 0, mentionText: 'Name', mentioned: { user: { id: '<aad-user-id>', displayName: 'Name', userIdentityType: 'aadUser' } } }] }. Each mention id must match its <at id> value; include userIdentityType: 'aadUser' or Graph returns 400 'value without a type name'."
   },
   {
@@ -1911,7 +1926,8 @@
     "method": "get",
     "toolName": "list-channel-message-replies",
     "presets": ["teams", "work"],
-    "workScopes": ["ChannelMessage.Read.All"]
+    "workScopes": ["ChannelMessage.Read.All"],
+    "queryParams": ["top", "skiptoken"]
   },
   {
     "pathPattern": "/teams/{team-id}/channels/{channel-id}/messages/{chatMessage-id}/replies/{chatMessage-id1}",
@@ -1919,6 +1935,7 @@
     "toolName": "update-channel-message-reply",
     "presets": ["teams", "work"],
     "workScopes": ["ChannelMessage.ReadWrite"],
+    "mentionShorthand": true,
     "llmTip": "To @mention someone, put <at user-id=\"<aad-user-id>\">Display Name</at> in the html content; the server numbers the tag and builds the mentions array. Use the userId field (not id) from list-team-members or list-chat-members. Use contentType html in the body."
   },
   {
@@ -1962,6 +1979,7 @@
     "toolName": "list-team-members",
     "presets": ["teams", "work"],
     "workScopes": ["TeamMember.Read.All"],
+    "nameFilter": true,
     "llmTip": "Lists members of a team. Each member has displayName, email, roles and userId. Pass name to keep only members whose displayName or email contains that text (case-insensitive); use the returned userId in an @mention."
   },
   {
@@ -1985,6 +2003,7 @@
     "toolName": "reply-to-chat-message",
     "presets": ["teams", "work"],
     "workScopes": ["ChatMessage.Send"],
+    "mentionShorthand": true,
     "llmTip": "To @mention someone, put <at user-id=\"<aad-user-id>\">Display Name</at> in the html content; the server numbers the tag and builds the mentions array. Use the userId field (not id) from list-team-members or list-chat-members. Use contentType 'html' in the body — plain text contentType gets mangled by Graph API. Alternatively, hand-build the raw form: put an <at id=\"0\">Name</at> tag in the html content and add a mentions array to the request body, as a sibling of the body property (not a separate top-level tool parameter): { body: { contentType: 'html', content: 'Hi <at id=\"0\">Name</at>' }, mentions: [{ id: 0, mentionText: 'Name', mentioned: { user: { id: '<aad-user-id>', displayName: 'Name', userIdentityType: 'aadUser' } } }] }. Each mention id must match its <at id> value; include userIdentityType: 'aadUser' or Graph returns 400 'value without a type name'."
   },
   {
@@ -2543,6 +2562,7 @@
     "toolName": "list-calendar-events-delta",
     "presets": ["calendar", "outlook", "personal"],
     "scopes": ["Calendars.Read"],
+    "queryParams": ["startDateTime", "skiptoken"],
     "llmTip": "Incremental sync of events across the default calendar. First call returns all events plus @odata.deltaLink. Subsequent calls with that link return only additions/updates/removals. Deltas expire after ~30 days — start over if the server returns 410 Gone. For a time-bounded view with delta semantics, use list-calendar-view-delta instead."
   },
   {
@@ -2552,6 +2572,7 @@
     "presets": ["calendar", "outlook", "personal"],
     "scopes": ["Calendars.Read"],
     "supportsTimezone": true,
+    "queryParams": ["startDateTime", "endDateTime", "skiptoken"],
     "llmTip": "Incremental sync of events within a time window. Required query params on first call: startDateTime, endDateTime (ISO 8601). Returns events in the window plus @odata.deltaLink; subsequent calls with that link return only changes. Expands recurring events to individual occurrences (unlike list-calendar-events-delta which returns the series master). Use this for calendar UIs showing a week/month view."
   },
   {
@@ -2948,6 +2969,7 @@
     "toolName": "list-my-associated-teams",
     "presets": ["teams", "work"],
     "workScopes": ["Team.ReadBasic.All"],
+    "queryParams": [],
     "llmTip": "Lists Teams the current user is associated with — both joined teams and host teams of shared channels the user is a direct member of. Returns associatedTeamInfo objects with id, displayName, and tenantId. Broader than list-joined-teams because it includes shared-channel host teams."
   },
   {