Fixes

Author: SteveSandersonMS

dotnet/src/Client.cs

@@ -1080,6 +1080,7 @@ private static JsonSerializerOptions CreateSerializerOptions()
         options.TypeInfoResolverChain.Add(TypesJsonContext.Default);
         options.TypeInfoResolverChain.Add(CopilotSession.SessionJsonContext.Default);
         options.TypeInfoResolverChain.Add(SessionEventsJsonContext.Default);
+        options.TypeInfoResolverChain.Add(SDK.Rpc.RpcJsonContext.Default);
 
         options.MakeReadOnly();
 

dotnet/src/Generated/Rpc.cs

@@ -5,6 +5,7 @@
 // AUTO-GENERATED FILE - DO NOT EDIT
 // Generated from: api.schema.json
 
+using System.Text.Json;
 using System.Text.Json.Serialization;
 using StreamJsonRpc;
 
@@ -338,3 +339,27 @@ public async Task<SessionModelSwitchToResult> SwitchToAsync(string modelId, Canc
         return await CopilotClient.InvokeRpcAsync<SessionModelSwitchToResult>(_rpc, "session.model.switchTo", [request], cancellationToken);
     }
 }
+
+[JsonSourceGenerationOptions(
+    JsonSerializerDefaults.Web,
+    AllowOutOfOrderMetadataProperties = true,
+    DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull)]
+[JsonSerializable(typeof(AccountGetQuotaResult))]
+[JsonSerializable(typeof(AccountGetQuotaResultQuotaSnapshotsValue))]
+[JsonSerializable(typeof(GetCurrentRequest))]
+[JsonSerializable(typeof(ListRequest))]
+[JsonSerializable(typeof(Model))]
+[JsonSerializable(typeof(ModelBilling))]
+[JsonSerializable(typeof(ModelCapabilities))]
+[JsonSerializable(typeof(ModelCapabilitiesLimits))]
+[JsonSerializable(typeof(ModelCapabilitiesSupports))]
+[JsonSerializable(typeof(ModelPolicy))]
+[JsonSerializable(typeof(ModelsListResult))]
+[JsonSerializable(typeof(PingRequest))]
+[JsonSerializable(typeof(PingResult))]
+[JsonSerializable(typeof(SessionModelGetCurrentResult))]
+[JsonSerializable(typeof(SessionModelSwitchToResult))]
+[JsonSerializable(typeof(SwitchToRequest))]
+[JsonSerializable(typeof(Tool))]
+[JsonSerializable(typeof(ToolsListResult))]
+internal partial class RpcJsonContext : JsonSerializerContext;

dotnet/test/RpcTests.cs

@@ -13,6 +13,7 @@ public class RpcTests(E2ETestFixture fixture, ITestOutputHelper output) : E2ETes
     [Fact]
     public async Task Should_Call_Rpc_Ping_With_Typed_Params_And_Result()
     {
+        await Client.StartAsync();
         var result = await Client.Rpc.PingAsync(message: "typed rpc test");
         Assert.Equal("pong: typed rpc test", result.Message);
         Assert.True(result.Timestamp >= 0);
@@ -21,6 +22,7 @@ public async Task Should_Call_Rpc_Ping_With_Typed_Params_And_Result()
     [Fact]
     public async Task Should_Call_Rpc_Models_List_With_Typed_Result()
     {
+        await Client.StartAsync();
         var authStatus = await Client.GetAuthStatusAsync();
         if (!authStatus.IsAuthenticated)
         {
@@ -36,6 +38,7 @@ public async Task Should_Call_Rpc_Models_List_With_Typed_Result()
     [Fact(Skip = "account.getQuota not yet implemented in CLI")]
     public async Task Should_Call_Rpc_Account_GetQuota_When_Authenticated()
     {
+        await Client.StartAsync();
         var authStatus = await Client.GetAuthStatusAsync();
         if (!authStatus.IsAuthenticated)
         {

scripts/codegen/csharp.ts

@@ -712,6 +712,7 @@ function generateRpcCode(schema: ApiSchema): string {
 // AUTO-GENERATED FILE - DO NOT EDIT
 // Generated from: api.schema.json
 
+using System.Text.Json;
 using System.Text.Json.Serialization;
 using StreamJsonRpc;
 
@@ -722,6 +723,17 @@ namespace GitHub.Copilot.SDK.Rpc;
     for (const part of serverRpcParts) lines.push(part, "");
     for (const part of sessionRpcParts) lines.push(part, "");
 
+    // Add JsonSerializerContext for AOT/trimming support
+    const typeNames = [...emittedRpcClasses].sort();
+    if (typeNames.length > 0) {
+        lines.push(`[JsonSourceGenerationOptions(`);
+        lines.push(`    JsonSerializerDefaults.Web,`);
+        lines.push(`    AllowOutOfOrderMetadataProperties = true,`);
+        lines.push(`    DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull)]`);
+        for (const t of typeNames) lines.push(`[JsonSerializable(typeof(${t}))]`);
+        lines.push(`internal partial class RpcJsonContext : JsonSerializerContext;`);
+    }
+
     return lines.join("\n");
 }