ms365-mcp-server 1.1.0 → 1.1.2

package/README.md

@@ -16,7 +16,7 @@ A powerful **Model Context Protocol (MCP) server** that enables seamless Microso
 
 ### **📧 Email Management**
 - **`send_email`** - Send emails with attachments and rich formatting
-- **`manage_email`** - **UNIFIED**: Read, search, list, mark, move, or delete emails
+- **`manage_email`** - **UNIFIED**: Read, search, list, mark, move, delete, or draft emails
 - **`get_attachment`** - Download email attachments with metadata
 - **`list_folders`** - Browse mailbox folders with item counts
 
@@ -200,6 +200,20 @@ ms365-mcp-server --login
     "messageId": "email_id"
   }
 }
+
+// Create draft email
+{
+  "tool": "manage_email",
+  "arguments": {
+    "action": "draft",
+    "draftTo": ["colleague@company.com"],
+    "draftSubject": "Draft: Project Update",
+    "draftBody": "<h2>Status Report</h2><p>Project is on track!</p>",
+    "draftBodyType": "html",
+    "draftCc": ["manager@company.com"],
+    "draftImportance": "normal"
+  }
+}
 ```
 
 ### Contact & Authentication

package/dist/index.js

@@ -55,7 +55,7 @@ function parseArgs() {
 }
 const server = new Server({
     name: "ms365-mcp-server",
-    version: "1.1.0"
+    version: "1.1.2"
 }, {
     capabilities: {
         resources: {
@@ -183,8 +183,8 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
                     },
                     action: {
                         type: "string",
-                        enum: ["read", "search", "list", "mark", "move", "delete", "search_to_me"],
-                        description: "Action to perform: read (get email by ID), search (find emails), list (folder contents), mark (read/unread), move (to folder), delete (permanently), search_to_me (emails addressed to you)"
+                        enum: ["read", "search", "list", "mark", "move", "delete", "search_to_me", "draft"],
+                        description: "Action to perform: read (get email by ID), search (find emails), list (folder contents), mark (read/unread), move (to folder), delete (permanently), search_to_me (emails addressed to you), draft (create/save draft)"
                     },
                     messageId: {
                         type: "string",
@@ -259,6 +259,64 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
                         minimum: 1,
                         maximum: 200,
                         default: 50
+                    },
+                    // Draft email parameters
+                    draftTo: {
+                        type: "array",
+                        items: { type: "string" },
+                        description: "List of recipient email addresses (required for draft action)"
+                    },
+                    draftCc: {
+                        type: "array",
+                        items: { type: "string" },
+                        description: "List of CC recipient email addresses (optional for draft action)"
+                    },
+                    draftBcc: {
+                        type: "array",
+                        items: { type: "string" },
+                        description: "List of BCC recipient email addresses (optional for draft action)"
+                    },
+                    draftSubject: {
+                        type: "string",
+                        description: "Email subject line (required for draft action)"
+                    },
+                    draftBody: {
+                        type: "string",
+                        description: "Email content (required for draft action)"
+                    },
+                    draftBodyType: {
+                        type: "string",
+                        enum: ["text", "html"],
+                        description: "Content type of the email body for draft (default: text)",
+                        default: "text"
+                    },
+                    draftImportance: {
+                        type: "string",
+                        enum: ["low", "normal", "high"],
+                        description: "Email importance level for draft (default: normal)",
+                        default: "normal"
+                    },
+                    draftAttachments: {
+                        type: "array",
+                        items: {
+                            type: "object",
+                            properties: {
+                                name: {
+                                    type: "string",
+                                    description: "Name of the attachment file"
+                                },
+                                contentBytes: {
+                                    type: "string",
+                                    description: "Base64 encoded content of the attachment"
+                                },
+                                contentType: {
+                                    type: "string",
+                                    description: "MIME type of the attachment (optional, auto-detected if not provided)"
+                                }
+                            },
+                            required: ["name", "contentBytes"]
+                        },
+                        description: "List of email attachments for draft (optional)"
                     }
                 },
                 required: ["action"],
@@ -653,6 +711,28 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                                 }
                             ]
                         };
+                    case "draft":
+                        if (!args?.draftTo || !args?.draftSubject || !args?.draftBody) {
+                            throw new Error("draftTo, draftSubject, and draftBody are required for draft action");
+                        }
+                        const draftResult = await ms365Ops.saveDraftEmail({
+                            to: args.draftTo,
+                            cc: args.draftCc,
+                            bcc: args.draftBcc,
+                            subject: args.draftSubject,
+                            body: args.draftBody,
+                            bodyType: args.draftBodyType || 'text',
+                            importance: args.draftImportance || 'normal',
+                            attachments: args.draftAttachments
+                        });
+                        return {
+                            content: [
+                                {
+                                    type: "text",
+                                    text: `✅ Draft email saved successfully!\n📧 Subject: ${args.draftSubject}\n👥 To: ${Array.isArray(args.draftTo) ? args.draftTo.join(', ') : args.draftTo}\n🆔 Draft ID: ${draftResult.id}`
+                                }
+                            ]
+                        };
                     default:
                         throw new Error(`Unknown email action: ${emailAction}`);
                 }

package/dist/utils/ms365-auth-enhanced.js

@@ -24,6 +24,7 @@ const DEFAULT_TENANT_ID = "common";
 const CONFIG_DIR = path.join(os.homedir(), '.ms365-mcp');
 const CREDENTIALS_FILE = path.join(CONFIG_DIR, 'credentials.json');
 const DEVICE_CODE_FILE = path.join(CONFIG_DIR, 'device-code.json');
+const TOKEN_CACHE_FILE = path.join(CONFIG_DIR, 'msal-cache.json');
 /**
  * Enhanced Microsoft 365 authentication manager with device code flow support
  */
@@ -97,13 +98,42 @@ export class EnhancedMS365Auth {
         }
     }
     /**
-     * Initialize MSAL client based on auth type
+     * Initialize MSAL client based on auth type with persistent token cache
      */
     initializeMsalClient() {
         if (!this.credentials) {
             throw new Error('Credentials not loaded');
         }
+        // Return existing client if already initialized with same credentials
+        if (this.msalClient) {
+            return this.msalClient;
+        }
         const isConfidential = this.credentials.clientSecret && this.credentials.authType === 'redirect';
+        // Create persistent token cache
+        const cachePlugin = {
+            beforeCacheAccess: async (cacheContext) => {
+                try {
+                    if (fs.existsSync(TOKEN_CACHE_FILE)) {
+                        const cacheData = fs.readFileSync(TOKEN_CACHE_FILE, 'utf8');
+                        cacheContext.tokenCache.deserialize(cacheData);
+                    }
+                }
+                catch (error) {
+                    logger.error('Error loading MSAL token cache:', error);
+                }
+            },
+            afterCacheAccess: async (cacheContext) => {
+                try {
+                    if (cacheContext.cacheHasChanged) {
+                        const cacheData = cacheContext.tokenCache.serialize();
+                        fs.writeFileSync(TOKEN_CACHE_FILE, cacheData);
+                    }
+                }
+                catch (error) {
+                    logger.error('Error saving MSAL token cache:', error);
+                }
+            }
+        };
         if (isConfidential) {
             // Confidential client for redirect-based auth
             const config = {
@@ -112,6 +142,9 @@ export class EnhancedMS365Auth {
                     clientSecret: this.credentials.clientSecret,
                     authority: `https://login.microsoftonline.com/${this.credentials.tenantId}`
                 },
