ms365-mcp-server 1.0.5 → 1.1.0

package/dist/index.js

@@ -55,7 +55,7 @@ function parseArgs() {
 }
 const server = new Server({
     name: "ms365-mcp-server",
-    version: "1.0.5"
+    version: "1.1.0"
 }, {
     capabilities: {
         resources: {
@@ -172,8 +172,8 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
             }
         },
         {
-            name: "read_email",
-            description: "Read email message by ID with advanced content extraction. Returns full email content including headers, body, and attachment information.",
+            name: "manage_email",
+            description: "UNIFIED EMAIL MANAGEMENT: Read, search, list, mark, move, or delete emails. Combines all email operations in one powerful tool. Supports intelligent partial name matching, folder management, and advanced search criteria.",
             inputSchema: {
                 type: "object",
                 properties: {
@@ -181,29 +181,32 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
                         type: "string",
                         description: "User ID for multi-user authentication (required if using multi-user mode)"
                     },
+                    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)"
+                    },
                     messageId: {
                         type: "string",
-                        description: "Microsoft 365 message ID to retrieve"
+                        description: "Email ID (required for: read, mark, move, delete)"
                     },
                     includeAttachments: {
                         type: "boolean",
-                        description: "Whether to include attachment information and content",
+                        description: "Include attachment info when reading email",
                         default: false
-                    }
-                },
-                required: ["messageId"],
-                additionalProperties: false
-            }
-        },
-        {
-            name: "search_emails",
-            description: "Search emails with various criteria including subject, sender, TO/CC recipients, date range, and advanced filtering. Features intelligent partial name matching for senders - just use their first name, last name, or partial name in the 'from' field. Supports complex queries and filtering, including emails addressed to you directly or where you were CC'd.",
-            inputSchema: {
-                type: "object",
-                properties: {
-                    userId: {
+                    },
+                    isRead: {
+                        type: "boolean",
+                        description: "Mark as read (true) or unread (false) - used with mark action"
+                    },
+                    destinationFolderId: {
                         type: "string",
-                        description: "User ID for multi-user authentication (required if using multi-user mode)"
+                        description: "Destination folder for move action (e.g., 'archive', 'drafts', 'deleteditems')"
+                    },
+                    folderId: {
+                        type: "string",
+                        description: "Folder to list emails from (default: inbox) - used with list action",
+                        default: "inbox"
                     },
                     query: {
                         type: "string",
@@ -211,85 +214,27 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
                     },
                     from: {
                         type: "string",
-                        description: "Search for emails from specific sender"
+                        description: "Search emails from specific sender (supports partial names like 'John' or 'Smith')"
                     },
                     to: {
                         type: "string",
-                        description: "Search for emails to specific recipient (useful for finding emails addressed to you)"
+                        description: "Search emails to specific recipient"
                     },
                     cc: {
                         type: "string",
-                        description: "Search for emails with specific CC recipient (useful for finding emails where someone was CC'd)"
-                    },
-                    subject: {
-                        type: "string",
-                        description: "Search for emails with specific subject"
-                    },
-                    after: {
-                        type: "string",
-                        description: "Search for emails after date (format: YYYY-MM-DD)"
-                    },
-                    before: {
-                        type: "string",
-                        description: "Search for emails before date (format: YYYY-MM-DD)"
-                    },
-                    hasAttachment: {
-                        type: "boolean",
-                        description: "Filter emails that have attachments"
-                    },
-                    folder: {
-                        type: "string",
-                        description: "Search within specific folder (default: inbox)"
-                    },
-                    isUnread: {
-                        type: "boolean",
-                        description: "Filter for unread emails only"
-                    },
-                    importance: {
-                        type: "string",
-                        enum: ["low", "normal", "high"],
-                        description: "Filter by email importance level"
-                    },
-                    maxResults: {
-                        type: "number",
-                        description: "Maximum number of results to return (default: 50, max: 200)",
-                        minimum: 1,
-                        maximum: 200,
-                        default: 50
-                    }
-                },
-                additionalProperties: false
-            }
-        },
-        {
-            name: "search_emails_to_me",
-            description: "Search for emails addressed to YOU in both TO and CC fields. This automatically finds all emails where you are a recipient (direct TO or CC'd), without needing to specify your email address.",
-            inputSchema: {
-                type: "object",
-                properties: {
-                    userId: {
-                        type: "string",
-                        description: "User ID for multi-user authentication (required if using multi-user mode)"
-                    },
-                    query: {
-                        type: "string",
-                        description: "General search query using natural language or specific terms"
-                    },
-                    from: {
-                        type: "string",
-                        description: "Search for emails from specific sender"
+                        description: "Search emails with specific CC recipient"
                     },
                     subject: {
                         type: "string",
-                        description: "Search for emails with specific subject"
+                        description: "Search emails with specific subject"
                     },
                     after: {
                         type: "string",
-                        description: "Search for emails after date (format: YYYY-MM-DD)"
+                        description: "Search emails after date (format: YYYY-MM-DD)"
                     },
                     before: {
                         type: "string",
-                        description: "Search for emails before date (format: YYYY-MM-DD)"
+                        description: "Search emails before date (format: YYYY-MM-DD)"
                     },
                     hasAttachment: {
                         type: "boolean",
@@ -316,97 +261,7 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
                         default: 50
                     }
                 },
-                additionalProperties: false
-            }
-        },
-        {
-            name: "list_emails",
-            description: "List emails in inbox, sent, or custom folder. Returns basic email information including subjects, senders, and snippets with support for folder navigation.",
-            inputSchema: {
-                type: "object",
-                properties: {
-                    userId: {
-                        type: "string",
-                        description: "User ID for multi-user authentication (required if using multi-user mode)"
-                    },
-                    folderId: {
-                        type: "string",
-                        description: "Folder ID or name (default: inbox). Common values: inbox, sentitems, drafts, deleteditems",
-                        default: "inbox"
-                    },
-                    maxResults: {
-                        type: "number",
-                        description: "Maximum number of emails to retrieve (default: 50, max: 200)",
-                        minimum: 1,
-                        maximum: 200,
-                        default: 50
-                    }
-                },
-                additionalProperties: false
-            }
-        },
-        {
-            name: "mark_email",
-            description: "Mark email as read or unread. Useful for managing email status and organizing your inbox.",
-            inputSchema: {
-                type: "object",
-                properties: {
-                    userId: {
-                        type: "string",
-                        description: "User ID for multi-user authentication (required if using multi-user mode)"
-                    },
-                    messageId: {
-                        type: "string",
-                        description: "Microsoft 365 message ID to mark"
-                    },
-                    isRead: {
-                        type: "boolean",
-                        description: "True to mark as read, false to mark as unread"
-                    }
-                },
-                required: ["messageId", "isRead"],
-                additionalProperties: false
-            }
-        },
-        {
-            name: "move_email",
-            description: "Move email to different folder. Supports moving emails between various Outlook folders for organization.",
-            inputSchema: {
-                type: "object",
-                properties: {
-                    userId: {
-                        type: "string",
-                        description: "User ID for multi-user authentication (required if using multi-user mode)"
-                    },
-                    messageId: {
-                        type: "string",
-                        description: "Microsoft 365 message ID to move"
-                    },
-                    destinationFolderId: {
-                        type: "string",
-                        description: "Destination folder ID or name (e.g., 'archive', 'drafts', 'deleteditems')"
-                    }
-                },
-                required: ["messageId", "destinationFolderId"],
-                additionalProperties: false
-            }
-        },
-        {
-            name: "delete_email",
-            description: "Permanently delete an email message. Use with caution as this action cannot be undone.",
-            inputSchema: {
-                type: "object",
-                properties: {
-                    userId: {
-                        type: "string",
-                        description: "User ID for multi-user authentication (required if using multi-user mode)"
-                    },
-                    messageId: {
-                        type: "string",
-                        description: "Microsoft 365 message ID to delete"
-                    }
-                },
-                required: ["messageId"],
+                required: ["action"],
                 additionalProperties: false
             }
         },
