@@ -2734,20 +2734,18 @@ describe("v2 run and attempt history", () => {
27342734 command ( "failed" , "failed" , 9 ) ,
27352735 message ( "final" , "assistant" , 20 ) ,
27362736 ] ;
2737+ const running = { runId, status : "running" as const , startedAt : at ( 0 ) , completedAt : null } ;
2738+ const ended = { ...running , turnEnded : true } ;
27372739 const rows = (
27382740 timelineEntries : ReadonlyArray < TimelineEntry > ,
2739- toolCallVisibility : "hideSuccessful" | "hideAll" | "finalAnswersOnly " ,
2740- isWorking = false ,
2741+ toolCallVisibility : "hideSuccessful" | "hideAll" | "zen " ,
2742+ latestRun ?: typeof ended | typeof running ,
27412743 ) =>
27422744 deriveMessagesTimelineRows ( {
27432745 timelineEntries,
27442746 expandedRunIds : new Set ( [ runId ] ) ,
2745- isWorking,
2746- ...( isWorking
2747- ? {
2748- latestRun : { runId, status : "running" as const , startedAt : at ( 0 ) , completedAt : null } ,
2749- }
2750- : { } ) ,
2747+ isWorking : latestRun !== undefined ,
2748+ ...( latestRun ? { latestRun } : { } ) ,
27512749 turnDiffSummaries : [ ] ,
27522750 supportsConversationRollback : false ,
27532751 toolCallVisibility,
@@ -2762,29 +2760,41 @@ describe("v2 run and attempt history", () => {
27622760 "final" ,
27632761 ] ) ;
27642762 expect ( rows ( [ user , failed , final ] , "hideAll" ) ) . toEqual ( [ "user" , "final" ] ) ;
2765- expect ( rows ( turn , "finalAnswersOnly " ) ) . toEqual ( [ "user" , "final" ] ) ;
2766- expect ( rows ( [ user , step , passed ] , "finalAnswersOnly " , true ) ) . toEqual ( [
2763+ expect ( rows ( turn , "zen " ) ) . toEqual ( [ "user" , "final" ] ) ;
2764+ expect ( rows ( [ user , step , passed ] , "zen " , running ) ) . toEqual ( [
27672765 "user" ,
27682766 "working-indicator-row" ,
27692767 "live-activity-row" ,
27702768 ] ) ;
27712769 expect ( liveAnswerPreview ( [ user , step , passed ] ) ) . toBe ( "step" ) ;
2772- expect (
2773- deriveMessagesTimelineRows ( {
2774- timelineEntries : turn ,
2775- isWorking : true ,
2776- latestRun : {
2777- runId,
2778- status : "running" ,
2779- startedAt : at ( 0 ) ,
2780- completedAt : null ,
2781- turnEnded : true ,
2782- } ,
2783- turnDiffSummaries : [ ] ,
2784- supportsConversationRollback : false ,
2785- toolCallVisibility : "finalAnswersOnly" ,
2786- } ) . map ( ( row ) => row . id ) ,
2787- ) . toEqual ( [ "user" , "final" ] ) ;
2770+ expect ( rows ( turn , "zen" , ended ) ) . toEqual ( [ "user" , "final" ] ) ;
2771+ const followUp = message ( "follow-up" , "user" , 30 ) ;
2772+ expect ( rows ( [ ...turn , followUp ] , "zen" , ended ) ) . toEqual ( [
2773+ "user" ,
2774+ "final" ,
2775+ "follow-up" ,
2776+ "working-indicator-row" ,
2777+ ] ) ;
2778+ const wake : TimelineEntry = {
2779+ id : "wake" ,
2780+ kind : "work" ,
2781+ createdAt : at ( 30 ) ,
2782+ entry : {
2783+ id : "wake" ,
2784+ createdAt : at ( 30 ) ,
2785+ runId : RunId . make ( "wake" ) ,
2786+ label : "Task finished" ,
2787+ tone : "info" ,
2788+ itemType : "notification" ,
2789+ } ,
2790+ } ;
2791+ expect ( rows ( [ user , final , wake ] , "zen" , { ...running , runId : RunId . make ( "wake" ) } ) ) . toEqual ( [
2792+ "user" ,
2793+ "final" ,
2794+ "wake" ,
2795+ "working-indicator-row" ,
2796+ "live-activity-row" ,
2797+ ] ) ;
27882798 } ) ;
27892799 it ( "collapses only output from a superseded V2 attempt within the active logical run" , ( ) => {
27902800 const runId = "run-steered" as never ;
0 commit comments