+                cache: {
+                    cachePlugin
+                },
                 system: {
                     loggerOptions: {
                         loggerCallback: (level, message, containsPii) => {
@@ -133,6 +166,9 @@ export class EnhancedMS365Auth {
                     clientId: this.credentials.clientId,
                     authority: `https://login.microsoftonline.com/${this.credentials.tenantId}`
                 },
+                cache: {
+                    cachePlugin
+                },
                 system: {
                     loggerOptions: {
                         loggerCallback: (level, message, containsPii) => {
@@ -147,6 +183,7 @@ export class EnhancedMS365Auth {
             };
             this.msalClient = new PublicClientApplication(config);
         }
+        logger.log('Initialized MSAL client with persistent token cache');
         return this.msalClient;
     }
     /**
@@ -266,14 +303,14 @@ export class EnhancedMS365Auth {
         try {
             const tokenData = {
                 accessToken: token.accessToken,
-                refreshToken: '',
+                refreshToken: '', // MSAL manages refresh tokens internally
                 expiresOn: token.expiresOn?.getTime() || 0,
                 account: token.account,
                 authType: authType
             };
             // Always use a single account key for simplicity
             await credentialStore.setCredentials('ms365-user', tokenData);
-            logger.log('Saved MS365 access token securely');
+            logger.log(`Saved MS365 access token securely (expires: ${new Date(tokenData.expiresOn).toLocaleString()})`);
         }
         catch (error) {
             logger.error('Error saving token:', error);
@@ -331,13 +368,19 @@ export class EnhancedMS365Auth {
      * Get authenticated Microsoft Graph client
      */
     async getGraphClient() {
-        const storedToken = await this.loadStoredToken();
+        let storedToken = await this.loadStoredToken();
         if (!storedToken) {
             throw new Error('No stored token found. Please authenticate first.');
         }
         // Check if token is expired
         if (storedToken.expiresOn < Date.now()) {
+            logger.log('Access token expired, refreshing...');
             await this.refreshToken();
+            // Reload the token after refresh
+            storedToken = await this.loadStoredToken();
+            if (!storedToken) {
+                throw new Error('Failed to refresh token. Please re-authenticate.');
+            }
         }
         const client = Client.init({
             authProvider: (done) => {
@@ -399,9 +442,23 @@ export class EnhancedMS365Auth {
         }
         const msalClient = this.initializeMsalClient();
         try {
+            // Try to get all accounts from MSAL cache first (only available on PublicClientApplication)
+            let accountToUse = storedToken.account;
+            if (msalClient instanceof PublicClientApplication) {
+                const accounts = await msalClient.getAllAccounts();
+                // If we have accounts in MSAL cache, use the first one that matches
+                if (accounts.length > 0) {
+                    const matchingAccount = accounts.find((acc) => acc.username === storedToken.account?.username ||
+                        acc.homeAccountId === storedToken.account?.homeAccountId);
+                    if (matchingAccount) {
+                        accountToUse = matchingAccount;
+                        logger.log('Using account from MSAL cache for token refresh');
+                    }
+                }
+            }
             const tokenResponse = await msalClient.acquireTokenSilent({
                 scopes: SCOPES,
-                account: storedToken.account
+                account: accountToUse
             });
             if (!tokenResponse) {
                 throw new Error('Failed to refresh token - please re-authenticate using: authenticate_with_device_code');
@@ -417,6 +474,9 @@ export class EnhancedMS365Auth {
             else if (error.errorCode === 'consent_required') {
                 throw new Error('Additional consent required. Please re-authenticate using the "authenticate_with_device_code" tool.');
             }
+            else if (error.errorCode === 'no_account_in_silent_request') {
+                throw new Error('No account found in token cache. Please re-authenticate using the "authenticate_with_device_code" tool.');
+            }
             else {
                 logger.error('Token refresh failed:', error);
                 throw new Error(`Token refresh failed: ${error.message}. Please re-authenticate using the "authenticate_with_device_code" tool.`);
@@ -457,6 +517,13 @@ export class EnhancedMS365Auth {
         try {
             await credentialStore.deleteCredentials('ms365-user');
             await this.clearDeviceCodeState();
+            // Clear MSAL token cache
+            if (fs.existsSync(TOKEN_CACHE_FILE)) {
+                fs.unlinkSync(TOKEN_CACHE_FILE);
+                logger.log('Cleared MSAL token cache');
+            }
+            // Reset MSAL client instance to force re-initialization
+            this.msalClient = null;
             logger.log('Cleared stored authentication tokens');
         }
         catch (error) {

package/dist/utils/ms365-operations.js

@@ -244,6 +244,74 @@ export class MS365Operations {
             throw error;
         }
     }
+    /**
+     * Save a draft email
+     */
+    async saveDraftEmail(message) {
+        try {
+            const graphClient = await this.getGraphClient();
+            // Prepare recipients
+            const toRecipients = message.to.map(email => ({
+                emailAddress: {
+                    address: email,
+                    name: email.split('@')[0]
+                }
+            }));
+            const ccRecipients = message.cc?.map(email => ({
+                emailAddress: {
+                    address: email,
+                    name: email.split('@')[0]
+                }
+            })) || [];
+            const bccRecipients = message.bcc?.map(email => ({
+                emailAddress: {
+                    address: email,
+                    name: email.split('@')[0]
+                }
+            })) || [];
+            // Prepare attachments
+            const attachments = message.attachments?.map(att => ({
+                '@odata.type': '#microsoft.graph.fileAttachment',
+                name: att.name,
+                contentBytes: att.contentBytes,
+                contentType: att.contentType || 'application/octet-stream'
+            })) || [];
+            // Prepare draft email body
+            const draftBody = {
+                subject: message.subject,
+                body: {
+                    contentType: message.bodyType === 'html' ? 'html' : 'text',
+                    content: message.body || ''
+                },
+                toRecipients,
+                ccRecipients,
+                bccRecipients,
+                importance: message.importance || 'normal',
+                attachments: attachments.length > 0 ? attachments : undefined
+            };
+            if (message.replyTo) {
+                draftBody.replyTo = [{
+                        emailAddress: {
+                            address: message.replyTo,
+                            name: message.replyTo.split('@')[0]
+                        }
+                    }];
+            }
+            // Save draft email
+            const result = await graphClient
+                .api('/me/messages')
+                .post(draftBody);
+            logger.log('Draft email saved successfully');
+            return {
+                id: result.id,
+                status: 'draft'
+            };
+        }
+        catch (error) {
+            logger.error('Error saving draft email:', error);
+            throw error;
+        }
+    }
     /**
      * Get email by ID
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ms365-mcp-server",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "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",
@@ -55,4 +55,4 @@
   "engines": {
     "node": ">=18.0.0"
   }
-} 
+}