Align structured output with released runtime and provider matrix

Use main's polymorphic C# response format, preserve rebased lifecycle coverage, remove the unreleased codegen workaround, and honor the E2E provider matrix.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: SteveSandersonMS

.github/workflows/java-codegen-check.yml

@@ -10,7 +10,6 @@ on:
       - 'java/sdk/src/generated/**'
       - '.github/workflows/java-codegen-check.yml'
   pull_request:
-    types: [opened, synchronize, reopened, ready_for_review]
     paths:
       - 'nodejs/package.json'
       - 'java/scripts/codegen/**'
@@ -71,18 +70,18 @@ jobs:
             echo "✅ Generated files are up-to-date"
           fi
 
-      # Drafts may intentionally target an unreleased schema; report drift without rewriting them.
-      - name: Fail on stale generated files without automatic updates
-        if: steps.check-changes.outputs.changed == 'true' && (github.event_name != 'pull_request' || github.event.pull_request.draft == true)
+      # --- On push to main: fail if generated files are stale (existing behavior) ---
+      - name: Fail on stale generated files (push to main)
+        if: steps.check-changes.outputs.changed == 'true' && github.event_name != 'pull_request'
         run: |
           echo "::error::Generated files are out of date. Run 'cd java/scripts/codegen && npm run generate' and commit the changes."
           git diff
           exit 1
 
-      # --- On ready PRs: commit regenerated files back and verify build ---
+      # --- On PR: commit regenerated files back and verify build ---
       - name: Commit and push regenerated files to PR branch
         id: push-regen
-        if: steps.check-changes.outputs.changed == 'true' && github.event_name == 'pull_request' && github.event.pull_request.draft == false
+        if: steps.check-changes.outputs.changed == 'true' && github.event_name == 'pull_request'
         continue-on-error: true
         env:
           GH_TOKEN: ${{ github.token }}

CONTRIBUTING.md

@@ -112,9 +112,8 @@ never author model responses by hand. Rerun with `GITHUB_ACTIONS=true` and real
 provider credentials removed to require replay instead of forwarding cache
 misses upstream. A draft targeting an unreleased runtime should document the
 required runtime revision; update the pinned release only after it ships.
-Pinned-schema CI can report drift in such a draft. Java codegen reports this
-without automatically rewriting draft branches; automatic updates resume once
-the pull request is ready for review.
+Pinned-schema CI can report drift in such a draft, and Java codegen may
+automatically update generated files to match the pinned release.
 
 For recording behind `HTTPS_PROXY`, Node versions that support environment
 proxies (including Node 24.20) need `NODE_USE_ENV_PROXY=1` in the test runner's

dotnet/README.md

@@ -362,9 +362,8 @@ using System.Text.Json;
 using var schema = JsonDocument.Parse("""
     {"type":"object","properties":{"count":{"type":"integer"}},"required":["count"],"additionalProperties":false}
     """);