@@ -448,8 +303,8 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
             }
         },
         {
-            name: "get_contacts",
-            description: "Retrieve contact list from Microsoft 365. Returns contact information including names, email addresses, and phone numbers.",
+            name: "manage_contacts",
+            description: "UNIFIED CONTACT MANAGEMENT: Get all contacts or search contacts by name/email. Combines contact operations in one tool.",
             inputSchema: {
                 type: "object",
                 properties: {
@@ -457,40 +312,23 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
                         type: "string",
                         description: "User ID for multi-user authentication (required if using multi-user mode)"
                     },
-                    maxResults: {
-                        type: "number",
-                        description: "Maximum number of contacts to retrieve (default: 100, max: 500)",
-                        minimum: 1,
-                        maximum: 500,
-                        default: 100
-                    }
-                },
-                additionalProperties: false
-            }
-        },
-        {
-            name: "search_contacts",
-            description: "Search contacts by name or email address. Useful for finding specific contacts for email addressing.",
-            inputSchema: {
-                type: "object",
-                properties: {
-                    userId: {
+                    action: {
                         type: "string",
-                        description: "User ID for multi-user authentication (required if using multi-user mode)"
+                        enum: ["list", "search"],
+                        description: "Action: list (get all contacts) or search (find specific contacts)",
+                        default: "list"
                     },
                     query: {
                         type: "string",
-                        description: "Search query for contact name or email address"
+                        description: "Search query for contact name or email address (required for search action)"
                     },
                     maxResults: {
                         type: "number",
-                        description: "Maximum number of contacts to return (default: 50, max: 200)",
+                        description: "Maximum number of contacts to return (default: 100 for list, 50 for search, max: 500)",
                         minimum: 1,
-                        maximum: 200,
-                        default: 50
+                        maximum: 500
                     }
                 },
-                required: ["query"],
                 additionalProperties: false
             }
         }
@@ -527,92 +365,28 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
             }
         }
     ];
