@@ -820,16 +820,18 @@ public async Task AsAGUIEventStreamAsync_WithReasoningContent_EmitsCorrectReason
820820 // Assert
821821 Assert . IsType < RunStartedEvent > ( outputEvents [ 0 ] ) ;
822822 var reasoningStart = Assert . IsType < ReasoningStartEvent > ( outputEvents [ 1 ] ) ;
823- Assert . Equal ( "reason1" , reasoningStart . MessageId ) ;
823+ var reasoningId = reasoningStart . MessageId ;
824+ Assert . NotEqual ( "reason1" , reasoningId ) ;
824825 var reasoningMessageStart = Assert . IsType < ReasoningMessageStartEvent > ( outputEvents [ 2 ] ) ;
825- Assert . Equal ( "reason1" , reasoningMessageStart . MessageId ) ;
826+ var reasoningMessageId = reasoningMessageStart . MessageId ;
827+ Assert . NotEqual ( reasoningId , reasoningMessageId ) ;
826828 var reasoningContent = Assert . IsType < ReasoningMessageContentEvent > ( outputEvents [ 3 ] ) ;
827- Assert . Equal ( "reason1" , reasoningContent . MessageId ) ;
829+ Assert . Equal ( reasoningMessageId , reasoningContent . MessageId ) ;
828830 Assert . Equal ( "I need to think about this" , reasoningContent . Delta ) ;
829831 var reasoningMessageEnd = Assert . IsType < ReasoningMessageEndEvent > ( outputEvents [ 4 ] ) ;
830- Assert . Equal ( "reason1" , reasoningMessageEnd . MessageId ) ;
832+ Assert . Equal ( reasoningMessageId , reasoningMessageEnd . MessageId ) ;
831833 var reasoningEnd = Assert . IsType < ReasoningEndEvent > ( outputEvents [ 5 ] ) ;
832- Assert . Equal ( "reason1" , reasoningEnd . MessageId ) ;
834+ Assert . Equal ( reasoningId , reasoningEnd . MessageId ) ;
833835 Assert . IsType < RunFinishedEvent > ( outputEvents [ 6 ] ) ;
834836 }
835837
@@ -880,8 +882,10 @@ public async Task AsAGUIEventStreamAsync_WithReasoningAndProtectedData_EmitsEncr
880882 }
881883
882884 // Assert
885+ var reasoningMessageId = outputEvents . OfType < ReasoningMessageStartEvent > ( ) . Single ( ) . MessageId ;
886+ Assert . NotEqual ( "reason1" , reasoningMessageId ) ;
883887 var encryptedEvent = outputEvents . OfType < ReasoningEncryptedValueEvent > ( ) . Single ( ) ;
884- Assert . Equal ( "reason1" , encryptedEvent . EntityId ) ;
888+ Assert . Equal ( reasoningMessageId , encryptedEvent . EntityId ) ;
885889 Assert . Equal ( "encrypted-abc" , encryptedEvent . EncryptedValue ) ;
886890 }
887891
@@ -911,6 +915,37 @@ public async Task AsAGUIEventStreamAsync_WithReasoningFollowedByText_EmitsBothEv
911915 Assert . Contains ( outputEvents , e => e is TextMessageEndEvent ) ;
912916 }
913917
918+ [ Fact ]
919+ public async Task AsAGUIEventStreamAsync_WithReasoningAndTextSharingSameMessageId_EmitsDistinctEventIdsAsync ( )
920+ {
921+ // Arrange
922+ List < ChatResponseUpdate > updates =
923+ [
924+ new ( ChatRole . Assistant , [ new TextReasoningContent ( "thinking" ) ] ) { MessageId = "shared1" } ,
925+ new ( ChatRole . Assistant , [ new TextContent ( "Hello" ) ] ) { MessageId = "shared1" }
926+ ] ;
927+
928+ // Act
929+ List < BaseEvent > outputEvents = [ ] ;
930+ await foreach ( BaseEvent evt in updates . ToAsyncEnumerableAsync ( ) . AsAGUIEventStreamAsync ( "thread1" , "run1" , AGUIJsonSerializerContext . Default . Options ) )
931+ {
932+ outputEvents . Add ( evt ) ;
933+ }
934+
935+ // Assert
936+ var reasoningId = outputEvents . OfType < ReasoningStartEvent > ( ) . Single ( ) . MessageId ;
937+ var reasoningMessageId = outputEvents . OfType < ReasoningMessageStartEvent > ( ) . Single ( ) . MessageId ;
938+ var textMessageId = outputEvents . OfType < TextMessageStartEvent > ( ) . Single ( ) . MessageId ;
939+ Assert . NotEqual ( reasoningId , reasoningMessageId ) ;
940+ Assert . NotEqual ( reasoningId , textMessageId ) ;
941+ Assert . NotEqual ( reasoningMessageId , textMessageId ) ;
942+ Assert . Equal ( "shared1" , textMessageId ) ;
943+ Assert . All ( outputEvents . OfType < ReasoningMessageContentEvent > ( ) , e => Assert . Equal ( reasoningMessageId , e . MessageId ) ) ;
944+ Assert . Equal ( reasoningMessageId , outputEvents . OfType < ReasoningMessageEndEvent > ( ) . Single ( ) . MessageId ) ;
945+ Assert . Equal ( reasoningId , outputEvents . OfType < ReasoningEndEvent > ( ) . Single ( ) . MessageId ) ;
946+ Assert . All ( outputEvents . OfType < TextMessageContentEvent > ( ) , e => Assert . Equal ( "shared1" , e . MessageId ) ) ;
947+ }
948+
914949 [ Fact ]
915950 public async Task AsChatResponseUpdatesAsync_WithReasoningMessageSequence_ProducesTextReasoningContentPerDeltaAsync ( )
916951 {
@@ -1089,12 +1124,14 @@ public async Task AsAGUIEventStreamAsync_WithProtectedDataOnly_EmitsEncryptedVal
10891124 outputEvents . Add ( evt ) ;
10901125 }
10911126
1092- // Assert — encrypted value should not be silently dropped
1127+ // Assert
10931128 Assert . Contains ( outputEvents , e => e is ReasoningStartEvent ) ;
10941129 Assert . Contains ( outputEvents , e => e is ReasoningMessageStartEvent ) ;
10951130 Assert . DoesNotContain ( outputEvents , e => e is ReasoningMessageContentEvent ) ;
1131+ var reasoningMessageId = outputEvents . OfType < ReasoningMessageStartEvent > ( ) . Single ( ) . MessageId ;
1132+ Assert . NotEqual ( "reason1" , reasoningMessageId ) ;
10961133 var encryptedEvent = outputEvents . OfType < ReasoningEncryptedValueEvent > ( ) . Single ( ) ;
1097- Assert . Equal ( "reason1" , encryptedEvent . EntityId ) ;
1134+ Assert . Equal ( reasoningMessageId , encryptedEvent . EntityId ) ;
10981135 Assert . Equal ( "encrypted-only" , encryptedEvent . EncryptedValue ) ;
10991136 Assert . Contains ( outputEvents , e => e is ReasoningMessageEndEvent ) ;
11001137 Assert . Contains ( outputEvents , e => e is ReasoningEndEvent ) ;
0 commit comments