@@ -1614,17 +1614,9 @@ function WorkingTimelineRow({ row }: { row: Extract<TimelineRow, { kind: "workin
16141614 className = "relative shrink-0 overflow-hidden whitespace-nowrap transition-opacity duration-150 starting:opacity-0 motion-reduce:transition-none"
16151615 >
16161616 { isPreparingWorktree ? (
1617- < >
1618- Setting up worktree…
1619- < ActivityShimmerOverlay > Setting up worktree…</ ActivityShimmerOverlay >
1620- </ >
1617+ "Setting up worktree…"
16211618 ) : isCompacting ? (
1622- < >
1623- < CompactingLabel />
1624- < ActivityShimmerOverlay >
1625- < CompactingLabel />
1626- </ ActivityShimmerOverlay >
1627- </ >
1619+ < CompactingLabel />
16281620 ) : row . createdAt ? (
16291621 < >
16301622 Working for < WorkingTimer createdAt = { row . createdAt } />
@@ -1878,19 +1870,6 @@ function ExpandedWorkGroupEntries({
18781870
18791871const workEntryKey = ( entry : TimelineWorkEntry ) => entry . id ;
18801872
1881- function ActivityShimmerOverlay ( { children } : { children : ReactNode } ) {
1882- return (
1883- < span
1884- aria-hidden
1885- className = "live-activity-focus pointer-events-none absolute inset-y-0 select-none"
1886- >
1887- < span className = "live-activity-focus-counter block" >
1888- < span className = "live-activity-focus-aligned block text-foreground" > { children } </ span >
1889- </ span >
1890- </ span >
1891- ) ;
1892- }
1893-
18941873const failedToolIconClassName = "text-tool-error-icon/40" ;
18951874
18961875/** Image icons and the gradient computer-use mark cannot take a currentColor
@@ -1914,23 +1893,14 @@ function LiveActivityRow({
19141893 failed ?: boolean ;
19151894} ) {
19161895 return (
1917- < div className = "relative min-h-6 w-fit max-w-full min-w-0 overflow-hidden rounded-md text-sm leading-relaxed" >
1896+ < div className = "min-h-6 w-fit max-w-full min-w-0 overflow-hidden rounded-md text-sm leading-relaxed" >
19181897 < LiveActivityContent
19191898 label = { label }
19201899 iconName = { iconName }
19211900 toolIcon = { toolIcon }
19221901 failed = { failed }
19231902 announceFailure = { failed }
19241903 />
1925- < ActivityShimmerOverlay >
1926- < LiveActivityContent
1927- label = { label }
1928- iconName = { iconName }
1929- toolIcon = { toolIcon }
1930- failed = { failed }
1931- highlighted
1932- />
1933- </ ActivityShimmerOverlay >
19341904 </ div >
19351905 ) ;
19361906}
@@ -1941,14 +1911,12 @@ function LiveActivityContent({
19411911 toolIcon,
19421912 failed = false ,
19431913 announceFailure = false ,
1944- highlighted = false ,
19451914} : {
19461915 label : string ;
19471916 iconName : WorkEntryIconName | undefined ;
19481917 toolIcon ?: ToolActivityIcon | undefined ;
19491918 failed ?: boolean ;
19501919 announceFailure ?: boolean ;
1951- highlighted ?: boolean ;
19521920} ) {
19531921 const showTrailingFailureMark =
19541922 failed && iconName !== undefined && ! toolIconAcceptsTint ( iconName , toolIcon ) ;
@@ -1958,14 +1926,14 @@ function LiveActivityContent({
19581926 className = { cn (
19591927 "flex min-h-6 min-w-0 items-center gap-1.5 py-0.5" ,
19601928 iconName ? "px-0.5" : "px-1" ,
1961- highlighted ? "text-foreground" : "text-secondary-label" ,
1929+ "text-secondary-label" ,
19621930 ) }
19631931 >
19641932 { iconName ? (
19651933 < span
19661934 className = { cn (
19671935 "flex size-6 shrink-0 items-center justify-center" ,
1968- highlighted ? "text-foreground" : failed ? failedToolIconClassName : "text-icon-muted" ,
1936+ failed ? failedToolIconClassName : "text-icon-muted" ,
19691937 ) }
19701938 role = { announceFailure ? "img" : undefined }
19711939 aria-label = { announceFailure ? "Tool call failed" : undefined }
@@ -1974,16 +1942,13 @@ function LiveActivityContent({
19741942 icon = { toolIcon }
19751943 fallbackName = { iconName }
19761944 className = "block size-4 shrink-0 stroke-[1.8]"
1977- muted = { ! highlighted }
1945+ muted
19781946 />
19791947 </ span >
19801948 ) : null }
19811949 < span className = "min-w-0 flex-1 truncate" > { label } </ span >
19821950 { showTrailingFailureMark ? (
1983- < XIcon
1984- aria-hidden
1985- className = { cn ( "size-3 shrink-0" , ! highlighted && failedToolIconClassName ) }
1986- />
1951+ < XIcon aria-hidden className = { cn ( "size-3 shrink-0" , failedToolIconClassName ) } />
19871952 ) : null }
19881953 </ span >
19891954 ) ;
@@ -2002,24 +1967,12 @@ function LiveWorkEntryTimelineRow({ row }: { row: Extract<TimelineRow, { kind: "
20021967 aria-expanded = { row . expanded }
20031968 onClick = { ( ) => ctx . onToggleWorkGroup ( row . groupId , row . id ) }
20041969 >
2005- { row . active ? (
2006- < LiveActivityRow
2007- label = { label }
2008- iconName = { workEntryIconName ( row . entry ) }
2009- toolIcon = { row . entry . toolIcon ?? row . entry . toolSource ?. icon }
2010- failed = { failed }
2011- />
2012- ) : (
2013- < div className = "min-h-6 w-fit max-w-full min-w-0 overflow-hidden rounded-md text-sm leading-relaxed" >
2014- < LiveActivityContent
2015- label = { label }
2016- iconName = { workEntryIconName ( row . entry ) }
2017- toolIcon = { row . entry . toolIcon ?? row . entry . toolSource ?. icon }
2018- failed = { failed }
2019- announceFailure = { failed }
2020- />
2021- </ div >
2022- ) }
1970+ < LiveActivityRow
1971+ label = { label }
1972+ iconName = { workEntryIconName ( row . entry ) }
1973+ toolIcon = { row . entry . toolIcon ?? row . entry . toolSource ?. icon }
1974+ failed = { failed }
1975+ />
20231976 </ button >
20241977 ) ;
20251978}
0 commit comments