Merge branch 'modelcontextprotocol:main' into update_claude_model_id

Author: PederHP

.github/workflows/release.yml

@@ -79,7 +79,7 @@ jobs:
         uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0
         with:
           dotnet-version: |
-            10.0.100-rc.1.25451.107
+            10.0.x
             9.0.x
 
       - name: Pack
@@ -108,7 +108,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0
         with:
-          dotnet-version: 10.0.100-rc.1.25451.107
+          dotnet-version: 10.0.x
 
       - name: Download build artifacts
         uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
@@ -163,7 +163,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0
         with:
-          dotnet-version: 10.0.100-rc.1.25451.107
+          dotnet-version: 10.0.x
 
       - name: Download build artifacts
         uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0

src/ModelContextProtocol.Core/Protocol/ElicitRequestParams.cs

@@ -109,6 +109,8 @@ public class Converter : JsonConverter<PrimitiveSchemaDefinition>
                 double? minimum = null;
                 double? maximum = null;
                 bool? defaultBool = null;
+                double? defaultNumber = null;
+                string? defaultString = null;
                 IList<string>? enumValues = null;
                 IList<string>? enumNames = null;
 
@@ -158,7 +160,23 @@ public class Converter : JsonConverter<PrimitiveSchemaDefinition>
                             break;
 
                         case "default":
-                            defaultBool = reader.GetBoolean();
+                            // We need to handle different types for default values
+                            // Store the value based on the JSON token type
+                            switch (reader.TokenType)
+                            {
+                                case JsonTokenType.True:
+                                    defaultBool = true;
+                                    break;
+                                case JsonTokenType.False:
+                                    defaultBool = false;
+                                    break;
+                                case JsonTokenType.Number:
+                                    defaultNumber = reader.GetDouble();
+                                    break;
+                                case JsonTokenType.String:
+                                    defaultString = reader.GetString();
+                                    break;
+                            }
                             break;
 
                         case "enum":
@@ -188,7 +206,8 @@ public class Converter : JsonConverter<PrimitiveSchemaDefinition>
                             psd = new EnumSchema
                             {
                                 Enum = enumValues,
-                                EnumNames = enumNames
+                                EnumNames = enumNames,
+                                Default = defaultString,
                             };
                         }
                         else
@@ -198,6 +217,7 @@ public class Converter : JsonConverter<PrimitiveSchemaDefinition>
                                 MinLength = minLength,
                                 MaxLength = maxLength,
                                 Format = format,
+                                Default = defaultString,
                             };
                         }
                         break;
@@ -208,6 +228,7 @@ public class Converter : JsonConverter<PrimitiveSchemaDefinition>
                         {
                             Minimum = minimum,
                             Maximum = maximum,
+                            Default = defaultNumber,
                         };
                         break;
 
@@ -265,6 +286,10 @@ public override void Write(Utf8JsonWriter writer, PrimitiveSchemaDefinition valu
                         {
                             writer.WriteString("format", stringSchema.Format);
                         }
+                        if (stringSchema.Default is not null)
+                        {
+                            writer.WriteString("default", stringSchema.Default);
+                        }
                         break;
 
                     case NumberSchema numberSchema:
@@ -276,10 +301,14 @@ public override void Write(Utf8JsonWriter writer, PrimitiveSchemaDefinition valu
                         {
                             writer.WriteNumber("maximum", numberSchema.Maximum.Value);
                         }
+                        if (numberSchema.Default is not null)
+                        {
+                            writer.WriteNumber("default", numberSchema.Default.Value);
+                        }
                         break;
 
                     case BooleanSchema booleanSchema:
-                        if (booleanSchema.Default.HasValue)
+                        if (booleanSchema.Default is not null)
                         {
                             writer.WriteBoolean("default", booleanSchema.Default.Value);
                         }
@@ -296,6 +325,10 @@ public override void Write(Utf8JsonWriter writer, PrimitiveSchemaDefinition valu
                             writer.WritePropertyName("enumNames");
                             JsonSerializer.Serialize(writer, enumSchema.EnumNames, McpJsonUtilities.JsonContext.Default.IListString);
                         }
+                        if (enumSchema.Default is not null)
+                        {
+                            writer.WriteString("default", enumSchema.Default);
+                        }
                         break;
 
                     default:
@@ -371,6 +404,10 @@ public string? Format
                 field = value;
             }
         }
+
+        /// <summary>Gets or sets the default value for the string.</summary>
+        [JsonPropertyName("default")]
+        public string? Default { get; set; }
     }
 
     /// <summary>Represents a schema for a number or integer type.</summary>
@@ -399,6 +436,10 @@ public override string Type
         /// <summary>Gets or sets the maximum allowed value.</summary>
         [JsonPropertyName("maximum")]
         public double? Maximum { get; set; }
+
+        /// <summary>Gets or sets the default value for the number.</summary>
+        [JsonPropertyName("default")]
+        public double? Default { get; set; }
     }
 
     /// <summary>Represents a schema for a Boolean type.</summary>
@@ -456,5 +497,9 @@ public IList<string> Enum
         /// <summary>Gets or sets optional display names corresponding to the enum values.</summary>
         [JsonPropertyName("enumNames")]
         public IList<string>? EnumNames { get; set; }
+
+        /// <summary>Gets or sets the default value for the enum.</summary>
+        [JsonPropertyName("default")]
+        public string? Default { get; set; }
     }
 }