@@ -2114,7 +2114,7 @@ interface ThreadFeedBuild {
21142114 readonly attempts : ReadonlyArray < OrchestrationV2RunAttempt > | undefined ;
21152115 readonly nodes : ReadonlyArray < OrchestrationV2ExecutionNode > | undefined ;
21162116 readonly checkpointSummaries : ReadonlyArray < ThreadCheckpointSummary > | undefined ;
2117- readonly foldedAnswerMessageIds : ReadonlySet < string > ;
2117+ readonly foldedAnswerRunIdByMessageId : ReadonlyMap < string , RunId | null > ;
21182118 readonly delegatedChildrenByRun : ReadonlyMap < RunId , ReadonlySet < string > > ;
21192119 readonly feed : ReadonlyArray < ThreadFeedEntry > ;
21202120 /** Grouping is empty before `row`: the rows before it produced `feed.slice(0, feedLength)`. */
@@ -2164,6 +2164,14 @@ function checkpointSummariesEqual(
21642164 } ) ;
21652165}
21662166
2167+ function mapsEqual < K , V > ( left : ReadonlyMap < K , V > , right : ReadonlyMap < K , V > ) : boolean {
2168+ if ( left . size !== right . size ) return false ;
2169+ for ( const [ key , value ] of left ) {
2170+ if ( ! right . has ( key ) || right . get ( key ) !== value ) return false ;
2171+ }
2172+ return true ;
2173+ }
2174+
21672175function setMapsEqual < K , V > (
21682176 left : ReadonlyMap < K , ReadonlySet < V > > ,
21692177 right : ReadonlyMap < K , ReadonlySet < V > > ,
@@ -2217,11 +2225,12 @@ export function buildThreadFeed(
22172225 } ;
22182226 // Thread-wide facts that change rows anywhere in the feed. A cached prefix
22192227 // is reused only while these match the build that produced it.
2220- const foldedAnswerMessageIds = new Set < string > ( ) ;
2228+ // An answer that started a later run stays a normal message at that run's position.
2229+ const foldedAnswerRunIdByMessageId = new Map < string , RunId | null > ( ) ;
22212230 const delegatedChildrenByRun = new Map < RunId , Set < string > > ( ) ;
22222231 for ( const { item } of visibleTurnItems ) {
22232232 if ( item . type === "user_input_request" && item . questionAnswer ) {
2224- foldedAnswerMessageIds . add ( `async-answer:${ item . questionAnswer . requestId } ` ) ;
2233+ foldedAnswerRunIdByMessageId . set ( `async-answer:${ item . questionAnswer . requestId } ` , item . runId ) ;
22252234 } else if ( item . type === "subagent" && item . origin === "app_owned" && item . runId !== null ) {
22262235 const children = delegatedChildrenByRun . get ( item . runId ) ?? new Set < string > ( ) ;
22272236 children . add ( item . subagentId ) ;
@@ -2238,7 +2247,7 @@ export function buildThreadFeed(
22382247 previous . attempts === options ?. attempts &&
22392248 previous . nodes === options ?. nodes &&
22402249 checkpointSummariesEqual ( previous . checkpointSummaries , options ?. checkpointSummaries ) &&
2241- setsEqual ( previous . foldedAnswerMessageIds , foldedAnswerMessageIds ) &&
2250+ mapsEqual ( previous . foldedAnswerRunIdByMessageId , foldedAnswerRunIdByMessageId ) &&
22422251 setMapsEqual ( previous . delegatedChildrenByRun , delegatedChildrenByRun )
22432252 ) {
22442253 const firstChanged = firstChangedIndex ( previous . rows , visibleTurnItems ) ;
@@ -2276,7 +2285,11 @@ export function buildThreadFeed(
22762285 item . status === "pending"
22772286 )
22782287 continue ;
2279- if ( item . type === "user_message" && foldedAnswerMessageIds . has ( item . messageId ) ) continue ;
2288+ if (
2289+ item . type === "user_message" &&
2290+ foldedAnswerRunIdByMessageId . get ( item . messageId ) === item . runId
2291+ )
2292+ continue ;
22802293 if (
22812294 item . type === "run_interrupt_request" ||
22822295 ( item . type === "run_interrupt_result" &&
@@ -2377,7 +2390,7 @@ export function buildThreadFeed(
23772390 entryRows . push ( index ) ;
23782391 }
23792392 const retainedMessageIds = new Set ( [
2380- ...foldedAnswerMessageIds ,
2393+ ...foldedAnswerRunIdByMessageId . keys ( ) ,
23812394 ...entries . flatMap ( ( entry ) => ( entry . type === "message" ? [ entry . id ] : [ ] ) ) ,
23822395 ] ) ;
23832396 const appendLocalMessage = ( message : LocalThreadMessage ) : RawThreadFeedEntry => {
@@ -2446,7 +2459,7 @@ export function buildThreadFeed(
24462459 attempts : options ?. attempts ,
24472460 nodes : options ?. nodes ,
24482461 checkpointSummaries : options ?. checkpointSummaries ,
2449- foldedAnswerMessageIds ,
2462+ foldedAnswerRunIdByMessageId ,
24502463 delegatedChildrenByRun,
24512464 feed,
24522465 restarts,
0 commit comments