Finalize review feedback responses and logging refinements

Co-authored-by: JerryNixon <1749983+JerryNixon@users.noreply.github.com>

Author: Copilot

src/Azure.DataApiBuilder.Mcp/BuiltInTools/AggregateRecordsTool.cs

@@ -402,7 +402,24 @@ public async Task<CallToolResult> ExecuteAsync(
                 // Apply pagination if first is specified with groupby
                 if (first.HasValue && groupby.Count > 0)
                 {
-                    PaginationResult paginatedResult = ApplyPagination(aggregatedResults, first.Value, after, logger);
+                    if (!string.IsNullOrWhiteSpace(after))
+                    {
+                        try
+                        {
+                            byte[] cursorBytes = Convert.FromBase64String(after);
+                            string cursorDecoded = System.Text.Encoding.UTF8.GetString(cursorBytes);
+                            if (!int.TryParse(cursorDecoded, out _))
+                            {
+                                logger?.LogWarning("Invalid pagination cursor '{Cursor}' provided to aggregate_records; starting from beginning.", after);
+                            }
+                        }
+                        catch (FormatException)
+                        {
+                            logger?.LogWarning("Invalid pagination cursor '{Cursor}' provided to aggregate_records; starting from beginning.", after);
+                        }
+                    }
+
+                    PaginationResult paginatedResult = ApplyPagination(aggregatedResults, first.Value, after);
                     return McpResponseBuilder.BuildSuccessResult(
                         new Dictionary<string, object?>
                         {
@@ -606,8 +623,7 @@ internal sealed class PaginationResult
         internal static PaginationResult ApplyPagination(
             List<Dictionary<string, object?>> allResults,
             int first,
-            string? after,
-            ILogger? logger = null)
+            string? after)
         {
             int startIndex = 0;
 
@@ -624,7 +640,7 @@ internal static PaginationResult ApplyPagination(
                 }
                 catch (FormatException)
                 {
-                    logger?.LogWarning("Invalid pagination cursor provided to aggregate_records; starting from beginning.");
+                    // Invalid cursor format; start from beginning.
                 }
             }
 

src/Service.Tests/Mcp/AggregateRecordsToolTests.cs

@@ -1132,11 +1132,11 @@ private static JsonElement ParseContent(CallToolResult result)
             return JsonDocument.Parse(firstContent.Text).RootElement;
         }
 
-        private static async Task<CallToolResult> ExecuteWithConfigAsync(RuntimeConfig config, string? argumentsJson, CancellationToken cancellationToken = default)
+        private static async Task<CallToolResult> ExecuteWithConfigAsync(RuntimeConfig config, string? argumentsJsonString, CancellationToken cancellationToken = default)
         {
             IServiceProvider serviceProvider = CreateServiceProvider(config);
             AggregateRecordsTool tool = new();
-            JsonDocument? arguments = argumentsJson is not null ? JsonDocument.Parse(argumentsJson) : null;
+            JsonDocument? arguments = argumentsJsonString is not null ? JsonDocument.Parse(argumentsJsonString) : null;
             return await tool.ExecuteAsync(arguments, serviceProvider, cancellationToken);
         }
 

src/Service.Tests/Mcp/McpQueryTimeoutTests.cs

@@ -222,7 +222,10 @@ await McpTelemetryHelper.ExecuteWithTelemetryAsync(
                     tool, "test_tool", null, sp, CancellationToken.None);
             });
 
-            Assert.IsTrue(ex.Message.Contains($"{McpRuntimeOptions.MAX_QUERY_TIMEOUT_SECONDS}"));
+            Assert.AreEqual(
+                $"MCP query-timeout must be within 1 and {McpRuntimeOptions.MAX_QUERY_TIMEOUT_SECONDS} seconds. " +
+                $"Provided value: {McpRuntimeOptions.MAX_QUERY_TIMEOUT_SECONDS + 1}.",
+                ex.Message);
         }
 
         #endregion
@@ -290,7 +293,10 @@ public void ValidateMcpUri_Throws_WhenTimeoutExceedsMaximum()
             RuntimeConfigValidator validator = CreateRuntimeConfigValidator();
 
             DataApiBuilderException ex = Assert.ThrowsException<DataApiBuilderException>(() => validator.ValidateMcpUri(config));
-            Assert.IsTrue(ex.Message.Contains($"{McpRuntimeOptions.MAX_QUERY_TIMEOUT_SECONDS}"));
+            Assert.AreEqual(
+                $"MCP query-timeout must be within 1 and {McpRuntimeOptions.MAX_QUERY_TIMEOUT_SECONDS} seconds. " +
+                $"Provided value: {McpRuntimeOptions.MAX_QUERY_TIMEOUT_SECONDS + 1}.",
+                ex.Message);
         }
 
         [TestMethod]