Fix generated type collisions after Copilot update

Remove handwritten ContextTier definitions now owned by generated schema types, update Attachment type references, and keep generated outputs in sync.

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

Author: stephentoub

docs/features/image-input.md

@@ -120,7 +120,7 @@ func main() {
 	session.Send(ctx, copilot.MessageOptions{
 		Prompt: "Describe what you see in this image",
 		Attachments: []copilot.Attachment{
-            &copilot.UserMessageAttachmentFile{
+            &copilot.AttachmentFile{
                 DisplayName: "screenshot.png",
                 Path:        path,
 			},
@@ -146,7 +146,7 @@ path := "/absolute/path/to/screenshot.png"
 session.Send(ctx, copilot.MessageOptions{
     Prompt: "Describe what you see in this image",
     Attachments: []copilot.Attachment{
-        &copilot.UserMessageAttachmentFile{
+        &copilot.AttachmentFile{
             DisplayName: "screenshot.png",
             Path:        path,
         },
@@ -179,9 +179,9 @@ public static class ImageInputExample
         await session.SendAsync(new MessageOptions
         {
             Prompt = "Describe what you see in this image",
-            Attachments = new List<UserMessageAttachment>
+            Attachments = new List<Attachment>
             {
-                new UserMessageAttachmentFile
+                new AttachmentFile
                 {
                     Path = "/absolute/path/to/screenshot.png",
                     DisplayName = "screenshot.png",
@@ -208,9 +208,9 @@ await using var session = await client.CreateSessionAsync(new SessionConfig
 await session.SendAsync(new MessageOptions
 {
     Prompt = "Describe what you see in this image",
-    Attachments = new List<UserMessageAttachment>
+    Attachments = new List<Attachment>
     {
-        new UserMessageAttachmentFile
+        new AttachmentFile
         {
             Path = "/absolute/path/to/screenshot.png",
             DisplayName = "screenshot.png",
@@ -344,7 +344,7 @@ func main() {
 	session.Send(ctx, copilot.MessageOptions{
 		Prompt: "Describe what you see in this image",
 		Attachments: []copilot.Attachment{
-            &copilot.UserMessageAttachmentBlob{
+            &copilot.AttachmentBlob{
                 Data:        base64ImageData,
                 MIMEType:    mimeType,
 				DisplayName: &displayName,
@@ -361,7 +361,7 @@ displayName := "screenshot.png"
 session.Send(ctx, copilot.MessageOptions{
     Prompt: "Describe what you see in this image",
     Attachments: []copilot.Attachment{
-        &copilot.UserMessageAttachmentBlob{
+        &copilot.AttachmentBlob{
             Data:        base64ImageData, // base64-encoded string
             MIMEType:    mimeType,
             DisplayName: &displayName,
@@ -396,9 +396,9 @@ public static class BlobAttachmentExample
         await session.SendAsync(new MessageOptions
         {
             Prompt = "Describe what you see in this image",
-            Attachments = new List<UserMessageAttachment>
+            Attachments = new List<Attachment>
             {
-                new UserMessageAttachmentBlob
+                new AttachmentBlob
                 {
                     Data = base64ImageData,
                     MimeType = "image/png",
@@ -415,9 +415,9 @@ public static class BlobAttachmentExample
 await session.SendAsync(new MessageOptions
 {
     Prompt = "Describe what you see in this image",
-    Attachments = new List<UserMessageAttachment>
+    Attachments = new List<Attachment>
     {
-        new UserMessageAttachmentBlob
+        new AttachmentBlob
         {
             Data = base64ImageData,
             MimeType = "image/png",

dotnet/src/Session.cs

@@ -1705,7 +1705,7 @@ internal record SendMessageRequest
         public string SessionId { get; init; } = string.Empty;
         public string Prompt { get; init; } = string.Empty;
         public string? DisplayPrompt { get; init; }
-        public IList<UserMessageAttachment>? Attachments { get; init; }
+        public IList<Attachment>? Attachments { get; init; }
         public string? Mode { get; init; }
         [JsonPropertyName("agentMode")]
         public AgentMode? AgentMode { get; init; }
@@ -1776,7 +1776,7 @@ internal void ThrowIfDisposed()
     [JsonSerializable(typeof(SessionStartHookOutput))]
     [JsonSerializable(typeof(SystemMessageTransformRpcResponse))]
     [JsonSerializable(typeof(SystemMessageTransformSection))]
-    [JsonSerializable(typeof(UserMessageAttachment))]
+    [JsonSerializable(typeof(Attachment))]
     [JsonSerializable(typeof(UserPromptSubmittedHookInput))]
     [JsonSerializable(typeof(UserPromptSubmittedHookOutput))]
     internal partial class SessionJsonContext : JsonSerializerContext;

dotnet/src/Types.cs

@@ -2390,65 +2390,6 @@ public sealed class CloudSessionOptions
     public CloudSessionRepository? Repository { get; set; }
 }
 
-/// <summary>
-/// Context window tier for models that support tiered context windows.
-/// </summary>
-[JsonConverter(typeof(ContextTier.Converter))]
-[DebuggerDisplay("{Value,nq}")]
-public readonly struct ContextTier : IEquatable<ContextTier>
-{
-    private readonly string? _value;
-
-    /// <summary>Initializes a new instance of the <see cref="ContextTier"/> struct.</summary>
-    /// <param name="value">The value to associate with this <see cref="ContextTier"/>.</param>
-    [JsonConstructor]
-    public ContextTier(string value)
-    {
-        ArgumentException.ThrowIfNullOrWhiteSpace(value);
-        _value = value;
-    }
-
-    /// <summary>Gets the value associated with this <see cref="ContextTier"/>.</summary>
-    public string Value => _value ?? string.Empty;
-
-    /// <summary>Default context tier with standard context window size.</summary>
-    public static ContextTier Default { get; } = new("default");
-
-    /// <summary>Extended context tier with a larger context window.</summary>
-    public static ContextTier LongContext { get; } = new("long_context");
-
-    /// <summary>Returns a value indicating whether two <see cref="ContextTier"/> instances are equivalent.</summary>
-    public static bool operator ==(ContextTier left, ContextTier right) => left.Equals(right);
-
-    /// <summary>Returns a value indicating whether two <see cref="ContextTier"/> instances are not equivalent.</summary>
-    public static bool operator !=(ContextTier left, ContextTier right) => !left.Equals(right);
-
-    /// <inheritdoc/>
-    public override bool Equals([NotNullWhen(true)] object? obj) => obj is ContextTier other && Equals(other);
-
-    /// <inheritdoc/>
-    public bool Equals(ContextTier other) => string.Equals(Value, other.Value, StringComparison.OrdinalIgnoreCase);
-
-    /// <inheritdoc/>
-    public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Value);
-
-    /// <inheritdoc/>
-    public override string ToString() => Value;
-
-    /// <summary>Provides a <see cref="JsonConverter{ContextTier}"/> for serializing <see cref="ContextTier"/> instances.</summary>
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public sealed class Converter : JsonConverter<ContextTier>
-    {
-        /// <inheritdoc/>
-        public override ContextTier Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) =>
-            new(GeneratedStringEnumJson.ReadValue(ref reader, typeToConvert));
-
-        /// <inheritdoc/>
-        public override void Write(Utf8JsonWriter writer, ContextTier value, JsonSerializerOptions options) =>
-            GeneratedStringEnumJson.WriteValue(writer, value.Value, typeof(ContextTier));
-    }
-}
-
 /// <summary>
 /// Shared configuration properties for creating or resuming a Copilot session.
 /// Use <see cref="SessionConfig"/> when creating a new session, or
@@ -3058,7 +2999,7 @@ private MessageOptions(MessageOptions? other)
     /// <summary>
     /// File or data attachments to include with the message.
     /// </summary>
-    public IList<UserMessageAttachment>? Attachments { get; set; }
+    public IList<Attachment>? Attachments { get; set; }
     /// <summary>
     /// How to deliver the message. <c>"enqueue"</c> (default) appends to the message queue;
     /// <c>"immediate"</c> interjects during an in-progress turn.

dotnet/test/E2E/SessionConfigE2ETests.cs

@@ -492,7 +492,7 @@ await session.SendAndWaitAsync(new MessageOptions
             Prompt = "What color is this pixel? Reply in one word.",
             Attachments =
             [
-                new UserMessageAttachmentBlob
+                new AttachmentBlob
                 {
                     Data = pngBase64,
                     MimeType = "image/png",
@@ -517,7 +517,7 @@ await session.SendAndWaitAsync(new MessageOptions
             Prompt = "Summarize the attached file",
             Attachments =
             [
-                new UserMessageAttachmentFile
+                new AttachmentFile
                 {
                     Path = attachedPath,
                     DisplayName = "attached.txt",

dotnet/test/E2E/SessionE2ETests.cs

@@ -715,7 +715,7 @@ await session.SendAndWaitAsync(new MessageOptions
             Prompt = "Describe this image",
             Attachments =
             [
-                new UserMessageAttachmentBlob
+                new AttachmentBlob
                 {
                     Data = pngBase64,
                     MimeType = "image/png",
@@ -740,17 +740,17 @@ await session.SendAndWaitAsync(new MessageOptions
             Prompt = "Read the attached file and reply with its contents.",
             Attachments =
             [
-                new UserMessageAttachmentFile
+                new AttachmentFile
                 {
                     DisplayName = "attached-file.txt",
                     Path = filePath,
-                    LineRange = new UserMessageAttachmentFileLineRange { Start = 1, End = 1 },
+                    LineRange = new AttachmentFileLineRange { Start = 1, End = 1 },
                 },
             ],
         });
 
         var userMessage = (await session.GetEventsAsync()).OfType<UserMessageEvent>().Last();
-        var attachment = Assert.IsType<UserMessageAttachmentFile>(Assert.Single(userMessage.Data.Attachments!));
+        var attachment = Assert.IsType<AttachmentFile>(Assert.Single(userMessage.Data.Attachments!));
         Assert.Equal("attached-file.txt", attachment.DisplayName);
         Assert.Equal(filePath, attachment.Path);
         Assert.Equal(1, attachment.LineRange!.Start);
@@ -771,7 +771,7 @@ await session.SendAndWaitAsync(new MessageOptions
             Prompt = "List the attached directory.",
             Attachments =
             [
-                new UserMessageAttachmentDirectory
+                new AttachmentDirectory
                 {
                     DisplayName = "attached-directory",
                     Path = directoryPath,
@@ -780,7 +780,7 @@ await session.SendAndWaitAsync(new MessageOptions
         });
 
         var userMessage = (await session.GetEventsAsync()).OfType<UserMessageEvent>().Last();
-        var attachment = Assert.IsType<UserMessageAttachmentDirectory>(Assert.Single(userMessage.Data.Attachments!));
+        var attachment = Assert.IsType<AttachmentDirectory>(Assert.Single(userMessage.Data.Attachments!));
         Assert.Equal("attached-directory", attachment.DisplayName);
         Assert.Equal(directoryPath, attachment.Path);
     }
@@ -798,22 +798,22 @@ await session.SendAndWaitAsync(new MessageOptions
             Prompt = "Summarize the selected code.",
             Attachments =
             [
-                new UserMessageAttachmentSelection
+                new AttachmentSelection
                 {
                     DisplayName = "selected-file.cs",
                     FilePath = filePath,
                     Text = "string Value = \"SELECTION_SENTINEL\";",
-                    Selection = new UserMessageAttachmentSelectionDetails
+                    Selection = new AttachmentSelectionDetails
                     {
-                        Start = new UserMessageAttachmentSelectionDetailsStart { Line = 1, Character = 10 },
-                        End = new UserMessageAttachmentSelectionDetailsEnd { Line = 1, Character = 45 },
+                        Start = new AttachmentSelectionDetailsStart { Line = 1, Character = 10 },
+                        End = new AttachmentSelectionDetailsEnd { Line = 1, Character = 45 },
                     },
                 },
             ],
         });
 
         var userMessage = (await session.GetEventsAsync()).OfType<UserMessageEvent>().Last();
-        var attachment = Assert.IsType<UserMessageAttachmentSelection>(Assert.Single(userMessage.Data.Attachments!));
+        var attachment = Assert.IsType<AttachmentSelection>(Assert.Single(userMessage.Data.Attachments!));
         Assert.Equal("selected-file.cs", attachment.DisplayName);
         Assert.Equal(filePath, attachment.FilePath);
         Assert.Equal("string Value = \"SELECTION_SENTINEL\";", attachment.Text);
@@ -833,10 +833,10 @@ await session.SendAndWaitAsync(new MessageOptions
             Prompt = "Using only the GitHub reference metadata in this message, summarize the reference. Do not call any tools.",
             Attachments =
             [
-                new UserMessageAttachmentGithubReference
+                new AttachmentGithubReference
                 {
                     Number = 1234,
-                    ReferenceType = UserMessageAttachmentGithubReferenceType.Issue,
+                    ReferenceType = AttachmentGithubReferenceType.Issue,
                     State = "open",
                     Title = "Add E2E attachment coverage",
                     Url = "https://github.com/github/copilot-sdk/issues/1234",
@@ -845,9 +845,9 @@ await session.SendAndWaitAsync(new MessageOptions
         });
 
         var userMessage = (await session.GetEventsAsync()).OfType<UserMessageEvent>().Last();
-        var attachment = Assert.IsType<UserMessageAttachmentGithubReference>(Assert.Single(userMessage.Data.Attachments!));
+        var attachment = Assert.IsType<AttachmentGithubReference>(Assert.Single(userMessage.Data.Attachments!));
         Assert.Equal(1234, attachment.Number);
-        Assert.Equal(UserMessageAttachmentGithubReferenceType.Issue, attachment.ReferenceType);
+        Assert.Equal(AttachmentGithubReferenceType.Issue, attachment.ReferenceType);
         Assert.Equal("open", attachment.State);
         Assert.Equal("Add E2E attachment coverage", attachment.Title);
         Assert.Equal("https://github.com/github/copilot-sdk/issues/1234", attachment.Url);

dotnet/test/Unit/CloneTests.cs

@@ -231,7 +231,7 @@ public void MessageOptions_Clone_CopiesAllProperties()
         var original = new MessageOptions
         {
             Prompt = "Hello",
-            Attachments = [new UserMessageAttachmentFile { Path = "/test.txt", DisplayName = "test.txt" }],
+            Attachments = [new AttachmentFile { Path = "/test.txt", DisplayName = "test.txt" }],
             Mode = "chat",
         };
 
@@ -247,12 +247,12 @@ public void MessageOptions_Clone_AttachmentsAreIndependent()
     {
         var original = new MessageOptions
         {
-            Attachments = [new UserMessageAttachmentFile { Path = "/test.txt", DisplayName = "test.txt" }],
+            Attachments = [new AttachmentFile { Path = "/test.txt", DisplayName = "test.txt" }],
         };
 
         var clone = original.Clone();
 
-        clone.Attachments!.Add(new UserMessageAttachmentFile { Path = "/other.txt", DisplayName = "other.txt" });
+        clone.Attachments!.Add(new AttachmentFile { Path = "/other.txt", DisplayName = "other.txt" });
 
         Assert.Single(original.Attachments!);
     }

go/README.md

@@ -253,7 +253,7 @@ The SDK supports image attachments via the `Attachments` field in `MessageOption
 _, err = session.Send(context.Background(), copilot.MessageOptions{
     Prompt: "What's in this image?",
     Attachments: []copilot.Attachment{
-        &copilot.UserMessageAttachmentFile{
+        &copilot.AttachmentFile{
             DisplayName: "image.jpg",
             Path:        "/path/to/image.jpg",
         },
@@ -265,7 +265,7 @@ mimeType := "image/png"
 _, err = session.Send(context.Background(), copilot.MessageOptions{
     Prompt: "What's in this image?",
     Attachments: []copilot.Attachment{
-        &copilot.UserMessageAttachmentBlob{
+        &copilot.AttachmentBlob{
             Data:     base64ImageData,
             MIMEType: mimeType,
         },

go/internal/e2e/rpc_event_log_e2e_test.go

@@ -29,7 +29,7 @@ func TestRpcEventLogE2E(t *testing.T) {
 		waitForRPCCondition(t, rpcEventLogTimeout, "persisted session.plan_changed event", func() (bool, error) {
 			var err error
 			read, err = session.RPC.EventLog.Read(t.Context(), &rpc.EventLogReadRequest{
-				Max:    rpcPtr(int32(100)),
+				Max:    rpcPtr(int64(100)),
 				WaitMs: rpcPtr(int32(0)),
 			})
 			if err != nil {
@@ -67,7 +67,7 @@ func TestRpcEventLogE2E(t *testing.T) {
 			}
 			read, err = session.RPC.EventLog.Read(t.Context(), &rpc.EventLogReadRequest{
 				Cursor: &tail.Cursor,
-				Max:    rpcPtr(int32(10)),
+				Max:    rpcPtr(int64(10)),
 				WaitMs: rpcPtr(int32(0)),
 			})
 			return err == nil && read.CursorStatus == rpc.EventsCursorStatusOk && len(read.Events) == 0, err
@@ -131,7 +131,7 @@ func TestRpcEventLogE2E(t *testing.T) {
 			go func() {
 				result, err := session.RPC.EventLog.Read(t.Context(), &rpc.EventLogReadRequest{
 					Cursor: &tail.Cursor,
-					Max:    rpcPtr(int32(10)),
+					Max:    rpcPtr(int64(10)),
 					WaitMs: rpcPtr(int32(5000)),
 					Types:  &rpc.EventLogTypes{StringArray: []string{string(copilot.SessionEventTypeSessionTitleChanged)}},
 				})