-    // Add one-time authentication tool for single-user mode
-    const oneTimeAuthTools = [
-        {
-            name: "get_auth_link",
-            description: "Get a clickable Microsoft 365 authentication link without auto-opening browser. Perfect for manual authentication control.",
-            inputSchema: {
-                type: "object",
-                properties: {
-                    force: {
-                        type: "boolean",
-                        description: "Force new authentication link even if already authenticated (default: false)",
-                        default: false
-                    }
-                },
-                additionalProperties: false
-            }
-        }
-    ];
-    // Enhanced authentication tools with device code flow
-    const enhancedAuthTools = [
+    // Consolidated authentication tools
+    const authTools = [
         {
-            name: "authenticate_with_device_code",
-            description: "Complete device code authentication in MCP. First call shows device code, second call (after browser auth) completes the process. RECOMMENDED method.",
-            inputSchema: {
-                type: "object",
-                properties: {
-                    force: {
-                        type: "boolean",
-                        description: "Force new authentication even if already authenticated (default: false)",
-                        default: false
-                    }
-                },
-                additionalProperties: false
-            }
-        },
-        {
-            name: "device_code_login",
-            description: "Start device code authentication flow and get the URL/code to enter. Shows authentication details immediately in the UI.",
+            name: "authenticate",
+            description: "UNIFIED AUTHENTICATION: Handle all Microsoft 365 authentication needs. Supports device code flow, status checking, and logout. RECOMMENDED for all auth operations.",
             inputSchema: {
                 type: "object",
                 properties: {
+                    action: {
+                        type: "string",
+                        enum: ["login", "status", "logout", "device_code", "check_pending"],
+                        description: "Auth action: login (device code auth), status (check auth status), logout (clear tokens), device_code (get device code only), check_pending (check pending auth)",
+                        default: "login"
+                    },
                     force: {
                         type: "boolean",
-                        description: "Force new authentication even if already authenticated (default: false)",
+                        description: "Force new authentication even if already authenticated (for login action)",
                         default: false
-                    }
-                },
-                additionalProperties: false
-            }
-        },
-        {
-            name: "check_pending_auth",
-            description: "Check if there's a pending device code authentication and get the URL/code again if needed.",
-            inputSchema: {
-                type: "object",
-                properties: {},
-                additionalProperties: false
-            }
-        },
-        {
-            name: "get_device_code",
-            description: "Get device code information for manual authentication without starting the full flow. Returns URL and code to enter.",
-            inputSchema: {
-                type: "object",
-                properties: {},
-                additionalProperties: false
-            }
-        },
-        {
-            name: "verify_authentication",
-            description: "Verify current authentication status and show account information. Useful for checking if authentication is still valid.",
-            inputSchema: {
-                type: "object",
-                properties: {},
-                additionalProperties: false
-            }
-        },
-        {
-            name: "logout",
-            description: "Log out and clear stored authentication tokens for the current user. This will require re-authentication.",
-            inputSchema: {
-                type: "object",
-                properties: {
+                    },
                     accountKey: {
                         type: "string",
-                        description: "Account key to logout (default: current user)",
+                        description: "Account key for logout action (default: current user)",
                         default: "default-user"
                     }
                 },
@@ -623,14 +397,8 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
     if (ms365Config.multiUser) {
         return { tools: [...baseTools, ...multiUserTools] };
     }
-    // For single-user mode, include enhanced authentication tools
-    // Check if user is authenticated using enhanced auth system
-    const isAuthenticated = await enhancedMS365Auth.isAuthenticated();
-    if (!isAuthenticated) {
-        return { tools: [...baseTools, ...oneTimeAuthTools, ...enhancedAuthTools] };
-    }
-    // If authenticated, still provide auth management tools
-    return { tools: [...baseTools, ...enhancedAuthTools] };
+    // For single-user mode, always include auth tools
+    return { tools: [...baseTools, ...authTools] };
 });
 /**
  * Handle tool execution requests
@@ -639,312 +407,257 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
     const { name, arguments: args } = request.params;
     try {
         switch (name) {
-            // ============ ENHANCED AUTHENTICATION TOOLS ============
-            case "authenticate_with_device_code":
-                try {
-                    // Check if already authenticated
-                    if (await enhancedMS365Auth.isAuthenticated() && !args?.force) {
+            // ============ UNIFIED AUTHENTICATION TOOL ============
+            case "authenticate":
+                const action = args?.action || 'login';
+                switch (action) {
+                    case "login":
+                        try {
+                            // Check if already authenticated
+                            if (await enhancedMS365Auth.isAuthenticated() && !args?.force) {
+                                return {
+                                    content: [
+                                        {
+                                            type: "text",
+                                            text: `✅ Already authenticated with Microsoft 365! Use force: true to re-authenticate.`
+                                        }
+                                    ]
+                                };
+                            }
+                            // First, try to complete any existing pending authentication
+                            const existingResult = await enhancedMS365Auth.completeDeviceCodeAuth();
+                            if (existingResult) {
+                                const currentUser = await enhancedMS365Auth.getCurrentUser();
+                                return {
+                                    content: [
+                                        {
+                                            type: "text",
+                                            text: `✅ Device code authentication completed successfully!\n\n👤 User: ${currentUser || 'authenticated-user'}\n🔐 Status: Valid\n\n🚀 You can now use all Microsoft 365 email features!`
+                                        }
+                                    ]
+                                };
+                            }
+                            // Check if there's already a pending device code
+                            let deviceCodeInfo = await enhancedMS365Auth.getPendingDeviceCodeInfo();
+                            if (!deviceCodeInfo || args?.force) {
+                                // No pending code or force new one, start fresh
+                                deviceCodeInfo = await enhancedMS365Auth.startDeviceCodeAuth();
+                            }
+                            // Return device code information immediately (MCP pattern)
+                            return {
+                                content: [
+                                    {
+                                        type: "text",
+                                        text: `🔐 Microsoft 365 Device Code Authentication\n\n📱 Visit: ${deviceCodeInfo.verificationUri}\n🔑 Enter this code: ${deviceCodeInfo.userCode}\n\n⏳ After completing authentication in your browser, call this tool again to finish the process.\n\n💡 This code will expire in 15 minutes.`
+                                    }
+                                ]
+                            };
+                        }
+                        catch (error) {
+                            return {
+                                content: [
+                                    {
+                                        type: "text",
+                                        text: `❌ Authentication failed: ${error.message}\n\n💡 Try again or use CLI: node dist/index.js --login`
+                                    }
+                                ]
+                            };
+                        }
+                    case "status":
+                        const isAuthenticated = await enhancedMS365Auth.isAuthenticated();
+                        const currentUser = await enhancedMS365Auth.getCurrentUser();
+                        const storageInfo = enhancedMS365Auth.getStorageInfo();
+                        const tokenInfo = await enhancedMS365Auth.getTokenExpirationInfo();
+                        let statusText = `📊 Microsoft 365 Authentication Status\n\n🔐 Authentication: ${isAuthenticated ? '✅ Valid' : '❌ Not authenticated'}\n👤 Current User: ${currentUser || 'None'}\n💾 Storage method: ${storageInfo.method}\n📁 Storage location: ${storageInfo.location}`;
+                        if (isAuthenticated) {
+                            statusText += `\n⏰ Token expires in: ${tokenInfo.expiresInMinutes} minutes`;
+                            if (tokenInfo.needsRefresh) {
+                                statusText += `\n⚠️ Token will be refreshed automatically on next operation`;
+                            }
+                        }
+                        else {
+                            statusText += `\n💡 Use "authenticate" with action: login to sign in`;
+                        }
                         return {
                             content: [
                                 {
                                     type: "text",
-                                    text: `✅ Already authenticated with Microsoft 365! Use force: true to re-authenticate.`
+                                    text: statusText
                                 }
                             ]
                         };
-                    }
-                    // First, try to complete any existing pending authentication
-                    const existingResult = await enhancedMS365Auth.completeDeviceCodeAuth();
-                    if (existingResult) {
-                        const currentUser = await enhancedMS365Auth.getCurrentUser();
+                    case "logout":
+                        const accountKey = args?.accountKey;
+                        const wasAuthenticated = await enhancedMS365Auth.isAuthenticated();
+                        await enhancedMS365Auth.resetAuth();
                         return {
                             content: [
                                 {
                                     type: "text",
-                                    text: `✅ Device code authentication completed successfully!\n\n👤 User: ${currentUser || 'authenticated-user'}\n🔐 Status: Valid\n\n🚀 You can now use all Microsoft 365 email features!`
+                                    text: wasAuthenticated ?
+                                        `✅ Successfully logged out from Microsoft 365.` :
+                                        `ℹ️ No active authentication found.`
                                 }
                             ]
                         };
-                    }
-                    // Check if there's already a pending device code
-                    let deviceCodeInfo = await enhancedMS365Auth.getPendingDeviceCodeInfo();
-                    if (!deviceCodeInfo || args?.force) {
-                        // No pending code or force new one, start fresh
-                        deviceCodeInfo = await enhancedMS365Auth.startDeviceCodeAuth();
-                    }
-                    // Return device code information immediately (MCP pattern)
-                    return {
-                        content: [
-                            {
-                                type: "text",
-                                text: `🔐 Microsoft 365 Device Code Authentication\n\n📱 Visit: ${deviceCodeInfo.verificationUri}\n🔑 Enter this code: ${deviceCodeInfo.userCode}\n\n⏳ After completing authentication in your browser, call this tool again to finish the process.\n\n💡 This code will expire in 15 minutes.`
-                            }
-                        ]
-                    };
+                    case "device_code":
+                        const deviceCodeInfo = await enhancedMS365Auth.getDeviceCodeInfo();
+                        return {
+                            content: [
+                                {
+                                    type: "text",
+                                    text: `🔐 Microsoft 365 Device Code Authentication\n\n📱 Visit: ${deviceCodeInfo.verificationUri}\n🔑 Enter code: ${deviceCodeInfo.userCode}\n\n⏳ This code will expire in 15 minutes.`
+                                }
+                            ]
+                        };
+                    case "check_pending":
+                        const pendingDeviceCodeState = await enhancedMS365Auth.getPendingDeviceCodeInfo();
+                        if (pendingDeviceCodeState) {
+                            return {
+                                content: [
+                                    {
+                                        type: "text",
+                                        text: `⏳ Pending Device Code Authentication\n\n📱 Visit: ${pendingDeviceCodeState.verificationUri}\n🔑 Enter this code: ${pendingDeviceCodeState.userCode}\n\n💡 Use "authenticate" with action: login to finish authentication after entering the code.`
+                                    }
+                                ]
+                            };
+                        }
+                        return {
+                            content: [
+                                {
+                                    type: "text",
+                                    text: "ℹ️ No pending device code authentication found. Use 'authenticate' with action: login to start a new authentication process."
+                                }
+                            ]
+                        };
+                    default:
+                        throw new Error(`Unknown authentication action: ${action}`);
                 }
-                catch (error) {
-                    return {
-                        content: [
-                            {
-                                type: "text",
-                                text: `❌ Authentication failed: ${error.message}\n\n💡 Try again or use CLI: node dist/index.js --login`
-                            }
-                        ]
-                    };
-                }
-            case "get_auth_link":
-                if (!await enhancedMS365Auth.isAuthenticated() || args?.force) {
-                    const authUrl = await enhancedMS365Auth.getAuthUrl();
-                    return {
-                        content: [
-                            {
-                                type: "text",
-                                text: `🔗 Microsoft 365 Authentication Link:\n\n${authUrl}\n\nClick this link to authenticate with Microsoft 365.`
-                            }
-                        ]
-                    };
+            // ============ UNIFIED EMAIL MANAGEMENT TOOL ============
+            case "manage_email":
+                if (ms365Config.multiUser) {
+                    const userId = args?.userId;
+                    if (!userId) {
+                        throw new Error("User ID is required in multi-user mode");
+                    }
+                    const graphClient = await multiUserMS365Auth.getGraphClientForUser(userId);
+                    ms365Ops.setGraphClient(graphClient);
                 }
                 else {
-                    return {
-                        content: [
-                            {
-                                type: "text",
-                                text: "✅ Already authenticated with Microsoft 365. Use force: true to get a new authentication link."
-                            }
-                        ]
-                    };
+                    const graphClient = await enhancedMS365Auth.getGraphClient();
+                    ms365Ops.setGraphClient(graphClient);
                 }
-            case "device_code_login":
-                if (!await enhancedMS365Auth.isAuthenticated() || args?.force) {
-                    const deviceCodeInfo = await enhancedMS365Auth.startDeviceCodeAuth();
-                    return {
-                        content: [
-                            {
-                                type: "text",
-                                text: `🔐 Microsoft 365 Device Code Authentication Started!\n\n📱 Visit: ${deviceCodeInfo.verificationUri}\n🔑 Enter this code: ${deviceCodeInfo.userCode}\n\n⏳ After entering the code, use the "authenticate_with_device_code" tool to complete authentication.\n\n💡 This code will expire in 15 minutes.`
+                const emailAction = args?.action;
+                switch (emailAction) {
+                    case "read":
+                        if (!args?.messageId) {
+                            throw new Error("messageId is required for read action");
+                        }
+                        const email = await ms365Ops.getEmail(args.messageId, args?.includeAttachments);
+                        return {
+                            content: [
+                                {
+                                    type: "text",
+                                    text: `📧 Email Details\n\n📋 Subject: ${email.subject}\n👤 From: ${email.from.name} <${email.from.address}>\n📅 Date: ${email.receivedDateTime}\n📎 Attachments: ${email.attachments?.length || 0}\n\n💬 Body:\n${email.body || email.bodyPreview}`
+                                }
+                            ]
+                        };
+                    case "search":
+                        const searchResults = await ms365Ops.searchEmails(args);
+                        // Enhanced feedback for search results
+                        let responseText = `🔍 Email Search Results (${searchResults.messages.length} found)`;
+                        if (searchResults.messages.length === 0) {
+                            responseText = `🔍 No emails found matching your criteria.\n\n💡 Search Tips:\n`;
+                            if (args?.from) {
+                                responseText += `• Try partial names: "${args.from.split(' ')[0]}" or "${args.from.split(' ').pop()}"\n`;
+                                responseText += `• Check spelling of sender name\n`;
                             }
-                        ]
-                    };
-                }
-                else {
-                    return {
-                        content: [
-                            {
-                                type: "text",
-                                text: "✅ Already authenticated with Microsoft 365. Use force: true to re-authenticate."
+                            if (args?.subject) {
+                                responseText += `• Try broader subject terms\n`;
                             }
-                        ]
-                    };
-                }
-            case "check_pending_auth":
-                const pendingDeviceCodeState = await enhancedMS365Auth.getPendingDeviceCodeInfo();
-                if (pendingDeviceCodeState) {
-                    return {
-                        content: [
-                            {
-                                type: "text",
-                                text: `⏳ Pending Device Code Authentication\n\n📱 Visit: ${pendingDeviceCodeState.verificationUri}\n🔑 Enter this code: ${pendingDeviceCodeState.userCode}\n\n💡 Use 'authenticate_with_device_code' to finish authentication after entering the code.`
+                            if (args?.after || args?.before) {
+                                responseText += `• Try expanding date range\n`;
                             }
-                        ]
-                    };
-                }
-                return {
-                    content: [
-                        {
-                            type: "text",
-                            text: "ℹ️ No pending device code authentication found. Use 'device_code_login' to start a new authentication process."
-                        }
-                    ]
-                };
-            case "get_device_code":
-                const deviceCodeInfo = await enhancedMS365Auth.getDeviceCodeInfo();
-                return {
-                    content: [
-                        {
-                            type: "text",
-                            text: `🔐 Microsoft 365 Device Code Authentication\n\n📱 Visit: ${deviceCodeInfo.verificationUri}\n🔑 Enter code: ${deviceCodeInfo.userCode}\n\n⏳ This code will expire in 15 minutes.`
-                        }
-                    ]
-                };
-            case "verify_authentication":
-                const isAuthenticated = await enhancedMS365Auth.isAuthenticated();
-                const currentUser = await enhancedMS365Auth.getCurrentUser();
-                const storageInfo = enhancedMS365Auth.getStorageInfo();
-                const tokenInfo = await enhancedMS365Auth.getTokenExpirationInfo();
-                let statusText = `📊 Microsoft 365 Authentication Status\n\n🔐 Authentication: ${isAuthenticated ? '✅ Valid' : '❌ Not authenticated'}\n👤 Current User: ${currentUser || 'None'}\n💾 Storage method: ${storageInfo.method}\n📁 Storage location: ${storageInfo.location}`;
-                if (isAuthenticated) {
-                    statusText += `\n⏰ Token expires in: ${tokenInfo.expiresInMinutes} minutes`;
-                    if (tokenInfo.needsRefresh) {
-                        statusText += `\n⚠️ Token will be refreshed automatically on next operation`;
-                    }
-                }
-                else {
-                    statusText += `\n💡 Use the "authenticate_with_device_code" tool to sign in`;
-                }
-                return {
-                    content: [
-                        {
-                            type: "text",
-                            text: statusText
-                        }
-                    ]
-                };
-            case "logout":
-                const accountKey = args?.accountKey;
-                const wasAuthenticated = await enhancedMS365Auth.isAuthenticated();
-                await enhancedMS365Auth.resetAuth();
-                return {
-                    content: [
-                        {
-                            type: "text",
-                            text: wasAuthenticated ?
-                                `✅ Successfully logged out from Microsoft 365.` :
-                                `ℹ️ No active authentication found.`
+                            responseText += `• Remove some search criteria to get broader results`;
                         }
-                    ]
-                };
-            // ============ MULTI-USER AUTHENTICATION TOOLS ============
-            case "authenticate_user":
-                if (!ms365Config.multiUser) {
-                    throw new Error("Multi-user mode not enabled. Start server with --multi-user flag.");
-                }
-                const authResult = await multiUserMS365Auth.authenticateNewUser(args?.userEmail || undefined);
-                return {
-                    content: [
-                        {
-                            type: "text",
-                            text: `🔗 Authentication started for user: ${authResult.userId}\n\n📱 Visit this URL to authenticate:\n${authResult.authUrl}\n\n⚠️ Server running on port ${authResult.port}`
-                        }
-                    ]
-                };
-            case "remove_my_session":
-                if (!ms365Config.multiUser) {
-                    throw new Error("Multi-user mode not enabled. Start server with --multi-user flag.");
-                }
-                if (!args?.userId) {
-                    throw new Error("User ID is required");
-                }
-                const removed = multiUserMS365Auth.removeUser(args.userId);
-                return {
-                    content: [
-                        {
-                            type: "text",
-                            text: removed ? `✅ Session removed for user: ${args.userId}` : `❌ Session not found for user: ${args.userId}`
+                        else {
+                            responseText += `\n\n${searchResults.messages.map((email, index) => `${index + 1}. 📧 ${email.subject}\n   👤 From: ${email.from.name} <${email.from.address}>\n   📅 ${new Date(email.receivedDateTime).toLocaleDateString()}\n   ${email.isRead ? '📖 Read' : '📩 Unread'}\n   🆔 ID: ${email.id}\n`).join('\n')}`;
+                            if (searchResults.hasMore) {
+                                responseText += `\n💡 There are more results available. Use maxResults parameter to get more emails.`;
+                            }
                         }
-                    ]
-                };
-            // ============ EMAIL OPERATIONS ============
-            case "send_email":
-                if (ms365Config.multiUser) {
-                    const userId = args?.userId;
-                    if (!userId) {
-                        throw new Error("User ID is required in multi-user mode");
-                    }
-                    const graphClient = await multiUserMS365Auth.getGraphClientForUser(userId);
-                    ms365Ops.setGraphClient(graphClient);
-                }
-                else {
-                    const graphClient = await enhancedMS365Auth.getGraphClient();
-                    ms365Ops.setGraphClient(graphClient);
-                }
-                const emailResult = await ms365Ops.sendEmail(args);
-                return {
-                    content: [
-                        {
-                            type: "text",
-                            text: `✅ Email sent successfully!\n\n📧 To: ${Array.isArray(args?.to) ? args.to.join(', ') : args?.to}\n📋 Subject: ${args?.subject}\n🆔 Message ID: ${emailResult.id}`
+                        return {
+                            content: [
+                                {
+                                    type: "text",
+                                    text: responseText
+                                }
+                            ]
+                        };
+                    case "search_to_me":
+                        const searchToMeResults = await ms365Ops.searchEmailsToMe(args);
+                        return {
+                            content: [
+                                {
+                                    type: "text",
+                                    text: `🔍 Emails Addressed to You (TO & CC) - ${searchToMeResults.messages.length} found\n\n${searchToMeResults.messages.map((email, index) => `${index + 1}. 📧 ${email.subject}\n   👤 From: ${email.from.name} <${email.from.address}>\n   📅 ${new Date(email.receivedDateTime).toLocaleDateString()}\n   🆔 ID: ${email.id}\n`).join('\n')}`
+                                }
+                            ]
+                        };
+                    case "list":
+                        const emailList = await ms365Ops.listEmails(args?.folderId, args?.maxResults);
+                        return {
+                            content: [
+                                {
+                                    type: "text",
+                                    text: `📬 Email List (${emailList.messages.length} emails)\n\n${emailList.messages.map((email, index) => `${index + 1}. 📧 ${email.subject}\n   👤 From: ${email.from.name} <${email.from.address}>\n   📅 ${new Date(email.receivedDateTime).toLocaleDateString()}\n   ${email.isRead ? '📖' : '📩'} ${email.isRead ? 'Read' : 'Unread'}\n   🆔 ID: ${email.id}\n`).join('\n')}`
+                                }
+                            ]
+                        };
+                    case "mark":
+                        if (!args?.messageId || args?.isRead === undefined) {
+                            throw new Error("messageId and isRead are required for mark action");
                         }
-                    ]
-                };
-            case "read_email":
-                if (ms365Config.multiUser) {
-                    const userId = args?.userId;
-                    if (!userId) {
-                        throw new Error("User ID is required in multi-user mode");
-                    }
-                    const graphClient = await multiUserMS365Auth.getGraphClientForUser(userId);
-                    ms365Ops.setGraphClient(graphClient);
-                }
-                else {
-                    const graphClient = await enhancedMS365Auth.getGraphClient();
-                    ms365Ops.setGraphClient(graphClient);
-                }
-                const email = await ms365Ops.getEmail(args?.messageId, args?.includeAttachments);
-                return {
-                    content: [
-                        {
-                            type: "text",
-                            text: `📧 Email Details\n\n📋 Subject: ${email.subject}\n👤 From: ${email.from.name} <${email.from.address}>\n📅 Date: ${email.receivedDateTime}\n📎 Attachments: ${email.attachments?.length || 0}\n\n💬 Body:\n${email.body || email.bodyPreview}`
+                        await ms365Ops.markEmail(args.messageId, args.isRead);
+                        return {
+                            content: [
+                                {
+                                    type: "text",
+                                    text: `✅ Email marked as ${args.isRead ? 'read' : 'unread'}\n🆔 Message ID: ${args.messageId}`
+                                }
+                            ]
+                        };
+                    case "move":
+                        if (!args?.messageId || !args?.destinationFolderId) {
+                            throw new Error("messageId and destinationFolderId are required for move action");
                         }
-                    ]
-                };
-            case "search_emails":
-                if (ms365Config.multiUser) {
-                    const userId = args?.userId;
-                    if (!userId) {
-                        throw new Error("User ID is required in multi-user mode");
-                    }
-                    const graphClient = await multiUserMS365Auth.getGraphClientForUser(userId);
-                    ms365Ops.setGraphClient(graphClient);
-                }
-                else {
-                    const graphClient = await enhancedMS365Auth.getGraphClient();
-                    ms365Ops.setGraphClient(graphClient);
-                }
-                const searchResults = await ms365Ops.searchEmails(args);
-                // Enhanced feedback for search results
-                let responseText = `🔍 Email Search Results (${searchResults.messages.length} found)`;
-                if (searchResults.messages.length === 0) {
-                    responseText = `🔍 No emails found matching your criteria.\n\n💡 Search Tips:\n`;
-                    if (args?.from) {
-                        responseText += `• Try partial names: "${args.from.split(' ')[0]}" or "${args.from.split(' ').pop()}"\n`;
-                        responseText += `• Check spelling of sender name\n`;
-                    }
-                    if (args?.subject) {
-                        responseText += `• Try broader subject terms\n`;
-                    }
-                    if (args?.after || args?.before) {
-                        responseText += `• Try expanding date range\n`;
-                    }
-                    responseText += `• Remove some search criteria to get broader results`;
-                }
-                else {
-                    responseText += `\n\n${searchResults.messages.map((email, index) => `${index + 1}. 📧 ${email.subject}\n   👤 From: ${email.from.name} <${email.from.address}>\n   📅 ${new Date(email.receivedDateTime).toLocaleDateString()}\n   ${email.isRead ? '📖 Read' : '📩 Unread'}\n   🆔 ID: ${email.id}\n`).join('\n')}`;
-                    if (searchResults.hasMore) {
-                        responseText += `\n💡 There are more results available. Use maxResults parameter to get more emails.`;
-                    }
-                }
-                return {
-                    content: [
-                        {
-                            type: "text",
-                            text: responseText
+                        await ms365Ops.moveEmail(args.messageId, args.destinationFolderId);
+                        return {
+                            content: [
+                                {
+                                    type: "text",
+                                    text: `✅ Email moved to folder: ${args.destinationFolderId}\n🆔 Message ID: ${args.messageId}`
+                                }
+                            ]
+                        };
+                    case "delete":
+                        if (!args?.messageId) {
+                            throw new Error("messageId is required for delete action");
                         }
-                    ]
-                };
-            case "search_emails_to_me":
-                if (ms365Config.multiUser) {
-                    const userId = args?.userId;
-                    if (!userId) {
-                        throw new Error("User ID is required in multi-user mode");
-                    }
-                    const graphClient = await multiUserMS365Auth.getGraphClientForUser(userId);
-                    ms365Ops.setGraphClient(graphClient);
-                }
-                else {
-                    const graphClient = await enhancedMS365Auth.getGraphClient();
-                    ms365Ops.setGraphClient(graphClient);
+                        await ms365Ops.deleteEmail(args.messageId);
+                        return {
+                            content: [
+                                {
+                                    type: "text",
+                                    text: `✅ Email deleted permanently\n🆔 Message ID: ${args.messageId}`
+                                }
+                            ]
+                        };
+                    default:
+                        throw new Error(`Unknown email action: ${emailAction}`);
                 }
-                const searchToMeResults = await ms365Ops.searchEmailsToMe(args);
-                return {
-                    content: [
-                        {
-                            type: "text",
-                            text: `🔍 Emails Addressed to You (TO & CC) - ${searchToMeResults.messages.length} found\n\n${searchToMeResults.messages.map((email, index) => `${index + 1}. 📧 ${email.subject}\n   👤 From: ${email.from.name} <${email.from.address}>\n   📅 ${new Date(email.receivedDateTime).toLocaleDateString()}\n   🆔 ID: ${email.id}\n`).join('\n')}`
-                        }
-                    ]
-                };
-            case "mark_email":
+            // ============ UNIFIED CONTACT MANAGEMENT TOOL ============
+            case "manage_contacts":
                 if (ms365Config.multiUser) {
                     const userId = args?.userId;
                     if (!userId) {
@@ -957,38 +670,36 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                     const graphClient = await enhancedMS365Auth.getGraphClient();
                     ms365Ops.setGraphClient(graphClient);
                 }
-                await ms365Ops.markEmail(args?.messageId, args?.isRead);
-                return {
-                    content: [
-                        {
-                            type: "text",
-                            text: `✅ Email marked as ${args?.isRead ? 'read' : 'unread'}\n🆔 Message ID: ${args?.messageId}`
+                const contactAction = args?.action || 'list';
+                switch (contactAction) {
+                    case "list":
+                        const contacts = await ms365Ops.getContacts(args?.maxResults || 100);
+                        return {
+                            content: [
+                                {
+                                    type: "text",
+                                    text: `👥 Contacts (${contacts.length} found)\n\n${contacts.map((contact) => `👤 ${contact.displayName}\n   📧 ${contact.emailAddresses?.[0]?.address || 'No email'}\n   📞 ${contact.businessPhones?.[0] || 'No phone'}\n`).join('\n')}`
+                                }
+                            ]
+                        };
+                    case "search":
+                        if (!args?.query) {
+                            throw new Error("query is required for search action");
                         }
-                    ]
-                };
-            case "move_email":
-                if (ms365Config.multiUser) {
-                    const userId = args?.userId;
-                    if (!userId) {
-                        throw new Error("User ID is required in multi-user mode");
-                    }
-                    const graphClient = await multiUserMS365Auth.getGraphClientForUser(userId);
-                    ms365Ops.setGraphClient(graphClient);
-                }
-                else {
-                    const graphClient = await enhancedMS365Auth.getGraphClient();
-                    ms365Ops.setGraphClient(graphClient);
+                        const searchContactResults = await ms365Ops.searchContacts(args.query, args?.maxResults || 50);
+                        return {
+                            content: [
+                                {
+                                    type: "text",
+                                    text: `🔍 Contact Search Results (${searchContactResults.length} found)\n\n${searchContactResults.map((contact) => `👤 ${contact.displayName}\n   📧 ${contact.emailAddresses?.[0]?.address || 'No email'}\n   📞 ${contact.businessPhones?.[0] || 'No phone'}\n`).join('\n')}`
+                                }
+                            ]
+                        };
+                    default:
+                        throw new Error(`Unknown contact action: ${contactAction}`);
                 }
-                await ms365Ops.moveEmail(args?.messageId, args?.destinationFolderId);
-                return {
-                    content: [
-                        {
-                            type: "text",
-                            text: `✅ Email moved to folder: ${args?.destinationFolderId}\n🆔 Message ID: ${args?.messageId}`
-                        }
-                    ]
-                };
-            case "delete_email":
+            // ============ REMAINING ORIGINAL TOOLS ============
+            case "send_email":
                 if (ms365Config.multiUser) {
                     const userId = args?.userId;
                     if (!userId) {
@@ -1001,12 +712,12 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                     const graphClient = await enhancedMS365Auth.getGraphClient();
                     ms365Ops.setGraphClient(graphClient);
                 }
-                await ms365Ops.deleteEmail(args?.messageId);
+                const emailResult = await ms365Ops.sendEmail(args);
                 return {
                     content: [
                         {
                             type: "text",
-                            text: `✅ Email deleted permanently\n🆔 Message ID: ${args?.messageId}`
+                            text: `✅ Email sent successfully!\n\n📧 To: ${Array.isArray(args?.to) ? args.to.join(', ') : args?.to}\n📋 Subject: ${args?.subject}\n🆔 Message ID: ${emailResult.id}`
                         }
                     ]
                 };
@@ -1054,69 +765,33 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                         }
                     ]
                 };
-            case "get_contacts":
-                if (ms365Config.multiUser) {
-                    const userId = args?.userId;
-                    if (!userId) {
-                        throw new Error("User ID is required in multi-user mode");
-                    }
-                    const graphClient = await multiUserMS365Auth.getGraphClientForUser(userId);
-                    ms365Ops.setGraphClient(graphClient);
-                }
-                else {
-                    const graphClient = await enhancedMS365Auth.getGraphClient();
-                    ms365Ops.setGraphClient(graphClient);
-                }
-                const contacts = await ms365Ops.getContacts(args?.maxResults);
-                return {
-                    content: [
-                        {
-                            type: "text",
-                            text: `👥 Contacts (${contacts.length} found)\n\n${contacts.map((contact) => `👤 ${contact.displayName}\n   📧 ${contact.emailAddresses?.[0]?.address || 'No email'}\n   📞 ${contact.businessPhones?.[0] || 'No phone'}\n`).join('\n')}`
-                        }
-                    ]
-                };
-            case "search_contacts":
-                if (ms365Config.multiUser) {
-                    const userId = args?.userId;
-                    if (!userId) {
-                        throw new Error("User ID is required in multi-user mode");
-                    }
-                    const graphClient = await multiUserMS365Auth.getGraphClientForUser(userId);
-                    ms365Ops.setGraphClient(graphClient);
-                }
-                else {
-                    const graphClient = await enhancedMS365Auth.getGraphClient();
-                    ms365Ops.setGraphClient(graphClient);
+            // ============ MULTI-USER AUTHENTICATION TOOLS ============
+            case "authenticate_user":
+                if (!ms365Config.multiUser) {
+                    throw new Error("Multi-user mode not enabled. Start server with --multi-user flag.");
                 }
-                const searchContactResults = await ms365Ops.searchContacts(args?.query, args?.maxResults);
+                const authResult = await multiUserMS365Auth.authenticateNewUser(args?.userEmail || undefined);
                 return {
                     content: [
                         {
                             type: "text",
-                            text: `🔍 Contact Search Results (${searchContactResults.length} found)\n\n${searchContactResults.map((contact) => `👤 ${contact.displayName}\n   📧 ${contact.emailAddresses?.[0]?.address || 'No email'}\n   📞 ${contact.businessPhones?.[0] || 'No phone'}\n`).join('\n')}`
+                            text: `🔗 Authentication started for user: ${authResult.userId}\n\n📱 Visit this URL to authenticate:\n${authResult.authUrl}\n\n⚠️ Server running on port ${authResult.port}`
                         }
                     ]
                 };
-            case "list_emails":
-                if (ms365Config.multiUser) {
-                    const userId = args?.userId;
-                    if (!userId) {
-                        throw new Error("User ID is required in multi-user mode");
-                    }
-                    const graphClient = await multiUserMS365Auth.getGraphClientForUser(userId);
-                    ms365Ops.setGraphClient(graphClient);
+            case "remove_my_session":
+                if (!ms365Config.multiUser) {
+                    throw new Error("Multi-user mode not enabled. Start server with --multi-user flag.");
                 }
-                else {
-                    const graphClient = await enhancedMS365Auth.getGraphClient();
-                    ms365Ops.setGraphClient(graphClient);
+                if (!args?.userId) {
+                    throw new Error("User ID is required");
                 }
-                const emailList = await ms365Ops.listEmails(args?.folderId, args?.maxResults);
+                const removed = multiUserMS365Auth.removeUser(args.userId);
                 return {
                     content: [
                         {
                             type: "text",
-                            text: `📬 Email List (${emailList.messages.length} emails)\n\n${emailList.messages.map((email, index) => `${index + 1}. 📧 ${email.subject}\n   👤 From: ${email.from.name} <${email.from.address}>\n   📅 ${new Date(email.receivedDateTime).toLocaleDateString()}\n   ${email.isRead ? '📖' : '📩'} ${email.isRead ? 'Read' : 'Unread'}\n   🆔 ID: ${email.id}\n`).join('\n')}`
+                            text: removed ? `✅ Session removed for user: ${args.userId}` : `❌ Session not found for user: ${args.userId}`
                         }
                     ]
                 };