update merge

Author: KSemenenko

src/ManagedCode.MCPGateway/Catalog/Internal/Sources/McpGatewayToolSourceRegistrations.cs

@@ -24,12 +24,19 @@ internal sealed record McpGatewayLoadedTool(
     ToolTaskSupport? TaskSupport = null
 );
 
-internal sealed record McpGatewayLoadedPrompt(
-    string Name,
-    string? Title,
-    string? Description,
-    IReadOnlyList<PromptArgument> Arguments
-);
+internal sealed record McpGatewayLoadedPrompt(Prompt ProtocolPrompt)
+{
+    public string Name => ProtocolPrompt.Name;
+
+    public string? Title => ProtocolPrompt.Title;
+
+    public string? Description => ProtocolPrompt.Description;
+
+    public IReadOnlyList<PromptArgument> Arguments =>
+        ProtocolPrompt.Arguments as IReadOnlyList<PromptArgument>
+        ?? ProtocolPrompt.Arguments?.ToArray()
+        ?? [];
+}
 
 internal sealed record McpGatewayLoadedResource(Resource Resource);
 
@@ -199,18 +206,21 @@ CancellationToken cancellationToken
             _prompts
                 .Values.OrderBy(static prompt => prompt.Name, StringComparer.Ordinal)
                 .Select(static prompt => new McpGatewayLoadedPrompt(
-                    prompt.Name,
-                    prompt.DisplayName,
-                    prompt.Description,
-                    prompt
-                        .Arguments.Select(static argument => new PromptArgument
-                        {
-                            Name = argument.Name,
-                            Title = argument.DisplayName,
-                            Description = argument.Description,
-                            Required = argument.IsRequired,
-                        })
-                        .ToList()
+                    new Prompt
+                    {
+                        Name = prompt.Name,
+                        Title = prompt.DisplayName,
+                        Description = prompt.Description,
+                        Arguments = prompt
+                            .Arguments.Select(static argument => new PromptArgument
+                            {
+                                Name = argument.Name,
+                                Title = argument.DisplayName,
+                                Description = argument.Description,
+                                Required = argument.IsRequired,
+                            })
+                            .ToList(),
+                    }
                 ))
                 .ToList()
         );
@@ -525,12 +535,7 @@ CancellationToken cancellationToken
         var prompts = await client.ListPromptsAsync(new RequestOptions(), cancellationToken);
         return prompts
             .Where(static prompt => !string.IsNullOrWhiteSpace(prompt.Name))
-            .Select(static prompt => new McpGatewayLoadedPrompt(
-                Name: prompt.Name.Trim(),
-                Title: prompt.Title,
-                Description: prompt.Description,
-                Arguments: prompt.ProtocolPrompt.Arguments?.ToList() ?? []
-            ))
+            .Select(static prompt => new McpGatewayLoadedPrompt(prompt.ProtocolPrompt))
             .ToList();
     }
 

src/ManagedCode.MCPGateway/Gateway/Internal/Serialization/McpGatewayProtocolPrimitive.cs

@@ -0,0 +1,72 @@
+using ModelContextProtocol.Protocol;
+
+namespace ManagedCode.MCPGateway;
+
+internal static class McpGatewayProtocolPrimitive
+{
+    public static Prompt Clone(Prompt prompt) =>
+        new()
+        {
+            Name = prompt.Name,
+            Title = prompt.Title,
+            Description = prompt.Description,
+            Arguments = prompt.Arguments?.Select(ClonePromptArgument).ToList(),
+            Icons = CloneIcons(prompt.Icons),
+            Meta = McpGatewayProtocolTool.CloneMeta(prompt.Meta),
+        };
+
+    public static Resource Clone(Resource resource) =>
+        new()
+        {
+            Name = resource.Name,
+            Title = resource.Title,
+            Uri = resource.Uri,
+            Description = resource.Description,
+            MimeType = resource.MimeType,
+            Annotations = CloneAnnotations(resource.Annotations),
+            Size = resource.Size,
+            Icons = CloneIcons(resource.Icons),
+            Meta = McpGatewayProtocolTool.CloneMeta(resource.Meta),
+        };
+
+    public static ResourceTemplate Clone(ResourceTemplate template) =>
+        new()
+        {
+            Name = template.Name,
+            Title = template.Title,
+            UriTemplate = template.UriTemplate,
+            Description = template.Description,
+            MimeType = template.MimeType,
+            Annotations = CloneAnnotations(template.Annotations),
+            Icons = CloneIcons(template.Icons),
+            Meta = McpGatewayProtocolTool.CloneMeta(template.Meta),
+        };
+
+    public static PromptArgument ClonePromptArgument(PromptArgument argument) =>
+        new()
+        {
+            Name = argument.Name,
+            Title = argument.Title,
+            Description = argument.Description,
+            Required = argument.Required,
+        };
+
+    public static IList<Icon>? CloneIcons(IList<Icon>? icons) =>
+        icons?.Select(static icon => new Icon
+        {
+            Source = icon.Source,
+            MimeType = icon.MimeType,
+            Sizes = icon.Sizes?.ToArray(),
+            Theme = icon.Theme,
+        }).ToList();
+
+    private static Annotations? CloneAnnotations(Annotations? annotations) =>
+        annotations is null
+            ? null
+            : new Annotations
+            {
+                Audience = annotations.Audience?.ToArray(),
+                Priority = annotations.Priority,
+                LastModified = annotations.LastModified,
+            };
+}

src/ManagedCode.MCPGateway/Gateway/Internal/Serialization/McpGatewayProtocolSchema.cs

@@ -4,12 +4,12 @@ namespace ManagedCode.MCPGateway;
 
 internal static class McpGatewayProtocolSchema
 {
-    private const string TypePropertyName = "type";
-    private const string ObjectTypeName = "object";
+    private const string JsonSchemaTypePropertyName = "type";
+    private const string JsonSchemaObjectTypeName = "object";
 
     public static bool IsToolObjectSchema(JsonElement schema) =>
         schema.ValueKind == JsonValueKind.Object
-        && schema.TryGetProperty(TypePropertyName, out var type)
+        && schema.TryGetProperty(JsonSchemaTypePropertyName, out var type)
         && type.ValueKind == JsonValueKind.String
-        && string.Equals(type.GetString(), ObjectTypeName, StringComparison.Ordinal);
+        && type.ValueEquals(JsonSchemaObjectTypeName);
 }

src/ManagedCode.MCPGateway/Hosting/Internal/Server/McpGatewayMcpServerHandlers.cs

@@ -188,15 +188,7 @@ await promptNotificationManager.RegisterDownstreamServerAsync(
             ? McpGatewayMcpServerProtocolMapper.CreateErrorPromptResult(
                 $"Prompt '{exportedPromptName}' was not found."
             )
-            : new GetPromptResult
-            {
-                Description = promptResult.Description,
-                Messages = promptResult
-                    .Messages.Select(McpGatewayMcpServerProtocolMapper.ToProtocolPromptMessage)
-                    .Where(static message => message is not null)
-                    .Cast<PromptMessage>()
-                    .ToList(),
-            };
+            : promptResult.ProtocolResult;
     }
 
     public async ValueTask<ListResourcesResult> ListResourcesAsync(