Skip to content

.NET: Make ChatMessageStore and AIContextProvider context props settable #3196

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
westey-m merged 4 commits into from
Jan 13, 2026
+8 −8
Merged

.NET: Make ChatMessageStore and AIContextProvider context props settable #3196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ad49827
Make ChatMessageStore and AIContextProvider context props setable
westey-m Jan 13, 2026
b4f4b12
Add validation to preserve non-null requirement of certain properties.
westey-m Jan 13, 2026
7e46274
Merge branch 'main' into context-props-settable
westey-m Jan 13, 2026
f48aa2d
Fix broken tests.
westey-m Jan 13, 2026
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
6 changes: 3 additions & 3 deletions dotnet/src/Microsoft.Agents.AI.Abstractions/AIContextProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ public InvokingContext(IEnumerable<ChatMessage> requestMessages)
/// <value>
/// A collection of <see cref="ChatMessage"/> instances representing new messages that were provided by the caller.
/// </value>
public IEnumerable<ChatMessage> RequestMessages { get; }
public IEnumerable<ChatMessage> RequestMessages { get; set { field = Throw.IfNull(value); } }
}

/// <summary>
Expand Down Expand Up @@ -174,7 +174,7 @@ public InvokedContext(IEnumerable<ChatMessage> requestMessages, IEnumerable<Chat
/// A collection of <see cref="ChatMessage"/> instances representing new messages that were provided by the caller.
/// This does not include any <see cref="AIContextProvider"/> supplied messages.
/// </value>
public IEnumerable<ChatMessage> RequestMessages { get; }
public IEnumerable<ChatMessage> RequestMessages { get; set { field = Throw.IfNull(value); } }

/// <summary>
/// Gets the messages provided by the <see cref="AIContextProvider"/> for this invocation, if any.
Expand All @@ -183,7 +183,7 @@ public InvokedContext(IEnumerable<ChatMessage> requestMessages, IEnumerable<Chat
/// A collection of <see cref="ChatMessage"/> instances that were provided by the <see cref="AIContextProvider"/>,
/// and were used by the agent as part of the invocation.
/// </value>
public IEnumerable<ChatMessage>? AIContextProviderMessages { get; }
public IEnumerable<ChatMessage>? AIContextProviderMessages { get; set; }

/// <summary>
/// Gets the collection of response messages generated during this invocation if the invocation succeeded.
Expand Down
8 changes: 4 additions & 4 deletions dotnet/src/Microsoft.Agents.AI.Abstractions/ChatMessageStore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ public InvokingContext(IEnumerable<ChatMessage> requestMessages)
/// <value>
/// A collection of <see cref="ChatMessage"/> instances representing new messages that were provided by the caller.
/// </value>
public IEnumerable<ChatMessage> RequestMessages { get; }
public IEnumerable<ChatMessage> RequestMessages { get; set { field = Throw.IfNull(value); } }
}

/// <summary>
Expand All @@ -174,7 +174,7 @@ public sealed class InvokedContext
public InvokedContext(IEnumerable<ChatMessage> requestMessages, IEnumerable<ChatMessage> chatMessageStoreMessages)
{
this.RequestMessages = Throw.IfNull(requestMessages);
this.ChatMessageStoreMessages = chatMessageStoreMessages;
this.ChatMessageStoreMessages = Throw.IfNull(chatMessageStoreMessages);
}

/// <summary>
Expand All @@ -184,7 +184,7 @@ public InvokedContext(IEnumerable<ChatMessage> requestMessages, IEnumerable<Chat
/// A collection of <see cref="ChatMessage"/> instances representing new messages that were provided by the caller.
/// This does not include any <see cref="ChatMessageStore"/> supplied messages.
/// </value>
public IEnumerable<ChatMessage> RequestMessages { get; }
public IEnumerable<ChatMessage> RequestMessages { get; set { field = Throw.IfNull(value); } }

/// <summary>
/// Gets the messages retrieved from the <see cref="ChatMessageStore"/> for this invocation, if any.
Expand All @@ -193,7 +193,7 @@ public InvokedContext(IEnumerable<ChatMessage> requestMessages, IEnumerable<Chat
/// A collection of <see cref="ChatMessage"/> instances that were retrieved from the <see cref="ChatMessageStore"/>,
/// and were used by the agent as part of the invocation.
/// </value>
public IEnumerable<ChatMessage> ChatMessageStoreMessages { get; }
public IEnumerable<ChatMessage> ChatMessageStoreMessages { get; set { field = Throw.IfNull(value); } }

/// <summary>
/// Gets or sets the messages provided by the <see cref="AIContextProvider"/> for this invocation, if any.
Expand Down
2 changes: 1 addition & 1 deletion dotnet/src/Microsoft.Agents.AI/ChatClient/ChatClientAgent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -692,7 +692,7 @@ private async Task

List<ChatMessage> inputMessagesForChatClient = [];
IList<ChatMessage>? aiContextProviderMessages = null;
IList<ChatMessage>? chatMessageStoreMessages = null;
IList<ChatMessage>? chatMessageStoreMessages = [];
Copy link

@nanny07 nanny07 Jan 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The nullable notation should be removed... right?

Copy link
Contributor Author

@westey-m westey-m Jan 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes true, it's not required anymore, I can fix in a follow up PR. Thanks!


// Populate the thread messages only if we are not continuing an existing response as it's not allowed
if (chatOptions?.ContinuationToken is null)
Expand Down
Loading