ms365-mcp-server 1.0.0 → 1.0.2

package/dist/index.js

@@ -55,7 +55,7 @@ function parseArgs() {
 }
 const server = new Server({
     name: "ms365-mcp-server",
-    version: "1.0.0"
+    version: "1.0.2"
 }, {
     capabilities: {
         resources: {
@@ -261,6 +261,64 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
                 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"
+                    },
+                    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: "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.",
@@ -453,21 +511,6 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
                 additionalProperties: false
             }
         },
-        {
-            name: "get_my_session_info",
-            description: "Get information about your own authentication session (user-specific, secure).",
-            inputSchema: {
-                type: "object",
-                properties: {
-                    userId: {
-                        type: "string",
-                        description: "Your User ID to get information for"
-                    }
-                },
-                required: ["userId"],
-                additionalProperties: false
-            }
-        },
         {
             name: "remove_my_session",
             description: "Remove your own authentication session (user-specific, secure).",
@@ -487,47 +530,38 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
     // Add one-time authentication tool for single-user mode
     const oneTimeAuthTools = [
         {
-            name: "quick_authenticate",
-            description: "One-time Microsoft 365 authentication for immediate access. Opens browser automatically and completes authentication flow.",
+            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 re-authentication even if already authenticated (default: false)",
+                        description: "Force new authentication link even if already authenticated (default: false)",
                         default: false
                     }
                 },
                 additionalProperties: false
             }
-        },
+        }
+    ];
+    // Enhanced authentication tools with device code flow
+    const enhancedAuthTools = [
         {
-            name: "get_auth_link",
-            description: "Get a clickable Microsoft 365 authentication link without auto-opening browser. Perfect for manual authentication control.",
+            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 link even if already authenticated (default: false)",
+                        description: "Force new authentication even if already authenticated (default: false)",
                         default: false
                     }
                 },
                 additionalProperties: false
             }
         },
-        {
-            name: "check_quick_auth_status",
-            description: "Check if quick authentication has completed successfully. Use this after using quick_authenticate to see if you're now authenticated.",
-            inputSchema: {
-                type: "object",
-                properties: {},
-                additionalProperties: false
-            }
-        }
-    ];
-    // Enhanced authentication tools with device code flow
-    const enhancedAuthTools = [
         {
             name: "device_code_login",
             description: "Start device code authentication flow and get the URL/code to enter. Shows authentication details immediately in the UI.",
@@ -543,15 +577,6 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
                 additionalProperties: false
             }
         },
-        {
-            name: "complete_device_code_auth",
-            description: "Check if device code authentication has completed after visiting the URL and entering the code. This is a quick status check - authentication happens automatically in the background.",
-            inputSchema: {
-                type: "object",
-                properties: {},
-                additionalProperties: false
-            }
-        },
         {
             name: "check_pending_auth",
             description: "Check if there's a pending device code authentication and get the URL/code again if needed.",
@@ -579,24 +604,6 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
                 additionalProperties: false
             }
         },
-        {
-            name: "list_authenticated_accounts",
-            description: "List all authenticated Microsoft 365 accounts stored securely. Shows which accounts are available for use.",
-            inputSchema: {
-                type: "object",
-                properties: {},
-                additionalProperties: false
-            }
-        },
-        {
-            name: "get_storage_info",
-            description: "Get information about how credentials are stored (OS Keychain vs encrypted file). Useful for security auditing.",
-            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.",
@@ -633,26 +640,54 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
     try {
         switch (name) {
             // ============ ENHANCED AUTHENTICATION TOOLS ============
-            case "quick_authenticate":
-                if (!await enhancedMS365Auth.isAuthenticated() || args?.force) {
-                    // Use the enhanced device code flow for better UI experience
-                    const deviceCodeInfo = await enhancedMS365Auth.startDeviceCodeAuth();
-                    // Return device code info immediately, user will need to complete manually
+            case "authenticate_with_device_code":
+                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 Authentication Required!\n\n📱 Please visit: ${deviceCodeInfo.verificationUri}\n🔑 Enter this code: ${deviceCodeInfo.userCode}\n\n⏳ Authentication is in progress. The system will automatically complete once you enter the code.\n\n💡 This code expires in 15 minutes.`
+                                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.`
                             }
                         ]
                     };
                 }
-                else {
+                catch (error) {
                     return {
                         content: [
                             {
                                 type: "text",
-                                text: "✅ Already authenticated with Microsoft 365. Use force: true to re-authenticate."
+                                text: `❌ Authentication failed: ${error.message}\n\n💡 Try again or use CLI: node dist/index.js --login`
                             }
                         ]
                     };
@@ -679,40 +714,6 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                         ]
                     };
                 }
