ms365-mcp-server 1.1.12 → 1.1.13

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.13"
 }, {
     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.13');
 // Set up the resource listing request handler
 server.setRequestHandler(ListResourcesRequestSchema, async () => {
     logger.log('Received list resources request');
@@ -937,7 +937,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 +950,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: [
                                 {

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.13",
   "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",