Prevent pagination table from showing up for non list calls

Author: chidozieononiwu

core/Microsoft.Mcp.Core/src/Areas/Server/Commands/ServiceCollectionExtensions.cs

@@ -16,7 +16,6 @@
 using Microsoft.Mcp.Core.Extensions;
 using Microsoft.Mcp.Core.Helpers;
 using ModelContextProtocol.Protocol;
-using ModelContextProtocol.Server;
 
 namespace Microsoft.Mcp.Core.Areas.Server.Commands;
 
@@ -214,7 +213,7 @@ public static IServiceCollection AddAzureMcpServer(this IServiceCollection servi
 
         var mcpServerOptions = services
             .AddOptions<McpServerOptions>()
-            .Configure<IMcpRuntime, IServerInstructionsProvider, IOptions<McpServerConfiguration>, IEnumerable<McpServerResource>>((mcpServerOptions, mcpRuntime, serverInstructionsProvider, serverConfiguration, resources) =>
+            .Configure<IMcpRuntime, IServerInstructionsProvider, IOptions<McpServerConfiguration>>((mcpServerOptions, mcpRuntime, serverInstructionsProvider, serverConfiguration) =>
             {
                 var configuration = serverConfiguration.Value;
 
@@ -224,33 +223,10 @@ public static IServiceCollection AddAzureMcpServer(this IServiceCollection servi
                     Version = configuration.Version,
                 };
 
-                var resourceList = resources.ToList();
-
                 mcpServerOptions.Handlers = new()
                 {
                     CallToolHandler = mcpRuntime.CallToolHandler,
-                    ListToolsHandler = mcpRuntime.ListToolsHandler,
-                    ListResourceTemplatesHandler = (request, cancellationToken) =>
-                    {
-                        var templates = resourceList.Select(r => r.ProtocolResourceTemplate).ToList();
-                        return ValueTask.FromResult(new ListResourceTemplatesResult { ResourceTemplates = templates });
-                    },
-                    ReadResourceHandler = (request, cancellationToken) =>
-                    {
-                        var uri = request.Params?.Uri;
-                        if (string.IsNullOrEmpty(uri))
-                        {
-                            return ValueTask.FromResult(new ReadResourceResult { Contents = [] });
-                        }
-
-                        var resource = resourceList.FirstOrDefault(r => r.IsMatch(uri));
-                        if (resource is null)
-                        {
-                            return ValueTask.FromResult(new ReadResourceResult { Contents = [] });
-                        }
-
-                        return resource.ReadAsync(request, cancellationToken);
-                    },
+                    ListToolsHandler = mcpRuntime.ListToolsHandler
                 };
 
                 // Add instructions for the server

core/Microsoft.Mcp.Core/src/Areas/Server/Commands/ToolLoading/CommandFactoryToolLoader.cs

@@ -8,7 +8,6 @@
 using Microsoft.Extensions.Options;
 using Microsoft.Mcp.Core.Areas.Server.Models;
 using Microsoft.Mcp.Core.Commands;
-using Microsoft.Mcp.Core.Services.Caching.Pagination;
 using Microsoft.Mcp.Core.Helpers;
 using Microsoft.Mcp.Core.Models;
 using Microsoft.Mcp.Core.Models.Command;
@@ -223,7 +222,7 @@ public override async ValueTask<CallToolResult> CallToolHandler(RequestContext<C
             var jsonResponse = JsonSerializer.Serialize(commandResponse, ModelsJsonContext.Default.CommandResponse);
             var isError = commandResponse.Status < HttpStatusCode.OK || commandResponse.Status >= HttpStatusCode.Ambiguous;
 
-            return new CallToolResult
+            var callResult = new CallToolResult
             {
                 Content = [
                     new TextContentBlock {
@@ -232,6 +231,12 @@ public override async ValueTask<CallToolResult> CallToolHandler(RequestContext<C
                 ],
                 IsError = isError
             };
+
+            // Propagate _meta.ui from the command response to the CallToolResult.Meta
+            // so that the host (e.g. VS Code) can render the MCP App inline.
+            callResult.Meta = ExtractUiMeta(jsonResponse);
+
+            return callResult;
         }
         catch (Exception ex)
         {
@@ -288,7 +293,6 @@ private static Tool GetTool(string fullName, IBaseCommand command)
         {
             meta ??= new();
             meta["PaginationHint"] = metadata.SupportsPagination;
-            meta["ui"] = new JsonObject { ["resourceUri"] = TableAppResource.UriPrefix };
         }
         tool.Meta = meta;
 
@@ -331,4 +335,24 @@ protected override ValueTask DisposeAsyncCore()
         // CommandFactoryToolLoader doesn't create or manage disposable resources
         return ValueTask.CompletedTask;
     }
+
+    /// <summary>
+    /// Extracts _meta.ui from the serialized command response JSON and returns it
+    /// as a <see cref="JsonObject"/> suitable for <see cref="CallToolResult.Meta"/>.
+    /// Returns <c>null</c> when no ui metadata is present.
+    /// </summary>
+    private static JsonObject? ExtractUiMeta(string jsonResponse)
+    {
+        var doc = JsonNode.Parse(jsonResponse);
+        var uiNode = doc?["results"]?["_meta"]?["ui"];
+        if (uiNode is null)
+        {
+            return null;
+        }
+
+        return new JsonObject
+        {
+            ["ui"] = uiNode.DeepClone(),
+        };
+    }
 }

core/Microsoft.Mcp.Core/src/Areas/Server/Commands/ToolLoading/NamespaceToolLoader.cs

@@ -13,7 +13,6 @@
 using Microsoft.Mcp.Core.Helpers;
 using Microsoft.Mcp.Core.Models;
 using Microsoft.Mcp.Core.Models.Command;
-using Microsoft.Mcp.Core.Services.Caching.Pagination;
 using ModelContextProtocol;
 using ModelContextProtocol.Protocol;
 
@@ -150,13 +149,12 @@ Sub commands are routed to MCP servers that require specific fields inside the "
                 },
             };
 
-            // Add UI resource URI if any child command supports pagination
+            // Add pagination hint if any child command supports pagination
             if (!AllToolsInGroupMatch(meta => !meta.SupportsPagination, group))
             {
                 tool.Meta = new JsonObject
                 {
                     ["PaginationHint"] = true,
-                    ["ui"] = new JsonObject { ["resourceUri"] = TableAppResource.UriPrefix },
                 };
             }