Skip to content

Add default value support for all primitive types in elicitation schemas (SEP-1034) #924

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Oct 31, 2025
+468 −3
Merged

Add default value support for all primitive types in elicitation schemas (SEP-1034) #924

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
13c2b39
Initial plan
Copilot Oct 30, 2025
c6244fb
Add SEP-1034 support for default values in all primitive schema types
Copilot Oct 30, 2025
423fe2d
Address PR feedback: convert if-else to switch and add default value …
Copilot Oct 30, 2025
0601d28
Remove default value extraction code and linker annotations per feedback
Copilot Oct 30, 2025
ed0d9d3
Use literal true/false values instead of GetBoolean() call
Copilot Oct 30, 2025
c90afd6
Reinstate tests and fix CreatePrimitiveSchema to extract defaults fro…
Copilot Oct 30, 2025
5913162
Remove manual default extraction and update test to use positional re…
Copilot Oct 30, 2025
156d170
Use 'is not null' pattern for consistency with nullable checks
Copilot Oct 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 48 additions & 3 deletions src/ModelContextProtocol.Core/Protocol/ElicitRequestParams.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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":
Expand Down Expand Up @@ -188,7 +206,8 @@ public class Converter : JsonConverter<PrimitiveSchemaDefinition>
psd = new EnumSchema
{
Enum = enumValues,
EnumNames = enumNames
EnumNames = enumNames,
Default = defaultString,
};
}
else
Expand All @@ -198,6 +217,7 @@ public class Converter : JsonConverter<PrimitiveSchemaDefinition>
MinLength = minLength,
MaxLength = maxLength,
Format = format,
Default = defaultString,
};
}
break;
Expand All @@ -208,6 +228,7 @@ public class Converter : JsonConverter<PrimitiveSchemaDefinition>
{
Minimum = minimum,
Maximum = maximum,
Default = defaultNumber,
};
break;

Expand Down Expand Up @@ -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:
Expand All @@ -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);
}
Expand All @@ -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:
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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; }
}
}
Loading