ms365-mcp-server 1.1.12 → 1.1.14

package/dist/index.js

@@ -67,7 +67,7 @@ function parseArgs() {
 }
 const server = new Server({
     name: "ms365-mcp-server",
-    version: "1.1.12"
+    version: "1.1.14"
 }, {
     capabilities: {
         resources: {
@@ -83,7 +83,7 @@ const server = new Server({
         }
     }
 });
-logger.log('Server started with version 1.1.12');
+logger.log('Server started with version 1.1.14');
 // Set up the resource listing request handler
 server.setRequestHandler(ListResourcesRequestSchema, async () => {
     logger.log('Received list resources request');
@@ -119,19 +119,25 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
                         description: "User ID for multi-user authentication (required if using multi-user mode)"
                     },
                     to: {
-                        type: "array",
-                        items: { type: "string" },
-                        description: "List of recipient email addresses"
+                        oneOf: [
+                            { type: "string" },
+                            { type: "array", items: { type: "string" } }
+                        ],
+                        description: "Recipient email address (string) or list of recipient email addresses (array)"
                     },
                     cc: {
-                        type: "array",
-                        items: { type: "string" },
-                        description: "List of CC recipient email addresses (optional)"
+                        oneOf: [
+                            { type: "string" },
+                            { type: "array", items: { type: "string" } }
+                        ],
+                        description: "CC recipient email address (string) or list of CC recipient email addresses (array) - optional"
                     },
                     bcc: {
-                        type: "array",
-                        items: { type: "string" },
-                        description: "List of BCC recipient email addresses (optional)"
+                        oneOf: [
+                            { type: "string" },
+                            { type: "array", items: { type: "string" } }
+                        ],
+                        description: "BCC recipient email address (string) or list of BCC recipient email addresses (array) - optional"
                     },
                     subject: {
                         type: "string",
@@ -180,8 +186,7 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
                         description: "List of email attachments (optional)"
                     }
                 },
-                required: ["to", "subject"],
-                additionalProperties: false
+                required: ["to", "subject"]
             }
         },
         {
@@ -275,19 +280,25 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
                     },
                     // Draft email parameters
                     draftTo: {
-                        type: "array",
-                        items: { type: "string" },
-                        description: "List of recipient email addresses (required for draft action)"
+                        oneOf: [
+                            { type: "string" },
+                            { type: "array", items: { type: "string" } }
+                        ],
+                        description: "Recipient email address (string) or list of recipient email addresses (array) - required for draft action"
                     },
                     draftCc: {
-                        type: "array",
-                        items: { type: "string" },
-                        description: "List of CC recipient email addresses (optional for draft action)"
+                        oneOf: [
+                            { type: "string" },
+                            { type: "array", items: { type: "string" } }
+                        ],
+                        description: "CC recipient email address (string) or list of CC recipient email addresses (array) - optional for draft action"
                     },
                     draftBcc: {
-                        type: "array",
-                        items: { type: "string" },
-                        description: "List of BCC recipient email addresses (optional for draft action)"
+                        oneOf: [
+                            { type: "string" },
+                            { type: "array", items: { type: "string" } }
+                        ],
+                        description: "BCC recipient email address (string) or list of BCC recipient email addresses (array) - optional for draft action"
                     },
                     draftSubject: {
                         type: "string",
@@ -350,8 +361,7 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
                         description: "Conversation ID for threading drafts (optional)"
                     }
                 },
-                required: ["action"],
-                additionalProperties: false
+                required: ["action"]
             }
         },
         {
@@ -373,8 +383,7 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
                         description: "Attachment ID to download"
                     }
                 },
-                required: ["messageId", "attachmentId"],
-                additionalProperties: false
+                required: ["messageId", "attachmentId"]
             }
         },
         {
@@ -395,8 +404,7 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
                         type: "string",
                         description: "Optional: Search for folders by name (case-insensitive partial match)"
                     }
-                },
-                additionalProperties: false
+                }
             }
         },
         {
@@ -425,8 +433,7 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
                         minimum: 1,
                         maximum: 500
                     }
-                },
-                additionalProperties: false
+                }
             }
         }
     ];
@@ -442,8 +449,7 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
                         type: "string",
                         description: "User's email address (optional, for identification)"
                     }
-                },
-                additionalProperties: false
+                }
             }
         },
         {
@@ -457,8 +463,7 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
                         description: "Your User ID to remove"
                     }
                 },
-                required: ["userId"],
-                additionalProperties: false
+                required: ["userId"]
             }
         }
     ];
@@ -486,8 +491,7 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
                         description: "Account key for logout action (default: current user)",
                         default: "default-user"
                     }
-                },
-                additionalProperties: false
+                }
             }
         }
     ];
@@ -851,15 +855,25 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                         if (!args?.draftTo || !args?.draftSubject || !args?.draftBody) {
                             throw new Error("draftTo, draftSubject, and draftBody are required for draft action");
                         }
