@@ -72,7 +72,8 @@ import {
7272import {
7373 DropdownMenu ,
7474 DropdownMenuContent ,
75- DropdownMenuItem ,
75+ DropdownMenuRadioGroup ,
76+ DropdownMenuRadioItem ,
7677 DropdownMenuSub ,
7778 DropdownMenuSubContent ,
7879 DropdownMenuSubTrigger ,
@@ -645,6 +646,26 @@ export default function DiffPanel({
645646 if ( ! routeThreadRef ) return ;
646647 useDiffPanelStore . getState ( ) . selectBranchBaseRef ( routeThreadRef , baseRef ) ;
647648 } ;
649+ // The scope menu has two radio groups: the top-level one treats the latest
650+ // turn as "latest", while the turn sub-menu keys every turn by id so the
651+ // latest turn is also marked there.
652+ const selectedTurnValue = selectedTurn ? `turn:${ selectedTurn . turnId } ` : "" ;
653+ const selectedScopeValue =
654+ selectedTurnId === null
655+ ? selectedGitScope
656+ : selectedTurn ?. turnId === latestTurn ?. turnId
657+ ? "latest"
658+ : selectedTurnValue ;
659+ const selectScopeValue = ( value : string ) => {
660+ if ( value === "unstaged" || value === "branch" ) {
661+ selectGitScope ( value ) ;
662+ } else if ( value === "latest" ) {
663+ if ( latestTurn ) selectTurn ( latestTurn . turnId ) ;
664+ } else {
665+ const turn = orderedTurnDiffSummaries . find ( ( summary ) => `turn:${ summary . turnId } ` === value ) ;
666+ if ( turn ) selectTurn ( turn . turnId ) ;
667+ }
668+ } ;
648669
649670 const headerRow = (
650671 < >
@@ -658,61 +679,42 @@ export default function DiffPanel({
658679 < ChevronDownIcon className = "size-3.5 shrink-0 opacity-70" />
659680 </ DropdownMenuTrigger >
660681 < DropdownMenuContent align = "start" className = "w-60" >
661- < DropdownMenuItem
662- className = {
663- selectedTurnId === null && selectedGitScope === "unstaged"
664- ? "bg-foreground/[0.08]"
665- : undefined
666- }
667- onClick = { ( ) => selectGitScope ( "unstaged" ) }
668- >
669- < span > Working tree</ span >
670- </ DropdownMenuItem >
671- < DropdownMenuItem
672- className = {
673- selectedTurnId === null && selectedGitScope === "branch"
674- ? "bg-foreground/[0.08]"
675- : undefined
676- }
677- onClick = { ( ) => selectGitScope ( "branch" ) }
678- >
679- < span > Branch changes</ span >
680- </ DropdownMenuItem >
681- < DropdownMenuItem
682- className = {
683- selectedTurnId !== null && selectedTurn ?. turnId === latestTurn ?. turnId
684- ? "bg-foreground/[0.08]"
685- : undefined
686- }
687- onClick = { ( ) => {
688- if ( latestTurn ) selectTurn ( latestTurn . turnId ) ;
689- } }
690- >
691- < span > Latest turn</ span >
692- </ DropdownMenuItem >
682+ < DropdownMenuRadioGroup value = { selectedScopeValue } onValueChange = { selectScopeValue } >
683+ < DropdownMenuRadioItem value = "unstaged" closeOnClick >
684+ < span > Working tree</ span >
685+ </ DropdownMenuRadioItem >
686+ < DropdownMenuRadioItem value = "branch" closeOnClick >
687+ < span > Branch changes</ span >
688+ </ DropdownMenuRadioItem >
689+ < DropdownMenuRadioItem value = "latest" closeOnClick >
690+ < span > Latest turn</ span >
691+ </ DropdownMenuRadioItem >
692+ </ DropdownMenuRadioGroup >
693693 < DropdownMenuSub >
694694 < DropdownMenuSubTrigger > Turn</ DropdownMenuSubTrigger >
695695 < DropdownMenuSubContent className = "w-64" >
696- { orderedTurnDiffSummaries . map ( ( summary ) => {
697- const turnCount =
698- summary . checkpointTurnCount ??
699- inferredCheckpointTurnCountByTurnId [ summary . turnId ] ??
700- "?" ;
701- return (
702- < DropdownMenuItem
703- key = { summary . turnId }
704- className = {
705- summary . turnId === selectedTurn ?. turnId ? "bg-foreground/[0.08]" : undefined
706- }
707- onClick = { ( ) => selectTurn ( summary . turnId ) }
708- >
709- < span > Turn { turnCount } </ span >
710- < span className = "ml-auto text-xs tabular-nums text-muted-foreground" >
711- { formatShortTimestamp ( summary . completedAt , settings . timestampFormat ) }
712- </ span >
713- </ DropdownMenuItem >
714- ) ;
715- } ) }
696+ < DropdownMenuRadioGroup value = { selectedTurnValue } onValueChange = { selectScopeValue } >
697+ { orderedTurnDiffSummaries . map ( ( summary ) => {
698+ const turnCount =
699+ summary . checkpointTurnCount ??
700+ inferredCheckpointTurnCountByTurnId [ summary . turnId ] ??
701+ "?" ;
702+ return (
703+ < DropdownMenuRadioItem
704+ key = { summary . turnId }
705+ value = { `turn:${ summary . turnId } ` }
706+ closeOnClick
707+ >
708+ < span className = "flex items-center gap-2" >
709+ < span > Turn { turnCount } </ span >
710+ < span className = "ml-auto text-xs tabular-nums text-muted-foreground" >
711+ { formatShortTimestamp ( summary . completedAt , settings . timestampFormat ) }
712+ </ span >
713+ </ span >
714+ </ DropdownMenuRadioItem >
715+ ) ;
716+ } ) }
717+ </ DropdownMenuRadioGroup >
716718 </ DropdownMenuSubContent >
717719 </ DropdownMenuSub >
718720 </ DropdownMenuContent >
0 commit comments