Skip to content

.NET: Fix message ordering inconsistency when using AIContextProvider #2659

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 11 commits into from
Jan 6, 2026
Merged

.NET: Fix message ordering inconsistency when using AIContextProvider #2659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
456960e
Initial plan
Copilot Dec 5, 2025
de2a720
Fix message ordering inconsistency when using AIContextProvider
Copilot Dec 5, 2025
308158c
Revert to original message ordering: Input, AIContextProvider, Response
Copilot Dec 5, 2025
a749f19
Reorder messages to ChatClient to match MessageStore order: Existing,…
Copilot Dec 5, 2025
9f28cfc
Remove redundant test methods as existing tests already verify the be…
Copilot Dec 5, 2025
8c1f00d
Merge branch 'main' into copilot/fix-message-ordering-issue
westey-m Dec 5, 2025
c735840
Merge branch 'main' into copilot/fix-message-ordering-issue
markwallace-microsoft Dec 10, 2025
41c5ac9
Merge branch 'main' into copilot/fix-message-ordering-issue
crickman Dec 11, 2025
92c3f21
Merge branch 'main' into copilot/fix-message-ordering-issue
westey-m Dec 31, 2025
7a0d712
Merge branch 'main' into copilot/fix-message-ordering-issue
westey-m Jan 6, 2026
9c315f7
Merge branch 'main' into copilot/fix-message-ordering-issue
westey-m Jan 6, 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/ChatClient/ChatClientAgent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -662,6 +662,9 @@ private async Task
chatMessageStoreMessages = storeMessages as IList<ChatMessage> ?? storeMessages.ToList();
}

// Add the input messages before getting context from AIContextProvider.
inputMessagesForChatClient.AddRange(inputMessages);

// If we have an AIContextProvider, we should get context from it, and update our
// messages and options with the additional context.
if (typedThread.AIContextProvider is not null)
Expand Down Expand Up @@ -690,9 +693,6 @@ private async Task
chatOptions.Instructions = string.IsNullOrWhiteSpace(chatOptions.Instructions) ? aiContext.Instructions : $"{chatOptions.Instructions}\n{aiContext.Instructions}";
}
}

// Add the input messages to the end of thread messages.
inputMessagesForChatClient.AddRange(inputMessages);
}

// If a user provided two different thread ids, via the thread object and options, we should throw
Expand Down
20 changes: 10 additions & 10 deletions dotnet/tests/Microsoft.Agents.AI.UnitTests/ChatClient/ChatClientAgentTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -656,13 +656,13 @@ public async Task RunAsyncInvokesAIContextProviderAndUsesResultAsync()
await agent.RunAsync(requestMessages, thread);

// Assert
// Should contain: base instructions, context message, user message, base function, context function
// Should contain: base instructions, user message, context message, base function, context function
Assert.Equal(2, capturedMessages.Count);
Assert.Equal("base instructions\ncontext provider instructions", capturedInstructions);
Assert.Equal("context provider message", capturedMessages[0].Text);
Assert.Equal(ChatRole.System, capturedMessages[0].Role);
Assert.Equal("user message", capturedMessages[1].Text);
Assert.Equal(ChatRole.User, capturedMessages[1].Role);
Assert.Equal("user message", capturedMessages[0].Text);
Assert.Equal(ChatRole.User, capturedMessages[0].Role);
Assert.Equal("context provider message", capturedMessages[1].Text);
Assert.Equal(ChatRole.System, capturedMessages[1].Role);
Assert.Equal(2, capturedTools.Count);
Assert.Contains(capturedTools, t => t.Name == "base function");
Assert.Contains(capturedTools, t => t.Name == "context provider function");
Expand Down Expand Up @@ -2113,13 +2113,13 @@ public async Task RunStreamingAsyncInvokesAIContextProviderAndUsesResultAsync()
_ = await updates.ToAgentRunResponseAsync();

// Assert
// Should contain: base instructions, context message, user message, base function, context function
// Should contain: base instructions, user message, context message, base function, context function
Assert.Equal(2, capturedMessages.Count);
Assert.Equal("base instructions\ncontext provider instructions", capturedInstructions);
Assert.Equal("context provider message", capturedMessages[0].Text);
Assert.Equal(ChatRole.System, capturedMessages[0].Role);
Assert.Equal("user message", capturedMessages[1].Text);
Assert.Equal(ChatRole.User, capturedMessages[1].Role);
Assert.Equal("user message", capturedMessages[0].Text);
Assert.Equal(ChatRole.User, capturedMessages[0].Role);
Assert.Equal("context provider message", capturedMessages[1].Text);
Assert.Equal(ChatRole.System, capturedMessages[1].Role);
Assert.Equal(2, capturedTools.Count);
Assert.Contains(capturedTools, t => t.Name == "base function");
Assert.Contains(capturedTools, t => t.Name == "context provider function");
Expand Down
Loading