@@ -45,9 +45,8 @@ import {
4545} from "../lib/diffRendering" ;
4646import { PREFERRED_HIGHLIGHTER } from "../lib/syntaxHighlighting" ;
4747import { areAllDiffFilesCollapsed , toggleAllDiffFiles } from "../lib/diffCollapse" ;
48- import { useTurnDiffSummaries } from "../hooks/useTurnDiffSummaries" ;
4948import { useWorkspaceMutationRefresh } from "../hooks/useWorkspaceMutationRefresh" ;
50- import { useProject , useThreadProjection , useThreadShell } from "../state/entities" ;
49+ import { useProject , useThreadCheckpointSummaries , useThreadShell } from "../state/entities" ;
5150import { resolveThreadRouteRef } from "../threadRoutes" ;
5251import { useClientSettings , useUpdateClientSettings } from "../hooks/useSettings" ;
5352import { formatShortTimestamp } from "../timestampFormat" ;
@@ -222,7 +221,6 @@ export default function DiffPanel({
222221 } ) ;
223222 const activeThreadId = routeThreadRef ?. threadId ?? null ;
224223 const activeThread = useThreadShell ( routeThreadRef ) ;
225- const activeThreadProjection = useThreadProjection ( routeThreadRef ) ?. projection ?? null ;
226224 const fileAccess = useFilesystemReadAccess ( activeThread ?. environmentId ?? null ) ;
227225 const { canReadFiles } = fileAccess ;
228226 const activeProjectId = activeThread ?. projectId ?? null ;
@@ -259,15 +257,10 @@ export default function DiffPanel({
259257 selectThreadDiffPanelSelection ( state . byThreadKey , routeThreadRef ) ,
260258 ) ;
261259 const isGitRepo = gitStatusQuery . data ?. isRepo ?? true ;
262- const { turnDiffSummaries, inferredCheckpointTurnCountByRunId } =
263- useTurnDiffSummaries ( activeThreadProjection ) ;
264- const orderedTurnDiffSummaries = [ ...turnDiffSummaries ] . toSorted ( ( left , right ) => {
265- const leftTurnCount =
266- left . checkpointTurnCount ?? inferredCheckpointTurnCountByRunId [ left . runId ] ?? 0 ;
267- const rightTurnCount =
268- right . checkpointTurnCount ?? inferredCheckpointTurnCountByRunId [ right . runId ] ?? 0 ;
269- if ( leftTurnCount !== rightTurnCount ) {
270- return rightTurnCount - leftTurnCount ;
260+ const turnDiffSummaries = useThreadCheckpointSummaries ( routeThreadRef ) ;
261+ const orderedTurnDiffSummaries = turnDiffSummaries . toSorted ( ( left , right ) => {
262+ if ( left . checkpointTurnCount !== right . checkpointTurnCount ) {
263+ return right . checkpointTurnCount - left . checkpointTurnCount ;
271264 }
272265 return right . completedAt . localeCompare ( left . completedAt ) ;
273266 } ) ;
@@ -291,9 +284,7 @@ export default function DiffPanel({
291284 ? undefined
292285 : ( orderedTurnDiffSummaries . find ( ( summary ) => summary . runId === selectedRunId ) ??
293286 orderedTurnDiffSummaries [ 0 ] ) ;
294- const selectedCheckpointTurnCount =
295- selectedTurn &&
296- ( selectedTurn . checkpointTurnCount ?? inferredCheckpointTurnCountByRunId [ selectedTurn . runId ] ) ;
287+ const selectedCheckpointTurnCount = selectedTurn ?. checkpointTurnCount ;
297288 const latestTurn = orderedTurnDiffSummaries [ 0 ] ;
298289 const selectedScopeLabel =
299290 selectedRunId === null
@@ -691,10 +682,7 @@ export default function DiffPanel({
691682 < DropdownMenuSubContent >
692683 < DropdownMenuRadioGroup value = { selectedTurnValue } onValueChange = { selectScopeValue } >
693684 { orderedTurnDiffSummaries . map ( ( summary ) => {
694- const turnCount =
695- summary . checkpointTurnCount ??
696- inferredCheckpointTurnCountByRunId [ summary . runId ] ??
697- "?" ;
685+ const turnCount = summary . checkpointTurnCount ;
698686 return (
699687 < DropdownMenuRadioItem
700688 key = { summary . runId }
0 commit comments