@@ -98,15 +98,22 @@ export interface WorkLogEntry {
9898 } ;
9999}
100100
101+ const workLogCollapseKey = Symbol ( ) ;
102+
101103interface DerivedWorkLogEntry extends WorkLogEntry {
102- activityKind : OrchestrationThreadActivity [ "kind" ] ;
103- collapseKey ?: string ;
104+ sourceActivityKind : OrchestrationThreadActivity [ "kind" ] ;
105+ [ workLogCollapseKey ] ?: string ;
104106 toolCallId ?: string ;
105107 isWorkflowCoordinator ?: boolean ;
106108 /** Shell/monitor/plan tasks: ordinary work-log rows, never spawn CTAs. */
107109 isBackgroundTask ?: boolean ;
108110}
109111
112+ const derivedWorkLogEntryByActivity = new WeakMap <
113+ OrchestrationThreadActivity ,
114+ DerivedWorkLogEntry
115+ > ( ) ;
116+
110117export interface PendingApproval {
111118 requestId : ApprovalRequestId ;
112119 requestKind : "command" | "file-read" | "file-change" ;
@@ -854,10 +861,7 @@ export function deriveWorkLogEntries(
854861 if ( isAgentInternalActivity ( activity ) ) continue ;
855862 entries . push ( toDerivedWorkLogEntry ( activity ) ) ;
856863 }
857- return collapseDerivedWorkLogEntries ( entries ) . map ( ( entry ) => {
858- const { activityKind, collapseKey : _collapseKey , ...rest } = entry ;
859- return Object . assign ( rest , { sourceActivityKind : activityKind } ) ;
860- } ) ;
864+ return collapseDerivedWorkLogEntries ( entries ) ;
861865}
862866
863867function isPlanBoundaryToolActivity ( activity : OrchestrationThreadActivity ) : boolean {
@@ -892,6 +896,10 @@ function extractWorkLogToolLifecycleStatus(
892896}
893897
894898function toDerivedWorkLogEntry ( activity : OrchestrationThreadActivity ) : DerivedWorkLogEntry {
899+ const cachedEntry = derivedWorkLogEntryByActivity . get ( activity ) ;
900+ if ( cachedEntry ) {
901+ return cachedEntry ;
902+ }
895903 const payload =
896904 activity . payload && typeof activity . payload === "object"
897905 ? ( activity . payload as Record < string , unknown > )
@@ -935,7 +943,7 @@ function toDerivedWorkLogEntry(activity: OrchestrationThreadActivity): DerivedWo
935943 : activity . tone === "approval"
936944 ? "info"
937945 : activity . tone ,
938- activityKind : activity . kind ,
946+ sourceActivityKind : activity . kind ,
939947 } ;
940948 const itemType = extractWorkLogItemType ( payload ) ;
941949 const requestKind = extractWorkLogRequestKind ( payload ) ;
@@ -994,8 +1002,9 @@ function toDerivedWorkLogEntry(activity: OrchestrationThreadActivity): DerivedWo
9941002 }
9951003 const collapseKey = deriveToolLifecycleCollapseKey ( entry ) ;
9961004 if ( collapseKey ) {
997- entry . collapseKey = collapseKey ;
1005+ entry [ workLogCollapseKey ] = collapseKey ;
9981006 }
1007+ derivedWorkLogEntryByActivity . set ( activity , entry ) ;
9991008 return entry ;
10001009}
10011010
@@ -1026,7 +1035,10 @@ function agentSpawnGroupKey(entry: DerivedWorkLogEntry): string {
10261035}
10271036
10281037function toolLifecycleCollapseMapKey ( entry : DerivedWorkLogEntry ) : string | undefined {
1029- if ( entry . activityKind !== "tool.updated" && entry . activityKind !== "tool.completed" ) {
1038+ if (
1039+ entry . sourceActivityKind !== "tool.updated" &&
1040+ entry . sourceActivityKind !== "tool.completed"
1041+ ) {
10301042 return undefined ;
10311043 }
10321044 return entry . toolCallId ? `tool:${ entry . turnId ?? "no-turn" } :${ entry . toolCallId } ` : undefined ;
@@ -1053,9 +1065,9 @@ function collapseDerivedWorkLogEntries(
10531065 const isTaskRow =
10541066 entry . taskId !== undefined &&
10551067 ! entry . isBackgroundTask &&
1056- ( entry . activityKind === "task.started" ||
1057- entry . activityKind === "task.progress" ||
1058- entry . activityKind === "task.completed" ) ;
1068+ ( entry . sourceActivityKind === "task.started" ||
1069+ entry . sourceActivityKind === "task.progress" ||
1070+ entry . sourceActivityKind === "task.completed" ) ;
10591071 if ( isTaskRow && entry . taskId !== undefined ) {
10601072 const rememberedKey = groupKeyByTaskId . get ( entry . taskId ) ;
10611073 const groupKey = rememberedKey ?? agentSpawnGroupKey ( entry ) ;
@@ -1131,19 +1143,25 @@ function shouldCollapseToolLifecycleEntries(
11311143 previous : DerivedWorkLogEntry ,
11321144 next : DerivedWorkLogEntry ,
11331145) : boolean {
1134- if ( previous . activityKind !== "tool.updated" && previous . activityKind !== "tool.completed" ) {
1146+ if (
1147+ previous . sourceActivityKind !== "tool.updated" &&
1148+ previous . sourceActivityKind !== "tool.completed"
1149+ ) {
11351150 return false ;
11361151 }
1137- if ( next . activityKind !== "tool.updated" && next . activityKind !== "tool.completed" ) {
1152+ if ( next . sourceActivityKind !== "tool.updated" && next . sourceActivityKind !== "tool.completed" ) {
11381153 return false ;
11391154 }
11401155 if ( previous . turnId !== next . turnId ) {
11411156 return false ;
11421157 }
1143- if ( previous . activityKind === "tool.completed" ) {
1158+ if ( previous . sourceActivityKind === "tool.completed" ) {
11441159 return false ;
11451160 }
1146- if ( previous . collapseKey !== undefined && previous . collapseKey === next . collapseKey ) {
1161+ if (
1162+ previous [ workLogCollapseKey ] !== undefined &&
1163+ previous [ workLogCollapseKey ] === next [ workLogCollapseKey ]
1164+ ) {
11471165 return true ;
11481166 }
11491167 return (
@@ -1166,7 +1184,7 @@ function mergeDerivedWorkLogEntries(
11661184 const toolTitle = next . toolTitle ?? previous . toolTitle ;
11671185 const itemType = next . itemType ?? previous . itemType ;
11681186 const requestKind = next . requestKind ?? previous . requestKind ;
1169- const collapseKey = next . collapseKey ?? previous . collapseKey ;
1187+ const collapseKey = next [ workLogCollapseKey ] ?? previous [ workLogCollapseKey ] ;
11701188 const toolCallId = next . toolCallId ?? previous . toolCallId ;
11711189 const toolLifecycleStatus = next . toolLifecycleStatus ?? previous . toolLifecycleStatus ;
11721190 const toolData = next . toolData ?? previous . toolData ;
@@ -1180,7 +1198,7 @@ function mergeDerivedWorkLogEntries(
11801198 ...( toolTitle ? { toolTitle } : { } ) ,
11811199 ...( itemType ? { itemType } : { } ) ,
11821200 ...( requestKind ? { requestKind } : { } ) ,
1183- ...( collapseKey ? { collapseKey } : { } ) ,
1201+ ...( collapseKey ? { [ workLogCollapseKey ] : collapseKey } : { } ) ,
11841202 ...( toolCallId ? { toolCallId } : { } ) ,
11851203 ...( toolLifecycleStatus !== undefined ? { toolLifecycleStatus } : { } ) ,
11861204 ...( toolData !== undefined ? { toolData } : { } ) ,
@@ -1203,11 +1221,14 @@ function deriveToolLifecycleCollapseKey(entry: DerivedWorkLogEntry): string | un
12031221 // progress ticks fold into it, the terminal row wins the label.
12041222 if (
12051223 entry . taskId &&
1206- ( entry . activityKind === "task.progress" || entry . activityKind === "task.completed" )
1224+ ( entry . sourceActivityKind === "task.progress" || entry . sourceActivityKind === "task.completed" )
12071225 ) {
12081226 return `task${ entry . taskId } ` ;
12091227 }
1210- if ( entry . activityKind !== "tool.updated" && entry . activityKind !== "tool.completed" ) {
1228+ if (
1229+ entry . sourceActivityKind !== "tool.updated" &&
1230+ entry . sourceActivityKind !== "tool.completed"
1231+ ) {
12111232 return undefined ;
12121233 }
12131234 if ( entry . toolCallId ) {
0 commit comments