-            case "check_quick_auth_status":
-                const isCurrentlyAuthenticated = await enhancedMS365Auth.isAuthenticated();
-                const hasPending = enhancedMS365Auth.hasPendingAuth();
-                if (isCurrentlyAuthenticated) {
-                    return {
-                        content: [
-                            {
-                                type: "text",
-                                text: "✅ Quick authentication completed successfully! You can now use all Microsoft 365 email features."
-                            }
-                        ]
-                    };
-                }
-                else if (hasPending) {
-                    const pendingInfo = enhancedMS365Auth.getPendingDeviceCodeInfo();
-                    return {
-                        content: [
-                            {
-                                type: "text",
-                                text: `⏳ Authentication still pending.\n\n📱 Please visit: ${pendingInfo?.verificationUri}\n🔑 Enter code: ${pendingInfo?.userCode}\n\n💡 Check again after entering the code in your browser. Authentication completes automatically - no need to wait or use additional tools.`
-                            }
-                        ]
-                    };
-                }
-                else {
-                    return {
-                        content: [
-                            {
-                                type: "text",
-                                text: "❌ No authentication found. Please use quick_authenticate to start the authentication process."
-                            }
-                        ]
-                    };
-                }
             case "device_code_login":
                 if (!await enhancedMS365Auth.isAuthenticated() || args?.force) {
                     const deviceCodeInfo = await enhancedMS365Auth.startDeviceCodeAuth();
@@ -720,7 +721,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                         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 "complete_device_code_auth" tool to finish authentication.\n\n💡 This code will expire in 15 minutes.`
+                                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.`
                             }
                         ]
                     };
@@ -735,53 +736,18 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                         ]
                     };
                 }
