Add Title to a bunch of types

Author: stephentoub

samples/EverythingServer/Program.cs

@@ -86,9 +86,9 @@ await ctx.Server.SampleAsync([
         var @ref = @params.Ref;
         var argument = @params.Argument;
 
-        if (@ref.Type == "ref/resource")
+        if (@ref is ResourceTemplateReference rtr)
         {
-            var resourceId = @ref.Uri?.Split("/").Last();
+            var resourceId = rtr.Uri?.Split("/").Last();
 
             if (resourceId is null)
             {
@@ -103,7 +103,7 @@ await ctx.Server.SampleAsync([
             };
         }
 
-        if (@ref.Type == "ref/prompt")
+        if (@ref is PromptReference pr)
         {
             if (!exampleCompletions.TryGetValue(argument.Name, out IEnumerable<string>? value))
             {

src/Common/Polyfills/System/Diagnostics/CodeAnalysis/StringSyntaxAttribute.cs

@@ -0,0 +1,68 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace System.Diagnostics.CodeAnalysis;
+
+/// <summary>Specifies the syntax used in a string.</summary>
+[AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Field | AttributeTargets.Property, AllowMultiple = false, Inherited = false)]
+internal sealed class StringSyntaxAttribute : Attribute
+{
+    /// <summary>Initializes the <see cref="StringSyntaxAttribute"/> with the identifier of the syntax used.</summary>
+    /// <param name="syntax">The syntax identifier.</param>
+    public StringSyntaxAttribute(string syntax)
+    {
+        Syntax = syntax;
+        Arguments = Array.Empty<object?>();
+    }
+
+    /// <summary>Initializes the <see cref="StringSyntaxAttribute"/> with the identifier of the syntax used.</summary>
+    /// <param name="syntax">The syntax identifier.</param>
+    /// <param name="arguments">Optional arguments associated with the specific syntax employed.</param>
+    public StringSyntaxAttribute(string syntax, params object?[] arguments)
+    {
+        Syntax = syntax;
+        Arguments = arguments;
+    }
+
+    /// <summary>Gets the identifier of the syntax used.</summary>
+    public string Syntax { get; }
+
+    /// <summary>Optional arguments associated with the specific syntax employed.</summary>
+    public object?[] Arguments { get; }
+
+    /// <summary>The syntax identifier for strings containing composite formats for string formatting.</summary>
+    public const string CompositeFormat = nameof(CompositeFormat);
+
+    /// <summary>The syntax identifier for strings containing date format specifiers.</summary>
+    public const string DateOnlyFormat = nameof(DateOnlyFormat);
+
+    /// <summary>The syntax identifier for strings containing date and time format specifiers.</summary>
+    public const string DateTimeFormat = nameof(DateTimeFormat);
+
+    /// <summary>The syntax identifier for strings containing <see cref="Enum"/> format specifiers.</summary>
+    public const string EnumFormat = nameof(EnumFormat);
+
+    /// <summary>The syntax identifier for strings containing <see cref="Guid"/> format specifiers.</summary>
+    public const string GuidFormat = nameof(GuidFormat);
+
+    /// <summary>The syntax identifier for strings containing JavaScript Object Notation (JSON).</summary>
+    public const string Json = nameof(Json);
+
+    /// <summary>The syntax identifier for strings containing numeric format specifiers.</summary>
+    public const string NumericFormat = nameof(NumericFormat);
+
+    /// <summary>The syntax identifier for strings containing regular expressions.</summary>
+    public const string Regex = nameof(Regex);
+
+    /// <summary>The syntax identifier for strings containing time format specifiers.</summary>
+    public const string TimeOnlyFormat = nameof(TimeOnlyFormat);
+
+    /// <summary>The syntax identifier for strings containing <see cref="TimeSpan"/> format specifiers.</summary>
+    public const string TimeSpanFormat = nameof(TimeSpanFormat);
+
+    /// <summary>The syntax identifier for strings containing URIs.</summary>
+    public const string Uri = nameof(Uri);
+
+    /// <summary>The syntax identifier for strings containing XML.</summary>
+    public const string Xml = nameof(Xml);
+}

src/ModelContextProtocol.Core/Client/McpClient.cs

@@ -1,6 +1,5 @@
 using Microsoft.Extensions.Logging;
 using ModelContextProtocol.Protocol;
-using System.Diagnostics;
 using System.Text.Json;
 
 namespace ModelContextProtocol.Client;

src/ModelContextProtocol.Core/Client/McpClientExtensions.cs

@@ -639,11 +639,6 @@ public static ValueTask<CompleteResult> CompleteAsync(this IMcpClient client, Re
         Throw.IfNull(reference);
         Throw.IfNullOrWhiteSpace(argumentName);
 
-        if (!reference.Validate(out string? validationMessage))
-        {
-            throw new ArgumentException($"Invalid reference: {validationMessage}", nameof(reference));
-        }
-
         return client.SendRequestAsync(
             RequestMethods.CompletionComplete,
             new()

src/ModelContextProtocol.Core/Client/McpClientPrompt.cs

@@ -44,6 +44,9 @@ internal McpClientPrompt(IMcpClient client, Prompt prompt)
     /// <summary>Gets the name of the prompt.</summary>
     public string Name => ProtocolPrompt.Name;
 
+    /// <summary>Gets the title of the prompt.</summary>
+    public string? Title => ProtocolPrompt.Title;
+
     /// <summary>Gets a description of the prompt.</summary>
     public string? Description => ProtocolPrompt.Description;
 

src/ModelContextProtocol.Core/Client/McpClientResource.cs

@@ -42,6 +42,9 @@ internal McpClientResource(IMcpClient client, Resource resource)
     /// <summary>Gets the name of the resource.</summary>
     public string Name => ProtocolResource.Name;
 
+    /// <summary>Gets the title of the resource.</summary>
+    public string? Title => ProtocolResource.Title;
+
     /// <summary>Gets a description of the resource.</summary>
     public string? Description => ProtocolResource.Description;
 

src/ModelContextProtocol.Core/Client/McpClientResourceTemplate.cs

@@ -42,6 +42,9 @@ internal McpClientResourceTemplate(IMcpClient client, ResourceTemplate resourceT
     /// <summary>Gets the name of the resource template.</summary>
     public string Name => ProtocolResourceTemplate.Name;
 
+    /// <summary>Gets the title of the resource template.</summary>
+    public string? Title => ProtocolResourceTemplate.Title;
+
     /// <summary>Gets a description of the resource template.</summary>
     public string? Description => ProtocolResourceTemplate.Description;
 

src/ModelContextProtocol.Core/Client/McpClientTool.cs

@@ -68,6 +68,9 @@ internal McpClientTool(
     /// <inheritdoc/>
     public override string Name => _name;
 
+    /// <summary>Gets the tool's title.</summary>
+    public string? Title => ProtocolTool.Title ?? ProtocolTool.Annotations?.Title;
+
     /// <inheritdoc/>
     public override string Description => _description;
 

src/ModelContextProtocol.Core/McpJsonUtilities.cs

@@ -1,8 +1,6 @@
 using Microsoft.Extensions.AI;
 using ModelContextProtocol.Protocol;
-using ModelContextProtocol.Server;
 using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using System.Text.Json.Serialization.Metadata;

src/ModelContextProtocol.Core/Protocol/IBaseMetadata.cs

@@ -0,0 +1,25 @@
+using System.Text.Json.Serialization;
+
+namespace ModelContextProtocol.Protocol;
+
+/// <summary>Provides a base interface for metadata with name (identifier) and title (display name) properties.</summary>
+public interface IBaseMetadata
+{
+    /// <summary>
+    /// Gets or sets the unique identifier for this item.
+    /// </summary>
+    [JsonPropertyName("name")]
+    string Name { get; set; }
+
+    /// <summary>
+    /// Gets or sets a title.
+    /// </summary>
+    /// <remarks>
+    /// This is intended for UI and end-user contexts. It is optimized to be human-readable and easily understood,
+    /// even by those unfamiliar with domain-specific terminology.
+    /// If not provided, <see cref="Name"/> may be used for display (except for tools, where <see cref="ToolAnnotations.Title"/>, if present, 
+    /// should be given precedence over using <see cref="Name"/>).
+    /// </remarks>
+    [JsonPropertyName("title")]
+    string? Title { get; set; }
+}

src/ModelContextProtocol.Core/Protocol/Implementation.cs

@@ -17,17 +17,16 @@ namespace ModelContextProtocol.Protocol;
 /// See the <see href="https://github.com/modelcontextprotocol/specification/blob/main/schema/">schema</see> for details.
 /// </para>
 /// </remarks>
-public class Implementation
+public class Implementation : IBaseMetadata
 {
-    /// <summary>
-    /// Gets or sets the name of the implementation.
-    /// </summary>
-    /// <remarks>
-    /// This is typically the name of the client or server library/application.
-    /// </remarks>
+    /// <inheritdoc />
     [JsonPropertyName("name")]
     public required string Name { get; set; }
 
+    /// <inheritdoc />
+    [JsonPropertyName("title")]
+    public string? Title { get; set; }
+
     /// <summary>
     /// Gets or sets the version of the implementation.
     /// </summary>

src/ModelContextProtocol.Core/Protocol/Prompt.cs

@@ -8,8 +8,16 @@ namespace ModelContextProtocol.Protocol;
 /// <remarks>
 /// See the <see href="https://github.com/modelcontextprotocol/specification/blob/main/schema/">schema</see> for details.
 /// </remarks>
-public class Prompt
+public class Prompt : IBaseMetadata
 {
+    /// <inheritdoc />
+    [JsonPropertyName("name")]
+    public required string Name { get; set; }
+
+    /// <inheritdoc />
+    [JsonPropertyName("title")]
+    public string? Title { get; set; }
+
     /// <summary>
     /// Gets or sets a list of arguments that this prompt accepts for templating and customization.
     /// </summary>
@@ -41,10 +49,4 @@ public class Prompt
     /// </remarks>
     [JsonPropertyName("description")]
     public string? Description { get; set; }
-
-    /// <summary>
-    /// Gets or sets the name of the prompt.
-    /// </summary>
-    [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
 }

src/ModelContextProtocol.Core/Protocol/PromptArgument.cs

@@ -15,13 +15,15 @@ namespace ModelContextProtocol.Protocol;
 /// See the <see href="https://github.com/modelcontextprotocol/specification/blob/main/schema/">schema</see> for details.
 /// </para>
 /// </remarks>
-public class PromptArgument
+public class PromptArgument : IBaseMetadata
 {
-    /// <summary>
-    /// Gets or sets the name of the argument used for referencing in prompt templates.
-    /// </summary>
+    /// <inheritdoc />
     [JsonPropertyName("name")]
-    public string Name { get; set; } = string.Empty;
+    public required string Name { get; set; }
+
+    /// <inheritdoc />
+    [JsonPropertyName("title")]
+    public string? Title { get; set; }
 
     /// <summary>
     /// Gets or sets a human-readable description of the argument's purpose and expected values.