@@ -905,29 +905,23 @@ export function isStreamingTurnItemTextUpdate(
905905
906906/**
907907 * A changed tool or work item maps to exactly one entry with the item's id.
908- * Messages and question answers take part in cross-entry dedupe, so they rebuild.
908+ * Messages and question answers take part in cross-entry dedupe, and anchored
909+ * messages are placed by createdAt, so those changes rebuild.
909910 */
910- function rederivedNonMessageEntry (
911+ function canRederiveInPlace (
911912 input : TimelineEntriesInput ,
912913 previousItem : OrchestrationV2ProjectedTurnItem ,
913914 item : OrchestrationV2ProjectedTurnItem ,
914- ) : TimelineEntry | null {
915- if (
916- item . item . id !== previousItem . item . id ||
917- item . item . type !== previousItem . item . type ||
918- item . item . type === "user_message" ||
919- item . item . type === "assistant_message" ||
920- item . item . type === "user_input_request"
921- ) {
922- return null ;
923- }
924- const entries = deriveTimelineEntriesFromVisibleTurnItems ( {
925- ...input ,
926- visibleTurnItems : [ item ] ,
927- optimisticMessages : [ ] ,
928- anchoredMessages : [ ] ,
929- } ) ;
930- return entries . length === 1 && entries [ 0 ] ! . id === item . item . id ? entries [ 0 ] ! : null ;
915+ ) : boolean {
916+ return (
917+ item . item . id === previousItem . item . id &&
918+ item . item . type === previousItem . item . type &&
919+ item . item . type !== "user_message" &&
920+ item . item . type !== "assistant_message" &&
921+ item . item . type !== "user_input_request" &&
922+ ( ( input . anchoredMessages ?. length ?? 0 ) === 0 ||
923+ projectedItemCreatedAt ( item ) === projectedItemCreatedAt ( previousItem ) )
924+ ) ;
931925}
932926
933927function reuseTimelineEntries (
@@ -970,7 +964,7 @@ function reuseTimelineEntries(
970964 OrchestrationV2ProjectedTurnItem ,
971965 OrchestrationV2ProjectedTurnItem
972966 > ( ) ;
973- const rederivedEntries = new Map < string , TimelineEntry > ( ) ;
967+ const changedItems : OrchestrationV2ProjectedTurnItem [ ] = [ ] ;
974968 for ( let index = 0 ; index < before . visibleTurnItems . length ; index += 1 ) {
975969 const previousItem = before . visibleTurnItems [ index ] ! ;
976970 const item = input . visibleTurnItems [ index ] ! ;
@@ -979,19 +973,35 @@ function reuseTimelineEntries(
979973 replacements . set ( previousItem , item ) ;
980974 continue ;
981975 }
982- const entry = rederivedNonMessageEntry ( input , previousItem , item ) ;
983- if ( entry === null ) return null ;
984- rederivedEntries . set ( entry . id , entry ) ;
976+ if ( ! canRederiveInPlace ( input , previousItem , item ) ) return null ;
977+ changedItems . push ( item ) ;
978+ }
979+ // One batch keeps the attempt/node/plan lookups to a single build.
980+ const rederived =
981+ changedItems . length === 0
982+ ? [ ]
983+ : deriveTimelineEntriesFromVisibleTurnItems ( {
984+ ...input ,
985+ visibleTurnItems : changedItems ,
986+ optimisticMessages : [ ] ,
987+ anchoredMessages : [ ] ,
988+ } ) ;
989+ if (
990+ rederived . length !== changedItems . length ||
991+ rederived . some ( ( entry , index ) => entry . id !== changedItems [ index ] ! . item . id )
992+ ) {
993+ return null ;
985994 }
995+ const rederivedEntries = new Map ( rederived . map ( ( entry ) => [ entry . id , entry ] ) ) ;
986996 if ( replacements . size === 0 && rederivedEntries . size === 0 && ! appended ) {
987997 return previous . entries ;
988998 }
989999 let rederivedCount = 0 ;
9901000 const entries = previous . entries . map ( ( entry ) : TimelineEntry => {
991- const rederived = rederivedEntries . get ( entry . id ) ;
992- if ( rederived !== undefined ) {
1001+ const rederivedEntry = rederivedEntries . get ( entry . id ) ;
1002+ if ( rederivedEntry !== undefined ) {
9931003 rederivedCount += 1 ;
994- return rederived ;
1004+ return rederivedEntry ;
9951005 }
9961006 const row =
9971007 entry . kind === "message" && entry . projectedItem !== undefined
0 commit comments