-            case "complete_device_code_auth":
-                if (!enhancedMS365Auth.hasPendingAuth()) {
-                    return {
-                        content: [
-                            {
-                                type: "text",
-                                text: "❌ No pending device code authentication found. Use 'device_code_login' first to start the authentication process."
-                            }
-                        ]
-                    };
-                }
-                // Check if authentication has already completed (non-blocking)
-                const isNowAuthenticated = await enhancedMS365Auth.isAuthenticated();
-                if (isNowAuthenticated) {
+            case "check_pending_auth":
+                const pendingDeviceCodeState = await enhancedMS365Auth.getPendingDeviceCodeInfo();
+                if (pendingDeviceCodeState) {
                     return {
                         content: [
                             {
                                 type: "text",
-                                text: "✅ Device code authentication completed successfully! You can now use all Microsoft 365 email features."
+                                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 still pending, return status with instructions
-                const pendingInfo = enhancedMS365Auth.getPendingDeviceCodeInfo();
-                return {
-                    content: [
-                        {
-                            type: "text",
-                            text: `⏳ Device code authentication still in progress.\n\n📱 Please visit: ${pendingInfo?.verificationUri}\n🔑 Enter code: ${pendingInfo?.userCode}\n\n💡 Try this tool again after completing the authentication in your browser.\n\nNote: Authentication completes automatically once you enter the code - no need to wait.`
-                        }
-                    ]
-                };
-            case "check_pending_auth":
-                if (enhancedMS365Auth.hasPendingAuth()) {
-                    const pendingInfo = enhancedMS365Auth.getPendingDeviceCodeInfo();
-                    if (pendingInfo) {
-                        return {
-                            content: [
-                                {
-                                    type: "text",
-                                    text: `⏳ Pending Device Code Authentication\n\n📱 Visit: ${pendingInfo.verificationUri}\n🔑 Enter this code: ${pendingInfo.userCode}\n\n💡 Use 'complete_device_code_auth' to finish authentication after entering the code.`
-                                }
-                            ]
-                        };
-                    }
-                }
                 return {
                     content: [
                         {
@@ -802,64 +768,30 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                 };
             case "verify_authentication":
                 const isAuthenticated = await enhancedMS365Auth.isAuthenticated();
-                const accounts = await enhancedMS365Auth.listAuthenticatedAccounts();
+                const currentUser = await enhancedMS365Auth.getCurrentUser();
                 const storageInfo = enhancedMS365Auth.getStorageInfo();
                 return {
                     content: [
                         {
                             type: "text",
-                            text: `📊 Microsoft 365 Authentication Status\n\n🔐 Authentication: ${isAuthenticated ? '✅ Valid' : '❌ Not authenticated'}\n💾 Storage method: ${storageInfo.method}\n📁 Storage location: ${storageInfo.location}\n👥 Authenticated accounts: ${accounts.length > 0 ? accounts.join(', ') : 'None'}`
+                            text: `📊 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}`
                         }
                     ]
                 };
-            case "list_authenticated_accounts":
-                const authenticatedAccounts = await enhancedMS365Auth.listAuthenticatedAccounts();
-                return {
-                    content: [
-                        {
-                            type: "text",
-                            text: `👥 Authenticated Microsoft 365 Accounts:\n\n${authenticatedAccounts.length > 0 ? authenticatedAccounts.map(account => `• ${account}`).join('\n') : 'No authenticated accounts found'}`
-                        }
-                    ]
-                };
-            case "get_storage_info":
-                const storage = enhancedMS365Auth.getStorageInfo();
+            case "logout":
+                const accountKey = args?.accountKey;
+                const wasAuthenticated = await enhancedMS365Auth.isAuthenticated();
+                await enhancedMS365Auth.resetAuth();
                 return {
                     content: [
                         {
                             type: "text",
-                            text: `🔒 Credential Storage Information\n\n💾 Method: ${storage.method}\n📁 Location: ${storage.location}\n🔐 Keychain Available: ${storage.method === 'OS Keychain' ? 'Yes' : 'No'}`
+                            text: wasAuthenticated ?
+                                `✅ Successfully logged out from Microsoft 365.` :
+                                `ℹ️ No active authentication found.`
                         }
                     ]
                 };
-            case "logout":
-                const accountKey = args?.accountKey;
-                // Get list of authenticated accounts before logout for better feedback
-                const authenticatedAccountsBefore = await enhancedMS365Auth.listAuthenticatedAccounts();
-                await enhancedMS365Auth.resetAuth(accountKey);
-                // Check what was actually logged out
-                const authenticatedAccountsAfter = await enhancedMS365Auth.listAuthenticatedAccounts();
-                const loggedOutAccounts = authenticatedAccountsBefore.filter(account => !authenticatedAccountsAfter.includes(account));
-                if (accountKey) {
-                    return {
-                        content: [
-                            {
-                                type: "text",
-                                text: `✅ Successfully logged out from Microsoft 365. Account: ${accountKey}`
-                            }
-                        ]
-                    };
-                }
-                else {
-                    return {
-                        content: [
-                            {
-                                type: "text",
-                                text: `✅ Successfully logged out from Microsoft 365.\n${loggedOutAccounts.length > 0 ? `Logged out accounts: ${loggedOutAccounts.join(', ')}` : 'No accounts found to logout'}`
-                            }
-                        ]
-                    };
-                }
             // ============ MULTI-USER AUTHENTICATION TOOLS ============
             case "authenticate_user":
                 if (!ms365Config.multiUser) {
@@ -874,25 +806,6 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                         }
                     ]
                 };
-            case "get_my_session_info":
-                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 session = multiUserMS365Auth.getUserSession(args.userId);
-                if (!session) {
-                    throw new Error(`User session not found: ${args.userId}`);
-                }
-                return {
-                    content: [
-                        {
-                            type: "text",
-                            text: `👤 Session Information\n\n🆔 User ID: ${session.userId}\n📧 Email: ${session.userEmail || 'Unknown'}\n🔐 Authenticated: ${session.authenticated ? 'Yes' : 'No'}\n⏰ Expires: ${new Date(session.expiresOn).toLocaleString()}`
-                        }
-                    ]
-                };
             case "remove_my_session":
                 if (!ms365Config.multiUser) {
                     throw new Error("Multi-user mode not enabled. Start server with --multi-user flag.");
@@ -976,6 +889,28 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                         }
                     ]
                 };
+            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);
+                }
+                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_emails":
                 if (ms365Config.multiUser) {
                     const userId = args?.userId;
@@ -1218,13 +1153,13 @@ async function main() {
     if (ms365Config.verifyLogin) {
         try {
             const isAuthenticated = await enhancedMS365Auth.isAuthenticated();
-            const accounts = await enhancedMS365Auth.listAuthenticatedAccounts();
+            const currentUser = await enhancedMS365Auth.getCurrentUser();
             const storageInfo = enhancedMS365Auth.getStorageInfo();
             console.log('\n📊 MS365 Authentication Status\n');
             console.log(`Authentication: ${isAuthenticated ? '✅ Valid' : '❌ Not authenticated'}`);
+            console.log(`Current User: ${currentUser || 'None'}`);
             console.log(`Storage method: ${storageInfo.method}`);
-            console.log(`Storage location: ${storageInfo.location}`);
-            console.log(`Authenticated accounts: ${accounts.length > 0 ? accounts.join(', ') : 'None'}\n`);
+            console.log(`Storage location: ${storageInfo.location}\n`);
             process.exit(isAuthenticated ? 0 : 1);
         }
         catch (error) {