-var format = new ResponseFormat
+var format = new ResponseFormatJsonSchema
 {
-    Type = "json_schema",
     JsonSchema = new JsonSchemaResponseFormat
     {
         Name = "inventory",
@@ -402,8 +401,8 @@ admission, using the runtime's existing request-size ceiling. This does not
 guarantee the schema plus conversation and tools fits the provider's budget.
 Use a provider route that enforces JSON Schema: an API-compatible gateway can
 ignore unsupported format fields, and the Claude Chat-completions compatibility
-route is not equivalent to Anthropic's native Messages endpoint. This preview
-requires the unreleased runtime changes; see [local-runtime development](../CONTRIBUTING.md#testing-an-unreleased-runtime-api).
+route is not equivalent to Anthropic's native Messages endpoint. The SDK's
+pinned CLI release includes the required runtime support.
 
 ##### `On(Action<SessionEvent> handler): IDisposable`
 

dotnet/src/Session.cs

@@ -332,9 +332,8 @@ public async Task<string> SendAsync(MessageOptions options, CancellationToken ca
             Traceparent = traceparent,
             Tracestate = tracestate,
             RequestHeaders = options.RequestHeaders,
-            ResponseFormat = options.ResponseSchema is { } schema ? new ResponseFormat
+            ResponseFormat = options.ResponseSchema is { } schema ? new ResponseFormatJsonSchema
             {
-                Type = "json_schema",
                 JsonSchema = new JsonSchemaResponseFormat
                 {
                     Name = "response",

dotnet/test/E2E/StructuredOutputE2ETests.cs

@@ -14,28 +14,30 @@ namespace GitHub.Copilot.Test.E2E;
 public partial class StructuredOutputE2ETests(E2ETestFixture fixture, ITestOutputHelper output)
     : E2ETestBase(fixture, "structured_output", output)
 {
-    private SessionConfig StructuredSessionConfig() => new()
-    {
-        Model = "gpt-4.1",
-        AvailableTools = [],
-        Provider = new ProviderConfig
+    private SessionConfig StructuredSessionConfig() => E2ETestBackendConfiguration.Current != E2ETestBackend.Capi
+        ? new() { AvailableTools = [] }
+        : new()
         {
-            Type = "openai",
-            WireApi = "completions",
-            BaseUrl = Ctx.ProxyUrl,
-            ModelId = "gpt-4.1",
-            WireModel = "gpt-4.1",
-            ApiKey = Environment.GetEnvironmentVariable("GITHUB_ACTIONS") == "true"
+            Model = "gpt-4.1",
+            AvailableTools = [],
+            Provider = new ProviderConfig
+            {
+                Type = "openai",
+                WireApi = "completions",
+                BaseUrl = Ctx.ProxyUrl,
+                ModelId = "gpt-4.1",
+                WireModel = "gpt-4.1",
+                ApiKey = Environment.GetEnvironmentVariable("GITHUB_ACTIONS") == "true"
                 ? "fake-token-for-e2e-tests"
                 : Environment.GetEnvironmentVariable("GITHUB_TOKEN") ?? "fake-token-for-e2e-tests",
-            Headers = new Dictionary<string, string>
-            {
-                ["Copilot-Integration-Id"] = "copilot-developer-cli",
-                ["Copilot-Harness-Id"] = "copilot-sdk",
-                ["X-GitHub-Api-Version"] = "2026-08-01",
+                Headers = new Dictionary<string, string>
+                {
+                    ["Copilot-Integration-Id"] = "copilot-developer-cli",
+                    ["Copilot-Harness-Id"] = "copilot-sdk",
+                    ["X-GitHub-Api-Version"] = "2026-08-01",
+                },
             },
-        },
-    };
+        };
 
     [Fact]
     public async Task Infers_Typed_Result_After_Custom_Tool()
@@ -93,9 +95,8 @@ public async Task Sends_Explicit_Schema_For_Message_And_Batch()
             """{"type":"object","properties":{"count":{"type":"integer"},"color":{"type":"string"}},"required":["count","color"],"additionalProperties":false}""");
         var accepted = await session.Rpc.SendMessagesAsync(
             [new() { Prompt = "There are 42 red widgets in stock." }, new() { Prompt = "Report the widget count and color." }],
-            responseFormat: new ResponseFormat
+            responseFormat: new ResponseFormatJsonSchema
             {
-                Type = "json_schema",
                 JsonSchema = new JsonSchemaResponseFormat
                 {
                     Name = "inventory",
@@ -339,9 +340,8 @@ public async Task Rejects_Unsupported_Or_Oversized_Schemas_Before_Admission()
                 }));
             Assert.Contains(message, error.Message);
             error = await Assert.ThrowsAnyAsync<Exception>(() =>
-                session.Rpc.SendMessagesAsync([], responseFormat: new ResponseFormat
+                session.Rpc.SendMessagesAsync([], responseFormat: new ResponseFormatJsonSchema
                 {
-                    Type = "json_schema",
                     JsonSchema = new() { Name = "response", Schema = schema.RootElement },
                 }));
             Assert.Contains(message, error.Message);

dotnet/test/Unit/ClientSessionLifetimeTests.cs

@@ -2489,6 +2489,7 @@ public Task SendSessionEventAsync(string sessionId, string type, Dictionary<stri
                 ["id"] = Guid.NewGuid().ToString(),
                 ["timestamp"] = DateTimeOffset.UtcNow.ToString("O"),
                 ["parentId"] = null,
+                ["agentId"] = agentId,
                 ["type"] = type,
                 ["data"] = data
             };

dotnet/test/Unit/StructuredOutputTests.cs

@@ -22,9 +22,8 @@ public async Task StructuredOutput_Raw_Format_Is_Forwarded_Without_Rewriting(str
         await using var client = new CopilotClient(new CopilotClientOptions { Connection = RuntimeConnection.ForUri(server.Url) });
         await using var session = await client.CreateSessionAsync(new SessionConfig());
         using var document = JsonDocument.Parse("""{"type":"object","properties":{"value":{"type":"integer"}},"x-provider":{"anything":[true,42,null]}}""");
-        var format = new ResponseFormat
+        var format = new ResponseFormatJsonSchema
         {
-            Type = "json_schema",
             JsonSchema = new JsonSchemaResponseFormat
             {
                 Name = "answer",

nodejs/src/types.ts

@@ -89,7 +89,6 @@ export type { SessionFsSqliteStatement } from "./sessionFsProvider.js";
 export type { SessionFsSqliteTransactionErrorClass } from "./sessionFsProvider.js";
 export { SessionFsSqliteTransactionFailure } from "./sessionFsProvider.js";
 export type { LlmInferenceHeaders } from "./generated/rpc.js";
-export type { PermissionDecisionSource } from "./generated/session-events.js";
 export type {
     PermissionDecisionContext,
     PermissionDecisionOutcome,

scripts/codegen/csharp.test.ts

@@ -50,13 +50,15 @@ for (const keyword of ["anyOf", "oneOf"] as const) {
             },
         });
 
-        assert.match(code, /public sealed class ResponseFormat\b/);
+        assert.match(code, /public partial class ResponseFormat\b/);
+        assert.match(code, /public partial class ResponseFormatJsonSchema : ResponseFormat/);
+        assert.match(code, /\[JsonDerivedType\(typeof\(ResponseFormatJsonSchema\), "json_schema"\)\]/);
         assert.match(code, /A provider-native output format\./);
         assert.match(code, /public ResponseFormat\? ResponseFormat/);
         assert.match(code, /public ResponseFormat RequiredFormat/);
-        assert.match(code, /public JsonSchemaResponseFormat JsonSchema/);
+        assert.match(code, /public required JsonSchemaResponseFormat JsonSchema/);
         assert.match(code, /public JsonElement Schema/);
         assert.match(code, /public bool\? Strict/);
-        assert.equal(code.match(/public sealed class ResponseFormat\b/g)?.length, 1);
+        assert.equal(code.match(/public partial class ResponseFormat\b/g)?.length, 1);
     });
 }