+                        // Helper function to normalize email arrays for drafts
+                        const normalizeDraftEmailArray = (field) => {
+                            if (!field)
+                                return [];
+                            if (typeof field === 'string')
+                                return [field];
+                            if (Array.isArray(field))
+                                return field;
+                            throw new Error(`Invalid email field format. Expected string or array of strings.`);
+                        };
                         // Check if this looks like a reply based on subject
                         const isLikelyReply = args.draftSubject?.toString().toLowerCase().startsWith('re:');
                         if (isLikelyReply) {
                             logger.log('🔔 SUGGESTION: Consider using "reply_draft" action instead of "draft" for threaded replies that appear in conversations');
                         }
                         const draftResult = await ms365Ops.saveDraftEmail({
-                            to: args.draftTo,
-                            cc: args.draftCc,
-                            bcc: args.draftBcc,
+                            to: normalizeDraftEmailArray(args.draftTo),
+                            cc: normalizeDraftEmailArray(args.draftCc),
+                            bcc: normalizeDraftEmailArray(args.draftBcc),
                             subject: args.draftSubject,
                             body: args.draftBody,
                             bodyType: args.draftBodyType || 'text',
@@ -884,13 +898,23 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                         if (!args?.draftId) {
                             throw new Error("draftId is required for update_draft action");
                         }
+                        // Helper function to normalize email arrays for draft updates
+                        const normalizeUpdateEmailArray = (field) => {
+                            if (!field)
+                                return [];
+                            if (typeof field === 'string')
+                                return [field];
+                            if (Array.isArray(field))
+                                return field;
+                            throw new Error(`Invalid email field format. Expected string or array of strings.`);
+                        };
                         const updates = {};
                         if (args.draftTo)
-                            updates.to = args.draftTo;
+                            updates.to = normalizeUpdateEmailArray(args.draftTo);
                         if (args.draftCc)
-                            updates.cc = args.draftCc;
+                            updates.cc = normalizeUpdateEmailArray(args.draftCc);
                         if (args.draftBcc)
-                            updates.bcc = args.draftBcc;
+                            updates.bcc = normalizeUpdateEmailArray(args.draftBcc);
                         if (args.draftSubject)
                             updates.subject = args.draftSubject;
                         if (args.draftBody)
@@ -937,7 +961,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                         if (!args?.originalMessageId) {
                             throw new Error("originalMessageId is required for reply_draft action");
                         }
-                        const replyDraftResult = await ms365Ops.createReplyDraft(args.originalMessageId, args.draftBody, args.replyToAll || false);
+                        const replyDraftResult = await ms365Ops.createReplyDraft(args.originalMessageId, args.draftBody, args.replyToAll || false, args.draftBodyType || 'text');
                         return {
                             content: [
                                 {
@@ -950,7 +974,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                         if (!args?.originalMessageId) {
                             throw new Error("originalMessageId is required for forward_draft action");
                         }
-                        const forwardDraftResult = await ms365Ops.createForwardDraft(args.originalMessageId, args.draftBody);
+                        const forwardDraftResult = await ms365Ops.createForwardDraft(args.originalMessageId, args.draftBody, args.draftBodyType || 'text');
                         return {
                             content: [
                                 {
@@ -1018,7 +1042,36 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                     const graphClient = await enhancedMS365Auth.getGraphClient();
                     ms365Ops.setGraphClient(graphClient);
                 }
-                const emailResult = await ms365Ops.sendEmail(args);
+                // Validate and normalize email input
+                if (!args?.to) {
+                    throw new Error("'to' field is required for sending email");
+                }
+                if (!args?.subject) {
+                    throw new Error("'subject' field is required for sending email");
+                }
+                // Helper function to normalize email arrays
+                const normalizeEmailArray = (field) => {
+                    if (!field)
+                        return [];
+                    if (typeof field === 'string')
+                        return [field];
+                    if (Array.isArray(field))
+                        return field;
+                    throw new Error(`Invalid email field format. Expected string or array of strings.`);
+                };
+                // Normalize the email message
+                const emailMessage = {
+                    to: normalizeEmailArray(args.to),
+                    cc: normalizeEmailArray(args.cc),
+                    bcc: normalizeEmailArray(args.bcc),
+                    subject: args.subject,
+                    body: args.body || '',
+                    bodyType: args.bodyType || 'text',
+                    replyTo: args.replyTo,
+                    importance: args.importance || 'normal',
+                    attachments: args.attachments || []
+                };
+                const emailResult = await ms365Ops.sendEmail(emailMessage);
                 return {
                     content: [
                         {

package/dist/utils/ms365-operations.js

@@ -522,7 +522,7 @@ export class MS365Operations {
     /**
      * Create a threaded reply draft from a specific message
      */
-    async createReplyDraft(originalMessageId, body, replyToAll = false) {
+    async createReplyDraft(originalMessageId, body, replyToAll = false, bodyType = 'text') {
         try {
             const graphClient = await this.getGraphClient();
             logger.log(`Creating reply draft for message: ${originalMessageId}`);
@@ -536,7 +536,25 @@ export class MS365Operations {
             const originalBodyContent = originalMessage.body?.content || '';
             const fromDisplay = originalMessage.from?.emailAddress?.name || originalMessage.from?.emailAddress?.address || '';
             const sentDate = new Date(originalMessage.sentDateTime).toLocaleString();
-            const completeReplyBody = `${body || ''}
+            // Helper function to escape HTML characters
+            const escapeHtml = (text) => {
+                return text
+                    .replace(/&/g, '&')
+                    .replace(/</g, '&lt;')
+                    .replace(/>/g, '&gt;')
+                    .replace(/"/g, '&quot;')
+                    .replace(/'/g, '&#x27;');
+            };
+            // Helper function to convert text to HTML
+            const textToHtml = (text) => {
+                return escapeHtml(text).replace(/\n/g, '<br>');
+            };
+            // Process the user's body based on the specified type
+            let processedUserBody = body || '';
+            if (bodyType === 'text' && processedUserBody) {
+                processedUserBody = textToHtml(processedUserBody);
+            }
+            const completeReplyBody = `${processedUserBody}
 
 <br><br>
 <div style="border-left: 2px solid #ccc; padding-left: 10px; margin-top: 10px;">
@@ -670,20 +688,38 @@ ${originalBodyContent}
     /**
      * Create a threaded forward draft from a specific message
      */
-    async createForwardDraft(originalMessageId, comment) {
+    async createForwardDraft(originalMessageId, comment, bodyType = 'text') {
         try {
             const graphClient = await this.getGraphClient();
             logger.log(`Creating forward draft for message: ${originalMessageId}`);
             // First, try using the official Microsoft Graph createForward endpoint for proper threading
             try {
                 logger.log(`Using official Graph API endpoint: /me/messages/${originalMessageId}/createForward`);
+                // Helper function to escape HTML characters
+                const escapeHtml = (text) => {
+                    return text
+                        .replace(/&/g, '&amp;')
+                        .replace(/</g, '&lt;')
+                        .replace(/>/g, '&gt;')
+                        .replace(/"/g, '&quot;')
+                        .replace(/'/g, '&#x27;');
+                };
+                // Helper function to convert text to HTML
+                const textToHtml = (text) => {
+                    return escapeHtml(text).replace(/\n/g, '<br>');
+                };
+                // Process the comment based on the specified type
+                let processedComment = comment || '';
+                if (bodyType === 'text' && processedComment) {
+                    processedComment = textToHtml(processedComment);
+                }
                 const forwardDraft = await graphClient
                     .api(`/me/messages/${originalMessageId}/createForward`)
                     .post({
                     message: {
                         body: {
                             contentType: 'html',
-                            content: comment || ''
+                            content: processedComment
                         }
                     }
                 });
@@ -717,11 +753,29 @@ ${originalBodyContent}
                         referencesHeader = `${existingReferences.value} ${referencesHeader}`;
                     }
                 }
-                const forwardedBody = `${comment ? comment + '\n\n' : ''}---------- Forwarded message ----------\nFrom: ${originalMessage.from?.emailAddress?.name || originalMessage.from?.emailAddress?.address}\nDate: ${originalMessage.sentDateTime}\nSubject: ${originalMessage.subject}\nTo: ${originalMessage.toRecipients?.map((r) => r.emailAddress.address).join(', ')}\n\n${originalMessage.body?.content || ''}`;
+                // Helper function to escape HTML characters for fallback
+                const escapeHtml = (text) => {
+                    return text
+                        .replace(/&/g, '&amp;')
+                        .replace(/</g, '&lt;')
+                        .replace(/>/g, '&gt;')
+                        .replace(/"/g, '&quot;')
+                        .replace(/'/g, '&#x27;');
+                };
+                // Helper function to convert text to HTML for fallback
+                const textToHtml = (text) => {
+                    return escapeHtml(text).replace(/\n/g, '<br>');
+                };
+                // Process the comment based on the specified type for fallback
+                let processedComment = comment || '';
+                if (bodyType === 'text' && processedComment) {
+                    processedComment = textToHtml(processedComment);
+                }
+                const forwardedBody = `${processedComment ? processedComment + '<br><br>' : ''}---------- Forwarded message ----------<br>From: ${originalMessage.from?.emailAddress?.name || originalMessage.from?.emailAddress?.address}<br>Date: ${originalMessage.sentDateTime}<br>Subject: ${originalMessage.subject}<br>To: ${originalMessage.toRecipients?.map((r) => r.emailAddress.address).join(', ')}<br><br>${originalMessage.body?.content || ''}`;
                 const draftBody = {
                     subject: originalMessage.subject?.startsWith('Fwd:') ? originalMessage.subject : `Fwd: ${originalMessage.subject}`,
                     body: {
-                        contentType: originalMessage.body?.contentType || 'html',
+                        contentType: 'html',
                         content: forwardedBody
                     },
                     conversationId: originalMessage.conversationId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ms365-mcp-server",
-  "version": "1.1.12",
+  "version": "1.1.14",
   "description": "Microsoft 365 MCP Server for managing Microsoft 365 email through natural language interactions with full OAuth2 authentication support",
   "main": "dist/index.js",
   "type": "module",