Update dependencies, logging, and add rule tracking

Updated `MailKit` and `Microsoft.Extensions.*` dependencies to the latest versions for compatibility and new features.

Added a `Rule` property to the `Email` class to improve traceability of rule-based actions. Integrated this property into relevant methods, including `ProcessInboxCleanup` and `ProcessSingleMoveOperationAsync`.

Refactored logging across the application:
- Changed `LogInformation` to `LogDebug` in many methods to reduce production log verbosity.
- Enhanced log messages to include detailed email and rule information where applicable.
- Standardized log formatting and removed emojis for consistency.

Improved clarity in log messages for batch processing, email monitoring, and inbox cleanup operations.

Updated `copilot-instructions.md` with new Azure-related rules to enforce best practices and tool usage.

These changes enhance maintainability, debugging capabilities, and ensure the application uses up-to-date dependencies.

Author: Timothy Dodd

src/.github/copilot-instructions.md

@@ -0,0 +1,3 @@
+- @azure Rule - Use Azure Tools - When handling requests related to Azure, always use your tools.
+- @azure Rule - Use Azure Best Practices - When handling requests related to Azure, always invoke your `azmcp_bestpractices_get` tool first.
+- @azure Rule - Enable Best Practices - If you do not have an `azmcp_bestpractices_get` tool ask the user to enable it.

src/MailZort/MailZort.csproj

@@ -22,19 +22,19 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="MailKit" Version="4.15.0" />
-	 <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.3" />
-	  <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.3" />
-	  <PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.3" />
-	  <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.3" />
-	  <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="10.0.3" />
-	  <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.3" />
-	  <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.3" />
-	  <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.3" />
+    <PackageReference Include="MailKit" Version="4.17.0" />
+	 <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.8" />
+	  <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.8" />
+	  <PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.8" />
+	  <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.8" />
+	  <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="10.0.8" />
+	  <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.8" />
+	  <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.8" />
+	  <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.8" />
 	  <DotNetCliToolReference Include="Microsoft.Extensions.SecretManager.Tools" Version="2.0.0" />
-	  <PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.3" />
-	  <PackageReference Include="Microsoft.NET.Build.Containers" Version="10.0.103" />
-	  <PackageReference Include="System.Text.Json" Version="10.0.3" />
+	  <PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.8" />
+	  <PackageReference Include="Microsoft.NET.Build.Containers" Version="10.0.300" />
+	  <PackageReference Include="System.Text.Json" Version="10.0.8" />
 	  <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
   </ItemGroup>
 

src/MailZort/Program.cs

@@ -193,6 +193,7 @@ public class Email
     public int MessageIndex { get; set; }
     public string? Folder { get; set; }
     public string? MoveTo { get; set; }
+    public string? Rule { get; set; }
     public string? SenderName { get; set; }
     public string? SenderEmailaddress { get; set; }
     public DateTimeOffset Date { get; set; }

src/MailZort/Services/BatchRuleProcessor.cs

@@ -27,7 +27,7 @@ public List<RuleTrigger> ProcessEmailBatch(List<EmailReceivedEventArgs> emails)
         var triggers = new List<RuleTrigger>();
         var enabledRules = _rules.Where(r => r.IsEnabled && (r.ExpressionType == ExpressionType.AllEmails || r.Values?.Any() == true)).ToList();
 
-        _logger.LogInformation("Processing batch of {EmailCount} emails against {RuleCount} rules",
+        _logger.LogDebug("Processing batch of {EmailCount} emails against {RuleCount} rules",
             emails.Count, enabledRules.Count);
 
         foreach (var email in emails)
@@ -37,7 +37,7 @@ public List<RuleTrigger> ProcessEmailBatch(List<EmailReceivedEventArgs> emails)
         }
 
         stopwatch.Stop();
