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

package/bin/modules/generate-mcp-tools.mjs

@@ -51,6 +51,13 @@ export function generateMcpTools(openApiSpec, outputDir) {
     // Replace with: path: `/...range(param=':value')...`,
     clientCode = clientCode.replace(/(path:\s*)'(\/[^']*\([^)]*=':[\w]+'\)[^']*)'/g, '$1`$2`');
 
+    // openapi-zod-client emits z.instanceof(File) for `format: binary` bodies; MCP
+    // transports JSON so no caller produces File. Body marshaller decodes the string.
+    clientCode = clientCode.replace(
+      /z\.instanceof\(File\)/g,
+      "z.string().describe('Base64-encoded file content. The server decodes it and PUTs the raw bytes to Microsoft Graph.')"
+    );
+
     fs.writeFileSync(clientFilePath, clientCode);
 
     return true;

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

@@ -441,4 +441,288 @@ describe("graph-tools", () => {
       expect(prefer === void 0 || !prefer.includes("outlook.body-content-type")).toBe(true);
     });
   });
+  describe("binary upload bodies", () => {
+    it("decodes base64 body to bytes and sets octet-stream Content-Type", async () => {
+      const endpoint = makeEndpoint({
+        alias: "upload-file-content",
+        method: "put",
+        path: "/drives/:driveId/items/:driveItemId/content",
+        requestFormat: "binary",
+        parameters: [
+          { name: "driveId", type: "Path", schema: z.string() },
+          { name: "driveItemId", type: "Path", schema: z.string() },
+          {
+            name: "body",
+            type: "Body",
+            schema: z.string().describe("Base64-encoded file content")
+          }
+        ]
+      });
+      const config = makeConfig({
+        toolName: "upload-file-content",
+        method: "put",
+        pathPattern: "/drives/{drive-id}/items/{driveItem-id}/content",
+        scopes: ["Files.ReadWrite"]
+      });
+      mockEndpoints.push(endpoint);
+      mockEndpointsJson = [config];
+      const graphClient = createMockGraphClient([{ content: [{ type: "text", text: "{}" }] }]);
+      const server = createMockServer();
+      const { registerGraphTools } = await loadModule();
+      registerGraphTools(server, graphClient);
+      const original = "Hello, world!";
+      const base64 = Buffer.from(original, "utf-8").toString("base64");
+      await server.tools.get("upload-file-content").handler({
+        driveId: "drive123",
+        driveItemId: "item456",
+        body: base64
+      });
+      const [path, options] = graphClient.graphRequest.mock.calls[0];
+      expect(path).toBe("/drives/drive123/items/item456/content");
+      expect(options.headers["Content-Type"]).toBe("application/octet-stream");
+      expect(Buffer.isBuffer(options.body) || options.body instanceof Uint8Array).toBe(true);
+      expect(Buffer.from(options.body).toString("utf-8")).toBe(original);
+    });
+    it("honors endpoints.json contentType override on binary uploads", async () => {
+      const endpoint = makeEndpoint({
+        alias: "upload-file-content",
+        method: "put",
+        path: "/drives/:driveId/items/:driveItemId/content",
+        requestFormat: "binary",
+        parameters: [
+          { name: "driveId", type: "Path", schema: z.string() },
+          { name: "driveItemId", type: "Path", schema: z.string() },
+          { name: "body", type: "Body", schema: z.string() }
+        ]
+      });
+      const config = makeConfig({
+        toolName: "upload-file-content",
+        method: "put",
+        pathPattern: "/drives/{drive-id}/items/{driveItem-id}/content",
+        scopes: ["Files.ReadWrite"],
+        contentType: "application/pdf"
+      });
+      mockEndpoints.push(endpoint);
+      mockEndpointsJson = [config];
+      const graphClient = createMockGraphClient([{ content: [{ type: "text", text: "{}" }] }]);
+      const server = createMockServer();
+      const { registerGraphTools } = await loadModule();
+      registerGraphTools(server, graphClient);
+      await server.tools.get("upload-file-content").handler({
+        driveId: "d",
+        driveItemId: "i",
+        body: Buffer.from("%PDF-1.4").toString("base64")
+      });
+      const [, options] = graphClient.graphRequest.mock.calls[0];
+      expect(options.headers["Content-Type"]).toBe("application/pdf");
+    });
+  });
+  describe("download-bytes", () => {
+    it("routes a relative Graph path through graphRequest", async () => {
+      mockEndpoints.length = 0;
+      mockEndpointsJson = [];
+      const graphClient = {
+        graphRequest: vi.fn().mockResolvedValue({
+          content: [
+            {
+              type: "text",
+              text: JSON.stringify({
+                contentType: "image/jpeg",
+                encoding: "base64",
+                contentBytes: "aGk="
+              })
+            }
+          ]
+        })
+      };
+      const server = createMockServer();
+      const { registerGraphTools } = await loadModule();
+      registerGraphTools(server, graphClient);
+      const tool = server.tools.get("download-bytes");
+      expect(tool).toBeDefined();
+      await tool.handler({ target: "/me/photo/$value" });
+      expect(graphClient.graphRequest).toHaveBeenCalledTimes(1);
+      const [path, options] = graphClient.graphRequest.mock.calls[0];
+      expect(path).toBe("/me/photo/$value");
+      expect(options.accessToken).toBeUndefined();
+    });
+    it("rejects absolute URLs (Graph paths only)", async () => {
+      mockEndpoints.length = 0;
+      mockEndpointsJson = [];
+      const server = createMockServer();
+      const { registerGraphTools } = await loadModule();
+      registerGraphTools(server, {});
+      const tool = server.tools.get("download-bytes");
+      const result = await tool.handler({
+        target: "https://example.sharepoint.com/d/abc?temp=signed"
+      });
+      expect(result.isError).toBe(true);
+      const payload = JSON.parse(result.content[0].text);
+      expect(payload.error).toMatch(/relative Microsoft Graph path/);
+    });
+    it("rejects targets that do not start with /", async () => {
+      mockEndpoints.length = 0;
+      mockEndpointsJson = [];
+      const server = createMockServer();
+      const { registerGraphTools } = await loadModule();
+      registerGraphTools(server, {});
+      const tool = server.tools.get("download-bytes");
+      const result = await tool.handler({ target: "ftp://example.com/x" });
+      expect(result.isError).toBe(true);
+      const payload = JSON.parse(result.content[0].text);
+      expect(payload.error).toMatch(/relative Microsoft Graph path/);
+    });
+  });
+  describe("discovery mode: utility tools", () => {
+    it('search-tools surfaces download-bytes for "download" queries', async () => {
+      mockEndpoints.length = 0;
+      mockEndpointsJson = [];
+      const server = createMockServer();
+      const { registerDiscoveryTools } = await loadModule();
+      registerDiscoveryTools(server, {});
+      const result = await server.tools.get("search-tools").handler({ query: "download" });
+      const payload = JSON.parse(result.content[0].text);
+      const names = payload.tools.map((t) => t.name);
+      expect(names).toContain("download-bytes");
+    });
+    it("get-tool-schema returns the download-bytes parameter schema", async () => {
+      mockEndpoints.length = 0;
+      mockEndpointsJson = [];
+      const server = createMockServer();
+      const { registerDiscoveryTools } = await loadModule();
+      registerDiscoveryTools(server, {});
+      const result = await server.tools.get("get-tool-schema").handler({ tool_name: "download-bytes" });
+      const schema = JSON.parse(result.content[0].text);
+      expect(schema.name).toBe("download-bytes");
+      expect(schema.path).toBe("tool:download-bytes");
+      const targetParam = schema.parameters.find((p) => p.name === "target");
+      expect(targetParam).toBeDefined();
+      expect(targetParam.required).toBe(true);
+    });
+    it("execute-tool dispatches to download-bytes for a Graph path", async () => {
+      mockEndpoints.length = 0;
+      mockEndpointsJson = [];
+      const graphClient = {
+        graphRequest: vi.fn().mockResolvedValue({
+          content: [
+            {
+              type: "text",
+              text: JSON.stringify({
+                contentType: "image/png",
+                encoding: "base64",
+                contentBytes: "iVBORw0K"
+              })
+            }
+          ]
+        })
+      };
+      const server = createMockServer();
+      const { registerDiscoveryTools } = await loadModule();
+      registerDiscoveryTools(server, graphClient);
+      const result = await server.tools.get("execute-tool").handler({
+        tool_name: "download-bytes",
+        parameters: { target: "/me/photo/$value" }
+      });
+      expect(result.isError).toBeFalsy();
+      expect(graphClient.graphRequest).toHaveBeenCalledTimes(1);
+      const [path] = graphClient.graphRequest.mock.calls[0];
+      expect(path).toBe("/me/photo/$value");
+    });
+    it("execute-tool reports unknown tool when name matches neither registry", async () => {
+      mockEndpoints.length = 0;
+      mockEndpointsJson = [];
+      const server = createMockServer();
+      const { registerDiscoveryTools } = await loadModule();
+      registerDiscoveryTools(server, {});
+      const result = await server.tools.get("execute-tool").handler({
+        tool_name: "no-such-tool",
+        parameters: {}
+      });
+      expect(result.isError).toBe(true);
+      const payload = JSON.parse(result.content[0].text);
+      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/endpoints.json

@@ -151,13 +151,8 @@
     "pathPattern": "/me/messages/{message-id}/attachments",
     "method": "get",
     "toolName": "list-mail-attachments",
-    "scopes": ["Mail.Read"]
-  },
-  {
-    "pathPattern": "/me/messages/{message-id}/attachments/{attachment-id}",
-    "method": "get",
-    "toolName": "get-mail-attachment",
-    "scopes": ["Mail.Read"]
+    "scopes": ["Mail.Read"],
+    "llmTip": "Lists attachments on a message: id, name, contentType, size, isInline. To download the bytes, call download-bytes with target=/me/messages/{message-id}/attachments/{attachment-id}/$value (the /$value suffix returns raw bytes; the bare attachment URL embeds contentBytes in JSON which can truncate large files)."
   },
   {
     "pathPattern": "/me/messages/{message-id}/attachments/{attachment-id}",
@@ -479,14 +474,6 @@
     "toolName": "list-folder-files",
     "scopes": ["Files.Read"]
   },
-  {
-    "pathPattern": "/drives/{drive-id}/items/{driveItem-id}/content",
-    "method": "get",
-    "toolName": "download-onedrive-file-content",
-    "scopes": ["Files.Read"],
-    "returnDownloadUrl": true,
-    "llmTip": "Returns a temporary download URL, NOT the file content directly."
-  },
   {
     "pathPattern": "/drives/{drive-id}/items/{driveItem-id}",
     "method": "delete",
@@ -498,7 +485,7 @@
     "method": "put",
     "toolName": "upload-file-content",
     "scopes": ["Files.ReadWrite"],
-    "llmTip": "Max 4MB. For new files use path format: /items/root:/path/to/file.txt:/content. Overwrites existing files without warning."
+    "llmTip": "Body is a base64-encoded string of the file bytes; the server decodes it before PUT. Max 4MB inline (use create-upload-session above 4MB). For new files use path format: /items/root:/path/to/file.txt:/content. Overwrites existing files without warning."
   },
   {
     "pathPattern": "/drives/{drive-id}/items/{driveItem-id}/createUploadSession",
@@ -512,7 +499,7 @@
     "method": "get",
     "toolName": "get-drive-item",
     "scopes": ["Files.Read"],
-    "llmTip": "Gets metadata for a file or folder: name, size, lastModifiedDateTime, createdBy, webUrl, file (mimeType, hashes), folder (childCount), parentReference. Does not return content — use download-onedrive-file-content for that."
+    "llmTip": "Gets metadata for a file or folder: name, size, lastModifiedDateTime, createdBy, webUrl, file (mimeType, hashes), folder (childCount), parentReference, and @microsoft.graph.downloadUrl. For the bytes, call download-bytes with target=/drives/{drive-id}/items/{driveItem-id}/content (Graph redirects to the same downloadUrl)."
   },
   {
     "pathPattern": "/drives/{drive-id}/items/{driveItem-id}",
@@ -1077,22 +1064,6 @@
     "workScopes": ["User.Read.All"],
     "llmTip": "Lists users who report directly to a specific user. Use with get-user-manager to traverse the org hierarchy."
   },
-  {
-    "pathPattern": "/me/photo/$value",
-    "method": "get",
-    "toolName": "get-my-profile-photo",
-    "scopes": ["User.Read"],
-    "returnDownloadUrl": true,
-    "llmTip": "Returns the current user's profile photo as binary image data. The photo is typically in JPEG format."
-  },
-  {
-    "pathPattern": "/users/{user-id}/photo/$value",
-    "method": "get",
-    "toolName": "get-user-profile-photo",
-    "workScopes": ["User.Read.All"],
-    "returnDownloadUrl": true,
-    "llmTip": "Returns a specific user's profile photo as binary image data. Use the user ID or UPN (email)."
-  },
   {
     "pathPattern": "/me/people",
     "method": "get",
@@ -1185,15 +1156,7 @@
     "method": "get",
     "toolName": "list-chat-message-hosted-contents",
     "workScopes": ["ChatMessage.Read"],
-    "llmTip": "Lists hosted-content references (inline images, code snippets) attached to a Teams chat message. Returns an array of { id, contentType }. Use get-chat-message-hosted-content with the id to download the bytes. Hosted content IDs can also be parsed from the <img src> URL in the message body between /hostedContents/ and /$value."
-  },
-  {
-    "pathPattern": "/chats/{chat-id}/messages/{chatMessage-id}/hostedContents/{chatMessageHostedContent-id}/$value",
-    "method": "get",
-    "toolName": "get-chat-message-hosted-content",
-    "workScopes": ["ChatMessage.Read"],
-    "returnDownloadUrl": true,
-    "llmTip": "Returns raw bytes of a hosted content item (typically image/png or image/jpeg) attached to a Teams 1:1 or group chat message. Use list-chat-message-hosted-contents to discover IDs, or extract the ID from the <img src> URL in the message body."
+    "llmTip": "Lists hosted-content references (inline images, code snippets) attached to a Teams chat message. Returns { id, contentType } per item. To download bytes, call download-bytes with target=/chats/{chat-id}/messages/{chatMessage-id}/hostedContents/{id}/$value. IDs can also be extracted from the <img src> URL in the message body between /hostedContents/ and /$value."
   },
   {
     "pathPattern": "/chats/{chat-id}/messages",
@@ -1261,15 +1224,7 @@
     "method": "get",
     "toolName": "list-channel-message-hosted-contents",
     "workScopes": ["ChannelMessage.Read.All"],
-    "llmTip": "Lists hosted-content references (inline images, code snippets) attached to a Teams channel message. Returns an array of { id, contentType }. Use get-channel-message-hosted-content with the id to download bytes."
-  },
-  {
-    "pathPattern": "/teams/{team-id}/channels/{channel-id}/messages/{chatMessage-id}/hostedContents/{chatMessageHostedContent-id}/$value",
-    "method": "get",
-    "toolName": "get-channel-message-hosted-content",
-    "workScopes": ["ChannelMessage.Read.All"],
-    "returnDownloadUrl": true,
-    "llmTip": "Returns raw bytes of a hosted content item attached to a Teams channel message. Use list-channel-message-hosted-contents to discover IDs."
+    "llmTip": "Lists hosted-content references (inline images, code snippets) attached to a Teams channel message. Returns { id, contentType } per item. To download bytes, call download-bytes with target=/teams/{team-id}/channels/{channel-id}/messages/{chatMessage-id}/hostedContents/{id}/$value."
   },
   {
     "pathPattern": "/teams/{team-id}/channels/{channel-id}/messages",

package/dist/generated/client.js

@@ -788,8 +788,8 @@ const microsoft_graph_sharePointGroupIdentity = z.object({
   id: z.string().describe(
     "Unique identifier for the identity or actor. For example, in the access reviews decisions API, this property might record the id of the principal, that is, the group, user, or application that's subject to review."
   ).nullish(),
-  principalId: z.string().nullish(),
-  title: z.string().nullish()
+  principalId: z.string().describe("The principal ID of the SharePoint group in the tenant. Read-only.").nullish(),
+  title: z.string().describe("The title of the SharePoint group. Read-only.").nullish()
 }).passthrough();
 const microsoft_graph_sharePointIdentity = z.object({
   displayName: z.string().describe(
@@ -5200,14 +5200,6 @@ const endpoints = makeApi([
     ],
     response: z.void()
   },
-  {
-    method: "get",
-    path: "/chats/:chatId/messages/:chatMessageId/hostedContents/:chatMessageHostedContentId/$value",
-    alias: "get-chat-message-hosted-content",
-    description: `Retrieve the list of chatMessageHostedContent objects from a message. This API only lists the hosted content objects. To get the content bytes, see get chatmessage hosted content.`,
-    requestFormat: "json",
-    response: z.void()
-  },
   {
     method: "get",
     path: "/chats/:chatId/messages/:chatMessageId/replies",
@@ -5588,21 +5580,6 @@ const endpoints = makeApi([
     ],
     response: z.void()
   },
-  {
-    method: "get",
-    path: "/drives/:driveId/items/:driveItemId/content",
-    alias: "download-onedrive-file-content",
-    description: `The content stream, if the item represents a file.`,
-    requestFormat: "json",
-    parameters: [
-      {
-        name: "$format",
-        type: "Query",
-        schema: z.string().describe("Format of the content").optional()
-      }
-    ],
-    response: z.void()
-  },
   {
     method: "put",
     path: "/drives/:driveId/items/:driveItemId/content",
@@ -5614,7 +5591,7 @@ const endpoints = makeApi([
         name: "body",
         description: `New media content.`,
         type: "Body",
-        schema: z.instanceof(File)
+        schema: z.string().describe("Base64-encoded file content. The server decodes it and PUTs the raw bytes to Microsoft Graph.")
       }
     ],
     response: z.void()
@@ -9593,26 +9570,6 @@ resource.`,
     ],
     response: z.void()
   },
-  {
-    method: "get",
-    path: "/me/messages/:messageId/attachments/:attachmentId",
-    alias: "get-mail-attachment",
-    description: `Read the properties, relationships, or raw contents of an attachment that is attached to a user event, message, or group post. An attachment can be one of the following types: All these types of attachments are derived from the attachment resource.`,
-    requestFormat: "json",
-    parameters: [
-      {
-        name: "$select",
-        type: "Query",
-        schema: z.array(z.string()).describe("Select properties to be returned").optional()
-      },
-      {
-        name: "$expand",
-        type: "Query",
-        schema: z.array(z.string()).describe("Expand related entities").optional()
-      }
-    ],
-    response: z.void()
-  },
   {
     method: "delete",
     path: "/me/messages/:messageId/attachments/:attachmentId",
@@ -10670,17 +10627,6 @@ resource.`,
     ],
     response: z.void()
   },
-  {
-    method: "get",
-    path: "/me/photo/$value",
-    alias: "get-my-profile-photo",
-    description: `Get the specified profilePhoto or its metadata (profilePhoto properties). The supported sizes of HD photos on Microsoft 365 are as follows: 48x48, 64x64, 96x96, 120x120, 240x240,
-360x360, 432x432, 504x504, and 648x648. Photos can be any dimension if they're stored in Microsoft Entra ID. You can get the metadata of the largest available photo or specify a size to get the metadata for that photo size.
-If the size you request is unavailable, you can still get a smaller size that the user has uploaded and made available.
-For example, if the user uploads a photo that is 504x504 pixels, all but the 648x648 size of the photo is available for download.`,
-    requestFormat: "json",
-    response: z.void()
-  },
   {
     method: "get",
     path: "/me/planner/tasks",
@@ -12879,14 +12825,6 @@ To monitor future changes, call the delta API by using the @odata.deltaLink in t
     ],
     response: z.void()
   },
-  {
-    method: "get",
-    path: "/teams/:teamId/channels/:channelId/messages/:chatMessageId/hostedContents/:chatMessageHostedContentId/$value",
-    alias: "get-channel-message-hosted-content",
-    description: `Retrieve the list of chatMessageHostedContent objects from a message. This API only lists the hosted content objects. To get the content bytes, see get chatmessage hosted content.`,
-    requestFormat: "json",
-    response: z.void()
-  },
   {
     method: "get",
     path: "/teams/:teamId/channels/:channelId/messages/:chatMessageId/replies",
@@ -13286,7 +13224,7 @@ To monitor future changes, call the delta API by using the @odata.deltaLink in t
     method: "get",
     path: "/users/:userId/directReports",
     alias: "list-user-direct-reports",
-    description: `The users and contacts that report to the user. (The users and contacts that have their manager property set to this user.) Read-only. Nullable. Supports $expand.`,
+    description: `Get an agentUser's direct reports. Returns the users and contacts for whom this agent user is assigned as manager.`,
     requestFormat: "json",
     parameters: [
       {
@@ -13393,7 +13331,7 @@ To monitor future changes, call the delta API by using the @odata.deltaLink in t
     method: "get",
     path: "/users/:userId/manager",
     alias: "get-user-manager",
-    description: `Returns the user or organizational contact assigned as the user's manager. Optionally, you can expand the manager's chain up to the root node.`,
+    description: `Returns the user or organizational contact assigned as the agentUser's manager.`,
     requestFormat: "json",
     parameters: [
       {
@@ -13496,14 +13434,6 @@ To monitor future changes, call the delta API by using the @odata.deltaLink in t
     ],
     response: z.void()
   },
-  {
-    method: "get",
-    path: "/users/:userId/photo/$value",
-    alias: "get-user-profile-photo",
-    description: `The user's profile photo. Read-only.`,
-    requestFormat: "json",
-    response: z.void()
-  },
   {
     method: "get",
     path: "/users/:userId/presence",

package/dist/graph-client.js

@@ -105,6 +105,7 @@ class GraphClient {
     return fetch(url, {
       method: options.method || "GET",
       headers,
+      // Node's fetch accepts Buffer/Uint8Array; TS BodyInit doesn't.
       body: options.body
     });
   }

package/dist/graph-tools.js

@@ -8,7 +8,7 @@ import { TOOL_CATEGORIES } from "./tool-categories.js";
 import { getRequestTokens } from "./request-context.js";
 import { parseTeamsUrl } from "./lib/teams-url-parser.js";
 import { buildBM25Index, scoreQuery, tokenize } from "./lib/bm25.js";
-import { describeToolSchema } from "./lib/tool-schema.js";
+import { describeToolSchema, describeUtilityToolSchema } from "./lib/tool-schema.js";
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 const endpointsData = JSON.parse(
@@ -34,6 +34,111 @@ function clampTopQueryParam(queryParams) {
   logger.info(`Clamping $top from ${requested} to ${cap} (MS365_MCP_MAX_TOP)`);
   queryParams["$top"] = String(cap);
 }
+const UTILITY_TOOLS = [
+  {
+    name: "parse-teams-url",
+    method: "POST",
+    path: "tool:parse-teams-url",
+    description: "Converts any Teams meeting URL format (short /meet/, full /meetup-join/, or recap ?threadId=) into a standard joinWebUrl. Use this before list-online-meetings when the user provides a recap or short URL.",
+    readOnlyHint: true,
+    openWorldHint: false,
+    buildSchema: () => ({
+      url: z.string().describe("Teams meeting URL in any format")
+    }),
+    execute: async (params) => {
+      const url = params.url;
+      if (typeof url !== "string") {
+        return {
+          content: [{ type: "text", text: JSON.stringify({ error: "url is required." }) }],
+          isError: true
+        };
+      }
+      try {
+        const joinWebUrl = parseTeamsUrl(url);
+        return { content: [{ type: "text", text: joinWebUrl }] };
+      } catch (error) {
+        return {
+          content: [{ type: "text", text: JSON.stringify({ error: error.message }) }],
+          isError: true
+        };
+      }
+    }
+  },
+  {
+    name: "download-bytes",
+    method: "GET",
+    path: "tool:download-bytes",
+    description: 'Download binary content from Microsoft Graph and return it as base64. Single tool for any binary read: drive file content, mail attachment, profile photo, Teams hosted content, meeting recording. Returns { contentType, encoding: "base64", contentLength, contentBytes }.',
+    readOnlyHint: true,
+    openWorldHint: true,
+    buildSchema: (ctx) => {
+      const schema = {
+        target: z.string().describe(
+          'Relative Microsoft Graph path starting with "/". Common paths: /drives/{drive-id}/items/{driveItem-id}/content (drive file content); /me/messages/{message-id}/attachments/{attachment-id}/$value (mail attachment, list-mail-attachments returns the IDs); /me/photo/$value or /users/{user-id}/photo/$value (profile photo); /chats/{chat-id}/messages/{chatMessage-id}/hostedContents/{chatMessageHostedContent-id}/$value (Teams chat hosted content, list-chat-message-hosted-contents returns the IDs); /teams/{team-id}/channels/{channel-id}/messages/{chatMessage-id}/hostedContents/{chatMessageHostedContent-id}/$value (Teams channel hosted content). For meeting recordings (often large), use get-meeting-recording-content which returns a URL for out-of-band download by the client.'
+        )
+      };
+      if (ctx.multiAccount) {
+        schema["account"] = z.string().optional().describe(
+          "Account to use when multiple Microsoft accounts are configured. Required when multiple accounts exist (see list-accounts)."
+        );
+      }
+      return schema;
+    },
+    execute: async (params, { graphClient, authManager }) => {
+      const target = params.target;
+      const accountParam = params.account;
+      if (typeof target !== "string" || target.length === 0) {
+        return {
+          content: [
+            {
+              type: "text",
+              text: JSON.stringify({ error: "target is required and must be a non-empty string." })
+            }
+          ],
+          isError: true
+        };
+      }
+      if (!target.startsWith("/")) {
+        return {
+          content: [
+            {
+              type: "text",
+              text: JSON.stringify({
+                error: 'target must be a relative Microsoft Graph path starting with "/", e.g. /me/photo/$value or /drives/{drive-id}/items/{driveItem-id}/content. Absolute URLs are not accepted; if you have an @microsoft.graph.downloadUrl, use the equivalent /content or /$value path instead (Graph 302-redirects to the same bytes).'
+              })
+            }
+          ],
+          isError: true
+        };
+      }
+      try {
+        let accountAccessToken;
+        if (authManager && !authManager.isOAuthModeEnabled() && !getRequestTokens()) {
+          accountAccessToken = await authManager.getTokenForAccount(accountParam);
+        }
+        return await graphClient.graphRequest(target, { accessToken: accountAccessToken });
+      } catch (error) {
+        return {
+          content: [{ type: "text", text: JSON.stringify({ error: error.message }) }],
+          isError: true
+        };
+      }
+    }
+  }
+];
+function registerUtilityToolWithMcp(server, utility, ctx) {
+  server.tool(
+    utility.name,
+    utility.description,
+    utility.buildSchema(ctx),
+    {
+      title: utility.name,
+      readOnlyHint: utility.readOnlyHint ?? true,
+      openWorldHint: utility.openWorldHint ?? true
+    },
+    async (params) => utility.execute(params, ctx)
+  );
+}
 async function executeGraphTool(tool, config, graphClient, params, authManager) {
   logger.info(`Tool ${tool.alias} called with params: ${JSON.stringify(params)}`);
   try {
@@ -174,7 +279,12 @@ async function executeGraphTool(tool, config, graphClient, params, authManager)
       headers
     };
     if (options.method !== "GET" && body) {
-      if (config?.contentType === "text/html") {
+      if (tool.requestFormat === "binary" && typeof body === "string") {
+        options.body = Buffer.from(body, "base64");
+        if (!config?.contentType) {
+          headers["Content-Type"] = "application/octet-stream";
+        }
+      } else if (config?.contentType === "text/html") {
         if (typeof body === "string") {
           options.body = body;
         } else if (typeof body === "object" && "content" in body) {
@@ -426,36 +536,20 @@ function registerGraphTools(server, graphClient, readOnly = false, enabledToolsP
   if (multiAccount) {
     logger.info('Multi-account mode: "account" parameter injected into all tool schemas');
   }
-  if (!enabledToolsRegex || enabledToolsRegex.test("parse-teams-url")) {
+  const utilityCtx = {
+    graphClient,
+    authManager,
+    multiAccount,
+    accountNames
+  };
+  for (const utility of UTILITY_TOOLS) {
+    if (readOnly && !utility.readOnlyHint) continue;
+    if (enabledToolsRegex && !enabledToolsRegex.test(utility.name)) continue;
     try {
-      server.tool(
-        "parse-teams-url",
-        "Converts any Teams meeting URL format (short /meet/, full /meetup-join/, or recap ?threadId=) into a standard joinWebUrl. Use this before list-online-meetings when the user provides a recap or short URL.",
-        {
-          url: z.string().describe("Teams meeting URL in any format")
-        },
-        {
-          title: "parse-teams-url",
-          readOnlyHint: true,
-          openWorldHint: false
-        },
-        async ({ url }) => {
-          try {
-            const joinWebUrl = parseTeamsUrl(url);
-            return { content: [{ type: "text", text: joinWebUrl }] };
-          } catch (error) {
-            return {
-              content: [
-                { type: "text", text: JSON.stringify({ error: error.message }) }
-              ],
-              isError: true
-            };
-          }
-        }
-      );
+      registerUtilityToolWithMcp(server, utility, utilityCtx);
       registeredCount++;
     } catch (error) {
-      logger.error(`Failed to register tool parse-teams-url: ${error.message}`);
+      logger.error(`Failed to register tool ${utility.name}: ${error.message}`);
       failedCount++;
     }
   }
@@ -464,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);
@@ -477,11 +571,14 @@ function buildToolsRegistry(readOnly, orgMode) {
         continue;
       }
     }
+    if (enabledToolsRegex && !enabledToolsRegex.test(tool.alias)) {
+      continue;
+    }
     toolsMap.set(tool.alias, { tool, config: endpointConfig });
   }
   return toolsMap;
 }
-function buildDiscoverySearchIndex(toolsRegistry) {
+function buildDiscoverySearchIndex(toolsRegistry, utilityTools = []) {
   const TIP_EXCERPT_TOKENS = 12;
   const DESC_CAP_TOKENS = 40;
   const docs = [];
@@ -505,6 +602,14 @@ function buildDiscoverySearchIndex(toolsRegistry) {
     ];
     docs.push({ id: name, tokens });
   }
+  for (const utility of utilityTools) {
+    const nt = tokenize(utility.name);
+    nameTokens.set(utility.name, new Set(nt));
+    const pathTokens = tokenize(utility.path);
+    const descTokens = tokenize(utility.description).slice(0, DESC_CAP_TOKENS);
+    const tokens = [...nt, ...nt, ...nt, ...nt, ...nt, ...pathTokens, ...pathTokens, ...descTokens];
+    docs.push({ id: utility.name, tokens });
+  }
   return { bm25: buildBM25Index(docs), nameTokens };
 }
 function scoreDiscoveryQuery(query, index) {
@@ -530,29 +635,66 @@ 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) {
-  const toolsRegistry = buildToolsRegistry(readOnly, orgMode);
-  const searchIndex = buildDiscoverySearchIndex(toolsRegistry);
-  logger.info(`Discovery mode: ${toolsRegistry.size} tools available in registry`);
+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(
+    `Discovery mode: ${totalCount} tools (${toolsRegistry.size} Graph + ${utilityTools.length} utility)`
+  );
+  const utilityCtx = {
+    graphClient,
+    authManager,
+    multiAccount,
+    accountNames
+  };
+  const utilityByName = new Map(utilityTools.map((u) => [u.name, u]));
   const categoryNames = Object.keys(TOOL_CATEGORIES).join(", ");
   const toResultEntry = (name) => {
     const entry = toolsRegistry.get(name);
-    if (!entry) return null;
-    const { tool, config } = entry;
-    return {
-      name,
-      method: tool.method.toUpperCase(),
-      path: tool.path,
-      description: tool.description || `${tool.method.toUpperCase()} ${tool.path}`,
-      ...config?.llmTip ? { llmTip: config.llmTip } : {}
-    };
+    if (entry) {
+      const { tool, config } = entry;
+      return {
+        name,
+        method: tool.method.toUpperCase(),
+        path: tool.path,
+        description: tool.description || `${tool.method.toUpperCase()} ${tool.path}`,
+        ...config?.llmTip ? { llmTip: config.llmTip } : {}
+      };
+    }
+    const utility = utilityByName.get(name);
+    if (utility) {
+      return {
+        name: utility.name,
+        method: utility.method,
+        path: utility.path,
+        description: utility.description
+      };
+    }
+    return null;
   };
   server.tool(
     "search-tools",
-    `Search through ${toolsRegistry.size} Microsoft Graph API tools. Ranks results by BM25 over tool name, llmTip, description, and path (tokenized on hyphens, camelCase, and whitespace). After picking a tool, call get-tool-schema to see its parameters, then execute-tool to invoke it.`,
+    `Search through ${totalCount} tools (${toolsRegistry.size} Microsoft Graph API operations + ${utilityTools.length} server utilities like download-bytes). Ranks results by BM25 over tool name, llmTip, description, and path. After picking a tool, call get-tool-schema for parameters, then execute-tool.`,
     {
       query: z.string().describe(
-        'Natural-language query. Tokenized and BM25-ranked. E.g. "send email", "create calendar event", "list unread messages".'
+        'Natural-language query. Tokenized and BM25-ranked. E.g. "send email", "download photo", "list unread messages".'
       ).optional(),
       category: z.string().describe(`Optional pre-filter by category: ${categoryNames}`).optional(),
       limit: z.number().describe("Maximum results (default: 10, max: 50)").optional()
@@ -571,7 +713,9 @@ function registerDiscoveryTools(server, graphClient, readOnly = false, orgMode =
         const ranked = scoreDiscoveryQuery(query, searchIndex);
         orderedNames = ranked.map((r) => r.id).filter(categoryFilter);
       } else {
-        orderedNames = [...toolsRegistry.keys()].filter(categoryFilter);
+        orderedNames = [...toolsRegistry.keys(), ...utilityTools.map((u) => u.name)].filter(
+          categoryFilter
+        );
       }
       const tools = orderedNames.slice(0, maxLimit).map(toResultEntry).filter(Boolean);
       return {
@@ -581,7 +725,7 @@ function registerDiscoveryTools(server, graphClient, readOnly = false, orgMode =
             text: JSON.stringify(
               {
                 found: tools.length,
-                total: toolsRegistry.size,
+                total: totalCount,
                 tools,
                 tip: "Call get-tool-schema(tool_name) to see parameters before invoking execute-tool."
               },
@@ -606,23 +750,30 @@ function registerDiscoveryTools(server, graphClient, readOnly = false, orgMode =
     },
     async ({ tool_name }) => {
       const entry = toolsRegistry.get(tool_name);
-      if (!entry) {
+      if (entry) {
+        const schema = describeToolSchema(entry.tool, entry.config?.llmTip);
         return {
-          content: [
-            {
-              type: "text",
-              text: JSON.stringify({
-                error: `Tool not found: ${tool_name}`,
-                tip: "Use search-tools to find available tools."
-              })
-            }
-          ],
-          isError: true
+          content: [{ type: "text", text: JSON.stringify(schema, null, 2) }]
+        };
+      }
+      const utility = utilityByName.get(tool_name);
+      if (utility) {
+        const schema = describeUtilityToolSchema(utility, utilityCtx);
+        return {
+          content: [{ type: "text", text: JSON.stringify(schema, null, 2) }]
         };
       }
-      const schema = describeToolSchema(entry.tool, entry.config?.llmTip);
       return {
-        content: [{ type: "text", text: JSON.stringify(schema, null, 2) }]
+        content: [
+          {
+            type: "text",
+            text: JSON.stringify({
+              error: `Tool not found: ${tool_name}`,
+              tip: "Use search-tools to find available tools."
+            })
+          }
+        ],
+        isError: true
       };
     }
   );
@@ -643,25 +794,36 @@ function registerDiscoveryTools(server, graphClient, readOnly = false, orgMode =
     },
     async ({ tool_name, parameters = {} }) => {
       const toolData = toolsRegistry.get(tool_name);
-      if (!toolData) {
-        return {
-          content: [
-            {
-              type: "text",
-              text: JSON.stringify({
-                error: `Tool not found: ${tool_name}`,
-                tip: "Use search-tools to find available tools."
-              })
-            }
-          ],
-          isError: true
-        };
+      if (toolData) {
+        return executeGraphTool(
+          toolData.tool,
+          toolData.config,
+          graphClient,
+          parameters,
+          authManager
+        );
       }
-      return executeGraphTool(toolData.tool, toolData.config, graphClient, parameters, authManager);
+      const utility = utilityByName.get(tool_name);
+      if (utility) {
+        return utility.execute(parameters, utilityCtx);
+      }
+      return {
+        content: [
+          {
+            type: "text",
+            text: JSON.stringify({
+              error: `Tool not found: ${tool_name}`,
+              tip: "Use search-tools to find available tools."
+            })
+          }
+        ],
+        isError: true
+      };
     }
   );
 }
 export {
+  UTILITY_TOOLS,
   buildDiscoverySearchIndex,
   buildToolsRegistry,
   registerDiscoveryTools,

package/dist/lib/tool-schema.js

@@ -30,6 +30,29 @@ function describeToolSchema(tool, llmTip) {
     parameters: params
   };
 }
+function describeUtilityToolSchema(utility, ctx) {
+  const schemaMap = utility.buildSchema(ctx);
+  const params = Object.entries(schemaMap).map(([name, zodSchema]) => {
+    const { inner, optional } = unwrapOptional(zodSchema);
+    const jsonSchema = zodToJsonSchema(inner, { target: "jsonSchema7", $refStrategy: "none" });
+    const { $schema: _s, ...schema } = jsonSchema;
+    return {
+      name,
+      in: "Query",
+      required: !optional,
+      description: zodSchema.description,
+      schema
+    };
+  });
+  return {
+    name: utility.name,
+    method: utility.method,
+    path: utility.path,
+    description: utility.description,
+    parameters: params
+  };
+}
 export {
-  describeToolSchema
+  describeToolSchema,
+  describeUtilityToolSchema
 };

package/dist/mcp-instructions.js

@@ -5,7 +5,8 @@ function buildGeneralMcpInstructions(opts) {
     "Mail and message $search uses KQL; the $search query parameter value must be double-quoted per Graph (see search-query-parameter in Microsoft Graph docs).",
     "When you need an organizational user or recipient address, resolve it with list-users (or another directory tool); do not invent SMTP addresses.",
     "Directory $search on collections such as /users or /groups requires ConsistencyLevel: eventual when the tool exposes that header.",
-    "Teams chat and channel messages: prefer HTML contentType in the body; plain text is often mangled by Graph."
+    "Teams chat and channel messages: prefer HTML contentType in the body; plain text is often mangled by Graph.",
+    "Files / binary content: use download-bytes for any binary read (drive file content, mail attachments, profile photos, Teams hosted content, meeting recordings); pass it a Graph path or an absolute @microsoft.graph.downloadUrl from a metadata response. For uploads, upload-file-content takes a base64 string body up to 4MB; use create-upload-session above that."
   ];
   if (opts.readOnly) parts.push("This server is read-only; write operations are disabled.");
   if (opts.multiAccount)

package/dist/server.js

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

package/dist/tool-categories.js

@@ -1,7 +1,7 @@
 const TOOL_CATEGORIES = {
   mail: {
     name: "mail",
-    pattern: /mail|attachment|draft/i,
+    pattern: /mail|attachment|draft|download-bytes/i,
     description: "Email operations (read, send, manage folders, attachments)"
   },
   calendar: {
@@ -16,12 +16,12 @@ const TOOL_CATEGORIES = {
   },
   personal: {
     name: "personal",
-    pattern: /mail|calendar|drive|contact|todo|onenote|attachment|draft|event|file|folder|search|query/i,
+    pattern: /mail|calendar|drive|contact|todo|onenote|attachment|draft|event|file|folder|search|query|download-bytes|parse-teams-url/i,
     description: "Personal productivity tools (mail, calendar, files, contacts, tasks, notes, search)"
   },
   work: {
     name: "work",
-    pattern: /team|channel|chat|sharepoint|planner|site|list|shared|search|query/i,
+    pattern: /team|channel|chat|sharepoint|planner|site|list|shared|search|query|download-bytes/i,
     description: "Organization/work tools (Teams, SharePoint, shared mailboxes, search)",
     requiresOrgMode: true
   },
@@ -52,7 +52,7 @@ const TOOL_CATEGORIES = {
   },
   users: {
     name: "users",
-    pattern: /user|list-users/i,
+    pattern: /user|list-users|download-bytes/i,
     description: "User directory access",
     requiresOrgMode: true
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@softeria/ms-365-mcp-server",
-  "version": "0.96.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",

package/src/endpoints.json

@@ -151,13 +151,8 @@
     "pathPattern": "/me/messages/{message-id}/attachments",
     "method": "get",
     "toolName": "list-mail-attachments",
-    "scopes": ["Mail.Read"]
-  },
-  {
-    "pathPattern": "/me/messages/{message-id}/attachments/{attachment-id}",
-    "method": "get",
-    "toolName": "get-mail-attachment",
-    "scopes": ["Mail.Read"]
+    "scopes": ["Mail.Read"],
+    "llmTip": "Lists attachments on a message: id, name, contentType, size, isInline. To download the bytes, call download-bytes with target=/me/messages/{message-id}/attachments/{attachment-id}/$value (the /$value suffix returns raw bytes; the bare attachment URL embeds contentBytes in JSON which can truncate large files)."
   },
   {
     "pathPattern": "/me/messages/{message-id}/attachments/{attachment-id}",
@@ -479,14 +474,6 @@
     "toolName": "list-folder-files",
     "scopes": ["Files.Read"]
   },
-  {
-    "pathPattern": "/drives/{drive-id}/items/{driveItem-id}/content",
-    "method": "get",
-    "toolName": "download-onedrive-file-content",
-    "scopes": ["Files.Read"],
-    "returnDownloadUrl": true,
-    "llmTip": "Returns a temporary download URL, NOT the file content directly."
-  },
   {
     "pathPattern": "/drives/{drive-id}/items/{driveItem-id}",
     "method": "delete",
@@ -498,7 +485,7 @@
     "method": "put",
     "toolName": "upload-file-content",
     "scopes": ["Files.ReadWrite"],
-    "llmTip": "Max 4MB. For new files use path format: /items/root:/path/to/file.txt:/content. Overwrites existing files without warning."
+    "llmTip": "Body is a base64-encoded string of the file bytes; the server decodes it before PUT. Max 4MB inline (use create-upload-session above 4MB). For new files use path format: /items/root:/path/to/file.txt:/content. Overwrites existing files without warning."
   },
   {
     "pathPattern": "/drives/{drive-id}/items/{driveItem-id}/createUploadSession",
@@ -512,7 +499,7 @@
     "method": "get",
     "toolName": "get-drive-item",
     "scopes": ["Files.Read"],
-    "llmTip": "Gets metadata for a file or folder: name, size, lastModifiedDateTime, createdBy, webUrl, file (mimeType, hashes), folder (childCount), parentReference. Does not return content — use download-onedrive-file-content for that."
+    "llmTip": "Gets metadata for a file or folder: name, size, lastModifiedDateTime, createdBy, webUrl, file (mimeType, hashes), folder (childCount), parentReference, and @microsoft.graph.downloadUrl. For the bytes, call download-bytes with target=/drives/{drive-id}/items/{driveItem-id}/content (Graph redirects to the same downloadUrl)."
   },
   {
     "pathPattern": "/drives/{drive-id}/items/{driveItem-id}",
@@ -1077,22 +1064,6 @@
     "workScopes": ["User.Read.All"],
     "llmTip": "Lists users who report directly to a specific user. Use with get-user-manager to traverse the org hierarchy."
   },
-  {
-    "pathPattern": "/me/photo/$value",
-    "method": "get",
-    "toolName": "get-my-profile-photo",
-    "scopes": ["User.Read"],
-    "returnDownloadUrl": true,
-    "llmTip": "Returns the current user's profile photo as binary image data. The photo is typically in JPEG format."
-  },
-  {
-    "pathPattern": "/users/{user-id}/photo/$value",
-    "method": "get",
-    "toolName": "get-user-profile-photo",
-    "workScopes": ["User.Read.All"],
-    "returnDownloadUrl": true,
-    "llmTip": "Returns a specific user's profile photo as binary image data. Use the user ID or UPN (email)."
-  },
   {
     "pathPattern": "/me/people",
     "method": "get",
@@ -1185,15 +1156,7 @@
     "method": "get",
     "toolName": "list-chat-message-hosted-contents",
     "workScopes": ["ChatMessage.Read"],
-    "llmTip": "Lists hosted-content references (inline images, code snippets) attached to a Teams chat message. Returns an array of { id, contentType }. Use get-chat-message-hosted-content with the id to download the bytes. Hosted content IDs can also be parsed from the <img src> URL in the message body between /hostedContents/ and /$value."
-  },
-  {
-    "pathPattern": "/chats/{chat-id}/messages/{chatMessage-id}/hostedContents/{chatMessageHostedContent-id}/$value",
-    "method": "get",
-    "toolName": "get-chat-message-hosted-content",
-    "workScopes": ["ChatMessage.Read"],
-    "returnDownloadUrl": true,
-    "llmTip": "Returns raw bytes of a hosted content item (typically image/png or image/jpeg) attached to a Teams 1:1 or group chat message. Use list-chat-message-hosted-contents to discover IDs, or extract the ID from the <img src> URL in the message body."
+    "llmTip": "Lists hosted-content references (inline images, code snippets) attached to a Teams chat message. Returns { id, contentType } per item. To download bytes, call download-bytes with target=/chats/{chat-id}/messages/{chatMessage-id}/hostedContents/{id}/$value. IDs can also be extracted from the <img src> URL in the message body between /hostedContents/ and /$value."
   },
   {
     "pathPattern": "/chats/{chat-id}/messages",
@@ -1261,15 +1224,7 @@
     "method": "get",
     "toolName": "list-channel-message-hosted-contents",
     "workScopes": ["ChannelMessage.Read.All"],
-    "llmTip": "Lists hosted-content references (inline images, code snippets) attached to a Teams channel message. Returns an array of { id, contentType }. Use get-channel-message-hosted-content with the id to download bytes."
-  },
-  {
-    "pathPattern": "/teams/{team-id}/channels/{channel-id}/messages/{chatMessage-id}/hostedContents/{chatMessageHostedContent-id}/$value",
-    "method": "get",
-    "toolName": "get-channel-message-hosted-content",
-    "workScopes": ["ChannelMessage.Read.All"],
-    "returnDownloadUrl": true,
-    "llmTip": "Returns raw bytes of a hosted content item attached to a Teams channel message. Use list-channel-message-hosted-contents to discover IDs."
+    "llmTip": "Lists hosted-content references (inline images, code snippets) attached to a Teams channel message. Returns { id, contentType } per item. To download bytes, call download-bytes with target=/teams/{team-id}/channels/{channel-id}/messages/{chatMessage-id}/hostedContents/{id}/$value."
   },
   {
     "pathPattern": "/teams/{team-id}/channels/{channel-id}/messages",

package/src/generated/endpoint-types.ts

@@ -14,7 +14,7 @@ export type Endpoint = {
   path: string;
   alias: string;
   description?: string;
-  requestFormat: 'json';
+  requestFormat: 'json' | 'binary' | 'form-data' | 'form-url' | 'text';
   parameters?: Parameter[];
   response: z.ZodType<any>;
   errors?: Array<{