Skip to content

Commit 501cae3

Browse files
committed
fix: split mixed tool result message ids
1 parent 5e01d3e commit 501cae3

2 files changed

Lines changed: 52 additions & 10 deletions

File tree

‎dotnet/src/Microsoft.Agents.AI.AGUI/Shared/ChatResponseUpdateAGUIExtensions.cs‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,7 @@ public static async IAsyncEnumerable<BaseEvent> AsAGUIEventStreamAsync(
458458
// This ensures all AGUI events have a valid messageId regardless of agent type.
459459
if (string.IsNullOrWhiteSpace(chatResponse.MessageId))
460460
{
461-
chatResponse.MessageId = ContainsOnlyToolResults(chatResponse)
461+
chatResponse.MessageId = ContainsToolResult(chatResponse)
462462
? Guid.NewGuid().ToString("N")
463463
: (streamingMessageId ??= Guid.NewGuid().ToString("N"));
464464
}
@@ -727,21 +727,16 @@ chatResponse.Contents[0] is TextContent &&
727727
};
728728
}
729729

730-
private static bool ContainsOnlyToolResults(ChatResponseUpdate chatResponse)
730+
private static bool ContainsToolResult(ChatResponseUpdate chatResponse)
731731
{
732-
if (chatResponse.Contents.Count == 0)
733-
{
734-
return false;
735-
}
736-
737732
foreach (AIContent content in chatResponse.Contents)
738733
{
739-
if (content is not FunctionResultContent)
734+
if (content is FunctionResultContent)
740735
{
741-
return false;
736+
return true;
742737
}
743738
}
744739

745-
return true;
740+
return false;
746741
}
747742
}

‎dotnet/tests/Microsoft.Agents.AI.AGUI.UnitTests/AGUIStreamingMessageIdTests.cs‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,53 @@ public async Task ToolResults_NullMessageId_GeneratesDistinctMessageIdAsync()
189189
Assert.NotEqual(textStart.MessageId, toolCallResult.MessageId);
190190
}
191191

192+
[Fact]
193+
public async Task ToolResults_WithTextContent_GeneratesDistinctMessageIdAsync()
194+
{
195+
FunctionCallContent functionCall = new("call_abc123", "GetWeather")
196+
{
197+
Arguments = new Dictionary<string, object?> { ["location"] = "San Francisco" }
198+
};
199+
200+
List<ChatResponseUpdate> providerUpdates =
201+
[
202+
new ChatResponseUpdate(ChatRole.Assistant, "Checking the weather"),
203+
new ChatResponseUpdate
204+
{
205+
Role = ChatRole.Assistant,
206+
Contents = [functionCall]
207+
},
208+
new ChatResponseUpdate
209+
{
210+
Role = ChatRole.Tool,
211+
Contents =
212+
[
213+
new TextContent("Tool says: "),
214+
new FunctionResultContent("call_abc123", "72F and sunny")
215+
]
216+
}
217+
];
218+
219+
List<BaseEvent> aguiEvents = [];
220+
await foreach (BaseEvent evt in providerUpdates.ToAsyncEnumerableAsync()
221+
.AsAGUIEventStreamAsync("thread-1", "run-1", AGUIJsonSerializerContext.Default.Options))
222+
{
223+
aguiEvents.Add(evt);
224+
}
225+
226+
TextMessageStartEvent[] textStarts = aguiEvents.OfType<TextMessageStartEvent>().ToArray();
227+
TextMessageContentEvent toolText = Assert.Single(
228+
aguiEvents.OfType<TextMessageContentEvent>(),
229+
content => content.Delta == "Tool says: ");
230+
ToolCallStartEvent toolCallStart = Assert.Single(aguiEvents.OfType<ToolCallStartEvent>());
231+
ToolCallResultEvent toolCallResult = Assert.Single(aguiEvents.OfType<ToolCallResultEvent>());
232+
233+
Assert.Equal(textStarts[0].MessageId, toolCallStart.ParentMessageId);
234+
Assert.NotEqual(textStarts[0].MessageId, toolCallResult.MessageId);
235+
Assert.Equal(toolCallResult.MessageId, toolText.MessageId);
236+
Assert.Equal(textStarts[^1].MessageId, toolCallResult.MessageId);
237+
}
238+
192239
/// <summary>
193240
/// When a provider properly sets MessageId (e.g., OpenAI), the AGUI pipeline
194241
/// produces valid events with correct messageId values.

0 commit comments

Comments
 (0)