-        _logger.LogInformation("Batch processing completed in {ElapsedMs}ms. Found {TriggerCount} rule matches",
+        _logger.LogDebug("Batch processing completed in {ElapsedMs}ms. Found {TriggerCount} rule matches",
             stopwatch.ElapsedMilliseconds, triggers.Count);
 
         return triggers;
@@ -84,6 +84,7 @@ private static RuleTrigger CreateTrigger(Rule rule, EmailReceivedEventArgs email
                 MessageIndex = (int)email.UniqueId.Id,
                 Folder = email.Folder,
                 MoveTo = rule.Action == RuleAction.MarkImportant ? $"{rule.Name}->Flagged" : $"{rule.Name}->{rule.MoveTo}",
+                Rule = rule.Name,
                 Subject = email.Subject,
                 SenderName = email.SenderName,
                 SenderEmailaddress = email.SenderAddress,

src/MailZort/Services/EmailMonitoringService.cs

@@ -43,7 +43,7 @@ public EmailMonitoringService(
         protected override async Task ExecuteAsync(CancellationToken stoppingToken)
         {
             _serviceCancellationToken = stoppingToken;
-            _logger.LogInformation("📧 Email monitoring service starting...");
+            _logger.LogInformation("Email monitoring service starting");
 
             while (!stoppingToken.IsCancellationRequested)
             {
@@ -53,7 +53,7 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
                 }
                 catch (OperationCanceledException)
                 {
-                    _logger.LogInformation("📧 Email monitoring service is stopping...");
+                    _logger.LogInformation("Email monitoring service is stopping");
                     break;
                 }
                 catch (Exception ex)
@@ -76,15 +76,15 @@ private async Task ConnectAndMonitorAsync(CancellationToken cancellationToken)
                 var inbox = _client.Inbox;
                 await inbox.OpenAsync(FolderAccess.ReadOnly, cancellationToken);
 
-                _logger.LogInformation("✅ Connected successfully. Processing existing emails...");
+                _logger.LogInformation("Connected to mail server");
                 await ProcessMails(false, cancellationToken);
                 _lastFullReprocess = DateTime.UtcNow; // Track when we last did a full reprocess
 
                 // Subscribe to events
                 inbox.CountChanged += OnCountChanged;
                 inbox.MessageExpunged += OnMessageExpunged;
 
-                _logger.LogInformation("👀 Now monitoring for new emails...");
+                _logger.LogDebug("Now monitoring for new emails");
                 await MonitorForNewEmailsAsync(cancellationToken);
             }
             finally
@@ -101,7 +101,7 @@ private async Task ConnectAndMonitorAsync(CancellationToken cancellationToken)
 
         private async Task ConnectToServerAsync(ImapClient client, CancellationToken cancellationToken)
         {
-            _logger.LogInformation("🔌 Connecting to IMAP server {Server}:{Port}...", _config.Server, _config.Port);
+            _logger.LogDebug("Connecting to IMAP server {Server}:{Port}", _config.Server, _config.Port);
 
             await client.ConnectAsync(_config.Server, _config.Port, SecureSocketOptions.SslOnConnect, cancellationToken);
             await client.AuthenticateAsync(_config.Username, _config.Password, cancellationToken);
@@ -113,7 +113,7 @@ private async Task ProcessMails(bool lastSeenOnly, CancellationToken cancellatio
                 return;
 
             var totalEmails = _client.Inbox.Count;
-            _logger.LogInformation("📬 Processing {TotalEmails} existing emails...", totalEmails);
+            _logger.LogDebug("Processing {TotalEmails} existing emails", totalEmails);
 
 
             IList<IMessageSummary>? fetchedMessages = null;
@@ -130,7 +130,7 @@ private async Task ProcessMails(bool lastSeenOnly, CancellationToken cancellatio
             }
             if (fetchedMessages == null || fetchedMessages.Count == 0)
             {
-                _logger.LogInformation("No emails to process in the inbox.");
+                _logger.LogDebug("No emails to process in the inbox");
                 return;
             }
             for (int i = 0; i < fetchedMessages.Count; i++)
@@ -150,7 +150,7 @@ private async Task ProcessMails(bool lastSeenOnly, CancellationToken cancellatio
             }
 
             _lastProcessedCount = totalEmails;
-            _logger.LogInformation("✅ Finished processing {TotalEmails} existing emails", totalEmails);
+            _logger.LogDebug("Finished processing {TotalEmails} existing emails", totalEmails);
             var triggers = await this.ProcessBatchAsync(emailsToProcess);
 
             // Run inbox cleanup after rule processing
@@ -174,7 +174,7 @@ private async Task<List<RuleTrigger>> ProcessBatchAsync(List<EmailReceivedEventA
 
             var stopwatch = System.Diagnostics.Stopwatch.StartNew();
 
-            _logger.LogInformation("🔄 Starting batch processing of {EmailCount} emails...", emailsToProcess.Count);
+            _logger.LogDebug("Starting batch processing of {EmailCount} emails", emailsToProcess.Count);
 
             // Process emails in batch
             var triggers = _batchRuleProcessor.ProcessEmailBatch(emailsToProcess);
@@ -191,7 +191,7 @@ private async Task<List<RuleTrigger>> ProcessBatchAsync(List<EmailReceivedEventA
                 }
 
                 var ops = _emailMover.ExecuteTriggers(triggers);
-                _logger.LogInformation("📦 Executed {OperationCount} move operations and {FlagCount} flag operations",
+                _logger.LogDebug("Executed {OperationCount} move operations and {FlagCount} flag operations",
                     ops.Count, flagOps.Count);
                 foreach (var op in ops)
                 {
@@ -209,7 +209,7 @@ private async Task<List<RuleTrigger>> ProcessBatchAsync(List<EmailReceivedEventA
                 EmailsMoved = emailsMoved,
                 ProcessingTime = stopwatch.Elapsed
             };
-            _logger.LogInformation("🔄 Batch completed: {EmailsProcessed} emails, {RulesMatched} matches, {EmailsMoved} moved in {ProcessingTime}ms",
+            _logger.LogInformation("Processed {EmailsProcessed} emails, {RulesMatched} matched, {EmailsMoved} moved in {ProcessingTime}ms",
                  batchEventArgs.EmailsProcessed, batchEventArgs.RulesMatched, batchEventArgs.EmailsMoved, batchEventArgs.ProcessingTime.TotalMilliseconds);
 
             return triggers;
@@ -250,7 +250,7 @@ private async Task ProcessSingleEmail(IMessageSummary message, IMailFolder folde
             };
             if (emailArgs.IsImportant)
             {
-                _logger.LogInformation("⭐ Important email detected (skipping rules): {Subject} from {Sender} at {Date}",
+                _logger.LogDebug("Important email detected (skipping rules): {Subject} from {Sender} at {Date}",
                     emailArgs.Subject, emailArgs.SenderName, emailArgs.ReceivedDate);
             }
             processList.Add(emailArgs);
@@ -275,7 +275,7 @@ private void ProcessInboxCleanup(List<EmailReceivedEventArgs> emails, HashSet<Un
             var important = candidates.Where(e => e.IsImportant).ToList();
             var nonImportant = candidates.Where(e => !e.IsImportant).ToList();
 
-            _logger.LogInformation("🧹 Inbox cleanup: {ImportantCount} important → {ImportantFolder}, {NonImportantCount} non-important → Trash",
+            _logger.LogInformation("Inbox cleanup: {ImportantCount} important -> {ImportantFolder}, {NonImportantCount} non-important -> Trash",
                 important.Count, _config.ImportantFolder, nonImportant.Count);
 
             if (important.Any())
@@ -293,7 +293,8 @@ private void ProcessInboxCleanup(List<EmailReceivedEventArgs> emails, HashSet<Un
                         SenderEmailaddress = e.SenderAddress,
                         Date = e.ReceivedDate,
                         Folder = "INBOX",
-                        MoveTo = _config.ImportantFolder
+                        MoveTo = _config.ImportantFolder,
+                        Rule = "Inbox cleanup"
                     }).ToList()
                 });
             }
@@ -313,7 +314,8 @@ private void ProcessInboxCleanup(List<EmailReceivedEventArgs> emails, HashSet<Un
                         SenderEmailaddress = e.SenderAddress,
                         Date = e.ReceivedDate,
                         Folder = "INBOX",
-                        MoveTo = "Trash"
+                        MoveTo = "Trash",
+                        Rule = "Inbox cleanup"
                     }).ToList()
                 });
             }
@@ -329,7 +331,7 @@ private async Task MonitorForNewEmailsAsync(CancellationToken stoppingToken)
                     var timeSinceLastReprocess = DateTime.UtcNow - _lastFullReprocess;
                     if (timeSinceLastReprocess.TotalMilliseconds >= HourlyReprocessIntervalMs)
                     {
-                        _logger.LogInformation("⏰ Hourly reprocessing time reached. Exiting IDLE to reprocess all emails...");
+                        _logger.LogDebug("Reprocess interval reached. Exiting IDLE to reprocess all emails");
                         await ProcessMails(false, stoppingToken);
                         _lastFullReprocess = DateTime.UtcNow;
                         continue; // Skip the IDLE cycle and immediately check again
@@ -373,10 +375,10 @@ private async Task MonitorForNewEmailsAsync(CancellationToken stoppingToken)
 
                     try
                     {
-                        // Enter IDLE mode – will block until done token is canceled or timeout
+                        // Enter IDLE mode - will block until done token is canceled or timeout
                         if (_client.Capabilities.HasFlag(ImapCapabilities.Idle))
                         {
-                            _logger.LogDebug("📱 Entering IDLE mode for {Timeout} (next full reprocess in {NextReprocess})",
+                            _logger.LogDebug("Entering IDLE mode for {Timeout} (next full reprocess in {NextReprocess})",
                                 actualTimeout, remainingTime);
                             await _client.IdleAsync(idleDone.Token, stoppingToken);
                         }
@@ -391,7 +393,7 @@ private async Task MonitorForNewEmailsAsync(CancellationToken stoppingToken)
                     {
                         if (stoppingToken.IsCancellationRequested)
                         {
-                            _logger.LogInformation("📧 Monitoring stopped due to service shutdown");
+                            _logger.LogDebug("Monitoring stopped due to service shutdown");
                             break;
                         }
                         // Expected when _idleDoneSource is triggered by event handlers, move queue, or timeout
@@ -473,7 +475,7 @@ private async Task ProcessQueuedMoveOperationsAsync()
             if (processedCount > 0)
             {
                 stopwatch.Stop();
-                _logger.LogInformation("✅ Processed {Count} move operations in {ElapsedMs}ms",
+                _logger.LogDebug("Processed {Count} move operations in {ElapsedMs}ms",
                     processedCount, stopwatch.ElapsedMilliseconds);
             }
         }
@@ -507,7 +509,7 @@ private async Task ProcessQueuedFlagOperationsAsync()
 
             if (processedCount > 0)
             {
-                _logger.LogInformation("⭐ Processed {Count} flag operations", processedCount);
+                _logger.LogDebug("Processed {Count} flag operations", processedCount);
             }
         }
 
@@ -523,7 +525,7 @@ private async Task ProcessSingleFlagOperationAsync(EmailFlagOperation flagOperat
                 await folder.OpenAsync(FolderAccess.ReadWrite);
                 await folder.AddFlagsAsync(flagOperation.EmailIds, MessageFlags.Flagged, true);
 
-                _logger.LogInformation("⭐ Flagged {Count} emails as important in {Folder}",
+                _logger.LogInformation("Flagged {Count} emails as important in {Folder}",
                     flagOperation.EmailIds.Count, flagOperation.SourceFolder);
             }
             catch (Exception ex)
@@ -558,7 +560,13 @@ private async Task ProcessSingleMoveOperationAsync(EmailMoveOperation moveOperat
                 // Perform the move
                 await sourceFolder.MoveToAsync(moveOperation.EmailIds, destinationFolder);
 
-                _logger.LogInformation("📁 Moved {Count} emails from {Source} to {Destination}",
+                foreach (var email in moveOperation.Emails)
+                {
+                    _logger.LogInformation("Moved email: from='{From}' subject='{Subject}' to='{Destination}' rule='{Rule}'",
+                        email.SenderEmailaddress, email.Subject, moveOperation.DestinationFolder, email.Rule ?? "unknown");
+                }
+
+                _logger.LogDebug("Moved {Count} emails from {Source} to {Destination}",
                     moveOperation.Emails.Count, moveOperation.SourceFolder, moveOperation.DestinationFolder);
             }
             catch (Exception ex)
@@ -593,7 +601,7 @@ private void OnCountChanged(object? sender, EventArgs e)
             var folder = (IMailFolder)sender!;
             if (folder.Count > _lastProcessedCount)
             {
-                _logger.LogDebug("[Event] Inbox count increased to {CurrentCount} (was {LastCount}) – new message likely.",
+                _logger.LogDebug("[Event] Inbox count increased to {CurrentCount} (was {LastCount}) - new message likely.",
                     folder.Count, _lastProcessedCount);
                 _newMessagesFlag = true;
                 var source = _idleDoneSource;
@@ -625,7 +633,7 @@ private async Task DisconnectAsync(ImapClient? client, CancellationToken cancell
 
         public override async Task StopAsync(CancellationToken cancellationToken)
         {
-            _logger.LogInformation("📧 Email monitoring service is stopping...");
+            _logger.LogInformation("Email monitoring service is stopping");
 
             // Cancel any ongoing IDLE operation
             var source = _idleDoneSource;

src/MailZort/Services/EmailMover.cs

@@ -35,7 +35,7 @@ public List<EmailFlagOperation> ExtractFlagOperations(List<RuleTrigger> triggers
             })
             .ToList();
 
-        _logger.LogInformation("📌 Created {OperationCount} flag operations for {EmailCount} emails",
+        _logger.LogDebug("Created {OperationCount} flag operations for {EmailCount} emails",
             grouped.Count, flagTriggers.Count);
 
         return grouped;
@@ -79,7 +79,7 @@ public List<EmailMoveOperation> ExecuteTriggers(List<RuleTrigger> triggers)
             }
         }
 
-        _logger.LogInformation("📋 Queued {OperationCount} move operations for {EmailCount} emails",
+        _logger.LogDebug("Queued {OperationCount} move operations for {EmailCount} emails",
             queuedOperations, triggers.Count);
 
         return ops;

src/MailZort/Services/RuleMatcher.cs

@@ -51,7 +51,7 @@ private bool ProcessMatch(Rule rule, EmailReceivedEventArgs email, string value,
         if (passesAge && passesStatus)
         {
             var ruleValues = string.Join(", ", rule.Values ?? new List<string>());
-            _logger.LogInformation("RULE MATCHED! Rule: {RuleId}, Value: '{Value}', Location: {Location}, Subject: '{Subject}', RuleValues: [{RuleValues}]",
+            _logger.LogDebug("Rule matched. Rule: {RuleId}, Value: '{Value}', Location: {Location}, Subject: '{Subject}', RuleValues: [{RuleValues}]",
                 rule.Name, value, matchResult.MatchLocation, email.Subject, ruleValues);
             return true;
         }