@@ -431,6 +431,7 @@ const SidebarV2Row = memo(function SidebarV2Row(props: {
431431 onUnsettle : ( threadRef : ScopedThreadRef ) => void ;
432432 onSnooze : ( threadRef : ScopedThreadRef , preset : SnoozePreset ) => void ;
433433 onUnsnooze : ( threadRef : ScopedThreadRef ) => void ;
434+ onAcknowledgeWoke : ( threadRef : ScopedThreadRef , visitedAt : string ) => void ;
434435 onChangeRequestState : ( threadKey : string , state : "open" | "closed" | "merged" | null ) => void ;
435436} ) {
436437 const {
@@ -439,6 +440,7 @@ const SidebarV2Row = memo(function SidebarV2Row(props: {
439440 onCancelRename,
440441 onCommitRename,
441442 onContextMenu,
443+ onAcknowledgeWoke,
442444 onRenameTitleChange,
443445 onSettle,
444446 onSnooze,
@@ -542,6 +544,7 @@ const SidebarV2Row = memo(function SidebarV2Row(props: {
542544 className : "text-emerald-700 dark:text-emerald-300" ,
543545 }
544546 : null ;
547+ const isWokeStatus = topStatus ?. icon === "woke" ;
545548
546549 const gitCwd = thread . worktreePath ?? props . projectCwd ;
547550 const gitStatus = useEnvironmentQuery (
@@ -605,6 +608,15 @@ const SidebarV2Row = memo(function SidebarV2Row(props: {
605608 } ,
606609 [ onThreadClick , threadRef ] ,
607610 ) ;
611+ const handleAcknowledgeWokeClick = useCallback (
612+ ( event : ReactMouseEvent ) => {
613+ event . preventDefault ( ) ;
614+ event . stopPropagation ( ) ;
615+ if ( props . wokeAt === null ) return ;
616+ onAcknowledgeWoke ( threadRef , props . wokeAt ) ;
617+ } ,
618+ [ onAcknowledgeWoke , props . wokeAt , threadRef ] ,
619+ ) ;
608620 const handleContextMenu = useCallback (
609621 ( event : ReactMouseEvent ) => {
610622 event . preventDefault ( ) ;
@@ -853,7 +865,12 @@ const SidebarV2Row = memo(function SidebarV2Row(props: {
853865 the time/jump label yields to the settle affordance. */ }
854866 { prBadge }
855867 < span className = "relative ml-auto flex h-6 min-w-8 shrink-0 items-center justify-end" >
856- < span className = "inline-flex justify-end tabular-nums text-muted-foreground/55 transition-opacity group-hover/v2-row:opacity-0" >
868+ < span
869+ className = { cn (
870+ "inline-flex justify-end tabular-nums text-muted-foreground/55 transition-opacity" ,
871+ ! isWoke && "group-hover/v2-row:opacity-0" ,
872+ ) }
873+ >
857874 { variantAction === "unsnooze" && props . snoozeWakeLabelText !== null ? (
858875 // Snoozed rows show when they come BACK, not when they were
859876 // last touched — the return ticket is the row's whole story.
@@ -863,14 +880,16 @@ const SidebarV2Row = memo(function SidebarV2Row(props: {
863880 ) : isWoke ? (
864881 // A wake can land straight in the settled tail (e.g. PR
865882 // merged while snoozed); the signal must survive the trip.
866- < span
867- role = "status"
868- aria-label = "Woke from snooze"
869- className = "inline-flex items-center gap-1 text-xs font-medium text-amber-700 dark:text-amber-300"
883+ < button
884+ type = "button"
885+ aria-label = "Dismiss Woke notification"
886+ title = "Dismiss Woke notification"
887+ onClick = { handleAcknowledgeWokeClick }
888+ className = "inline-flex cursor-pointer items-center gap-1 rounded-sm text-xs font-medium text-amber-700 outline-none hover:underline focus-visible:ring-2 focus-visible:ring-ring dark:text-amber-300"
870889 >
871890 < AlarmClockIcon aria-hidden className = "size-3" />
872- Woke
873- </ span >
891+ < span role = "status" > Woke</ span >
892+ </ button >
874893 ) : (
875894 < span className = "text-xs" >
876895 { variantAction === "unsettle"
@@ -885,7 +904,10 @@ const SidebarV2Row = memo(function SidebarV2Row(props: {
885904 type = "button"
886905 aria-label = "Wake thread now"
887906 onClick = { handleUnsnoozeClick }
888- className = "absolute inset-y-0 right-0 inline-flex cursor-pointer items-center gap-1 rounded-md bg-transparent px-2 text-xs text-muted-foreground opacity-0 transition-opacity hover:text-foreground focus-visible:opacity-100 group-hover/v2-row:opacity-100"
907+ className = { cn (
908+ "pointer-events-none absolute inset-y-0 right-0 inline-flex cursor-pointer items-center gap-1 rounded-md bg-transparent px-2 text-xs text-muted-foreground opacity-0 transition-opacity hover:text-foreground focus-visible:pointer-events-auto focus-visible:opacity-100 group-hover/v2-row:pointer-events-auto group-hover/v2-row:opacity-100" ,
909+ isWoke && "group-hover/v2-row:static" ,
910+ ) }
889911 >
890912 < AlarmClockOffIcon className = "size-3" />
891913 </ button >
@@ -895,7 +917,10 @@ const SidebarV2Row = memo(function SidebarV2Row(props: {
895917 type = "button"
896918 aria-label = "Un-settle thread"
897919 onClick = { handleUnsettleClick }
898- className = "absolute inset-y-0 right-0 -mr-1 inline-flex cursor-pointer items-center gap-1 rounded-md bg-transparent px-1.5 text-xs text-muted-foreground opacity-0 transition-opacity hover:text-foreground focus-visible:opacity-100 group-hover/v2-row:opacity-100"
920+ className = { cn (
921+ "pointer-events-none absolute inset-y-0 right-0 -mr-1 inline-flex cursor-pointer items-center gap-1 rounded-md bg-transparent px-1.5 text-xs text-muted-foreground opacity-0 transition-opacity hover:text-foreground focus-visible:pointer-events-auto focus-visible:opacity-100 group-hover/v2-row:pointer-events-auto group-hover/v2-row:opacity-100" ,
922+ isWoke && "group-hover/v2-row:static" ,
923+ ) }
899924 >
900925 < Undo2Icon className = "mb-px size-3.5" />
901926 </ button >
@@ -904,7 +929,10 @@ const SidebarV2Row = memo(function SidebarV2Row(props: {
904929 type = "button"
905930 aria-label = "Settle thread"
906931 onClick = { handleSettleClick }
907- className = "absolute inset-y-0 right-0 inline-flex cursor-pointer items-center gap-1 rounded-md bg-transparent px-2 text-xs text-muted-foreground opacity-0 transition-opacity hover:text-foreground focus-visible:opacity-100 group-hover/v2-row:opacity-100"
932+ className = { cn (
933+ "pointer-events-none absolute inset-y-0 right-0 inline-flex cursor-pointer items-center gap-1 rounded-md bg-transparent px-2 text-xs text-muted-foreground opacity-0 transition-opacity hover:text-foreground focus-visible:pointer-events-auto focus-visible:opacity-100 group-hover/v2-row:pointer-events-auto group-hover/v2-row:opacity-100" ,
934+ isWoke && "group-hover/v2-row:static" ,
935+ ) }
908936 >
909937 < CheckIcon className = "size-3" />
910938 </ button >
@@ -972,39 +1000,56 @@ const SidebarV2Row = memo(function SidebarV2Row(props: {
9721000 the hidden state out of flow lets the project label reclaim
9731001 space without either state overlapping it. */ }
9741002 < span className = "group/v2-status-slot relative ml-auto flex h-5 min-w-8 shrink-0 items-stretch justify-end text-xs" >
975- { /* pointer-events-none: while hovered this label is absolute
976- + opacity-0, which paints it ABOVE the in-flow settle/snooze
977- buttons; without it the invisible label eats their clicks . */ }
1003+ { /* Read-only status labels yield to the hover actions. Woke is
1004+ itself an action, so it stays pointer-enabled and visible
1005+ while the other controls appear beside it . */ }
9781006 < span
9791007 className = { cn (
980- "pointer-events-none self-center justify-self-end tabular-nums text-muted-foreground/65 transition-opacity group-has-[:focus-visible]/v2-status-slot:absolute group-has-[:focus-visible]/v2-status-slot:right-0 group-has-[:focus-visible]/v2-status-slot:opacity-0 group-hover/v2-row:absolute group-hover/v2-row:right-0 group-hover/v2-row:opacity-0" ,
981- snoozeMenuOpen && "absolute right-0 opacity-0" ,
1008+ isWokeStatus
1009+ ? "pointer-events-auto"
1010+ : "pointer-events-none group-has-[:focus-visible]/v2-status-slot:absolute group-has-[:focus-visible]/v2-status-slot:right-0 group-has-[:focus-visible]/v2-status-slot:opacity-0 group-hover/v2-row:absolute group-hover/v2-row:right-0 group-hover/v2-row:opacity-0" ,
1011+ "self-center justify-self-end tabular-nums text-muted-foreground/65 transition-opacity" ,
1012+ snoozeMenuOpen && "pointer-events-none absolute right-0 opacity-0" ,
9821013 ) }
9831014 >
9841015 { topStatus ? (
985- < span
986- className = { cn (
987- "inline-flex items-center gap-1 font-medium" ,
988- topStatus . className ,
989- ) }
990- >
991- { topStatus . icon === "working" ? (
992- < CircleDashedIcon aria-hidden className = "size-4 shrink-0" />
993- ) : topStatus . icon === "done" ? (
994- < CircleCheckIcon aria-hidden className = "size-4 shrink-0" />
995- ) : topStatus . icon === "woke" ? (
1016+ isWokeStatus ? (
1017+ < button
1018+ type = "button"
1019+ aria-label = "Dismiss Woke notification"
1020+ title = "Dismiss Woke notification"
1021+ onClick = { handleAcknowledgeWokeClick }
1022+ className = { cn (
1023+ "inline-flex cursor-pointer items-center gap-1 rounded-sm font-medium outline-none hover:underline focus-visible:ring-2 focus-visible:ring-ring" ,
1024+ topStatus . className ,
1025+ ) }
1026+ >
9961027 < AlarmClockIcon aria-hidden className = "size-4 shrink-0" />
997- ) : null }
998- { /* The label alone is the live region: a role="status"
999- wrapper around the ticking duration would make
1000- screen readers announce every second. */ }
1001- < span role = "status" > { topStatus . label } </ span >
1002- { status === "working" ? (
1003- < span aria-hidden >
1004- < WorkingDuration startedAt = { resolveWorkingStartedAt ( thread ) } />
1005- </ span >
1006- ) : null }
1007- </ span >
1028+ < span role = "status" > { topStatus . label } </ span >
1029+ </ button >
1030+ ) : (
1031+ < span
1032+ className = { cn (
1033+ "inline-flex items-center gap-1 font-medium" ,
1034+ topStatus . className ,
1035+ ) }
1036+ >
1037+ { topStatus . icon === "working" ? (
1038+ < CircleDashedIcon aria-hidden className = "size-4 shrink-0" />
1039+ ) : topStatus . icon === "done" ? (
1040+ < CircleCheckIcon aria-hidden className = "size-4 shrink-0" />
1041+ ) : null }
1042+ { /* The label alone is the live region: a role="status"
1043+ wrapper around the ticking duration would make
1044+ screen readers announce every second. */ }
1045+ < span role = "status" > { topStatus . label } </ span >
1046+ { status === "working" ? (
1047+ < span aria-hidden >
1048+ < WorkingDuration startedAt = { resolveWorkingStartedAt ( thread ) } />
1049+ </ span >
1050+ ) : null }
1051+ </ span >
1052+ )
10081053 ) : (
10091054 threadTimeLabel ( thread )
10101055 ) }
@@ -1017,8 +1062,8 @@ const SidebarV2Row = memo(function SidebarV2Row(props: {
10171062 // would keep the controls pinned over the status label
10181063 // once the pointer moves away (e.g. after a failed
10191064 // settle) instead of cross-fading back.
1020- "absolute inset-y-0 right-0 flex items-stretch opacity-0 transition-opacity has-[:focus-visible]:static has-[:focus-visible]:opacity-100 group-hover/v2-row:static group-hover/v2-row:opacity-100" ,
1021- snoozeMenuOpen && "static opacity-100" ,
1065+ "pointer-events-none absolute inset-y-0 right-0 flex items-stretch opacity-0 transition-opacity has-[:focus-visible]:pointer-events-auto has-[:focus-visible]: static has-[:focus-visible]:opacity-100 group-hover/v2-row:pointer-events-auto group-hover/v2-row:static group-hover/v2-row:opacity-100" ,
1066+ snoozeMenuOpen && "pointer-events-auto static opacity-100" ,
10221067 ) }
10231068 >
10241069 { showSnoozeButton ? (
@@ -1288,6 +1333,13 @@ export default function SidebarV2() {
12881333 const toggleThreadSelection = useThreadSelectionStore ( ( s ) => s . toggleThread ) ;
12891334 const rangeSelectTo = useThreadSelectionStore ( ( s ) => s . rangeSelectTo ) ;
12901335 const markThreadUnread = useUiStateStore ( ( s ) => s . markThreadUnread ) ;
1336+ const markThreadVisited = useUiStateStore ( ( s ) => s . markThreadVisited ) ;
1337+ const acknowledgeWoke = useCallback (
1338+ ( threadRef : ScopedThreadRef , visitedAt : string ) => {
1339+ markThreadVisited ( scopedThreadKey ( threadRef ) , visitedAt ) ;
1340+ } ,
1341+ [ markThreadVisited ] ,
1342+ ) ;
12911343 const routeTarget = useParams ( {
12921344 strict : false ,
12931345 select : ( params ) => resolveThreadRouteTarget ( params ) ,
@@ -3022,6 +3074,7 @@ export default function SidebarV2() {
30223074 onUnsettle = { attemptUnsettle }
30233075 onSnooze = { attemptSnooze }
30243076 onUnsnooze = { attemptUnsnooze }
3077+ onAcknowledgeWoke = { acknowledgeWoke }
30253078 onChangeRequestState = { handleChangeRequestState }
30263079 />
30273080 ) ;
0 commit comments