Fix rerender audit regressions

Author: justsomelegs

apps/web/src/components/DiffPanel.tsx

@@ -423,9 +423,18 @@ const DiffPanelContent = memo(function DiffPanelContent(props: {
   } = props;
   const { resolvedTheme } = useTheme();
   const patchViewportRef = useRef<HTMLDivElement>(null);
+  const activeProject = useStore((store) =>
+    workspaceSnapshot
+      ? selectProjectByRef(store, {
+          environmentId: workspaceSnapshot.environmentId,
+          projectId: workspaceSnapshot.projectId,
+        })
+      : undefined,
+  );
+  const activeCwd = workspaceSnapshot?.worktreePath ?? activeProject?.cwd ?? null;
   const isGitRepo = useGitStatusIsRepo({
     environmentId: workspaceSnapshot?.environmentId ?? null,
-    cwd: workspaceSnapshot?.worktreePath ?? null,
+    cwd: activeCwd,
   });
   const { inferredCheckpointTurnCountByTurnId } = useTurnDiffSummaries(orderedTurnDiffSummaries);
   const activeCheckpointSelection = useMemo(() => {
@@ -475,15 +484,6 @@ const DiffPanelContent = memo(function DiffPanelContent(props: {
       activeCheckpointRange: selectedTurn ? selectedCheckpointRange : conversationCheckpointRange,
     };
   }, [inferredCheckpointTurnCountByTurnId, orderedTurnDiffSummaries, selectedTurnId]);
-  const activeProject = useStore((store) =>
-    workspaceSnapshot
-      ? selectProjectByRef(store, {
-          environmentId: workspaceSnapshot.environmentId,
-          projectId: workspaceSnapshot.projectId,
-        })
-      : undefined,
-  );
-  const activeCwd = workspaceSnapshot?.worktreePath ?? activeProject?.cwd;
   const activeCheckpointDiffQuery = useQuery(
     checkpointDiffQueryOptions({
       environmentId: workspaceSnapshot?.environmentId ?? null,

apps/web/src/components/chat/MessagesTimeline.tsx

@@ -191,6 +191,7 @@ export const HistoricalMessagesTimelineSection = memo(function HistoricalMessage
     [historicalTimelineEntries],
   );
   const historicalRows = useStableTimelineRows(historicalRawRows);
+  const shouldRenderHistoricalRowsWithoutVirtualizer = typeof ResizeObserver === "undefined";
 
   const virtualizedRowCount = clamp(historicalRows.length, {
     minimum: 0,
@@ -348,15 +349,20 @@ export const HistoricalMessagesTimelineSection = memo(function HistoricalMessage
 
   return (
     <div ref={timelineRootRef} data-timeline-root="true" className="w-full overflow-x-hidden">
-      {virtualizedRowCount > 0 && (
+      {shouldRenderHistoricalRowsWithoutVirtualizer ? (
+        <NonVirtualTimelineRows
+          rows={historicalRows}
+          renderRowContent={renderHistoricalRowContent}
+        />
+      ) : virtualizedRowCount > 0 ? (
         <HistoricalTimelineRows
           rows={historicalRows}
           virtualRows={virtualRows}
           totalSize={rowVirtualizer.getTotalSize()}
           measureElement={rowVirtualizer.measureElement}
           renderRowContent={renderHistoricalRowContent}
         />
-      )}
+      ) : null}
     </div>
   );
 });
@@ -593,6 +599,13 @@ const HistoricalTimelineRows = memo(function HistoricalTimelineRows(props: {
 const LiveTimelineRows = memo(function LiveTimelineRows(props: {
   rows: ReadonlyArray<TimelineRow>;
   renderRowContent: (row: TimelineRow) => ReactNode;
+}) {
+  return <NonVirtualTimelineRows rows={props.rows} renderRowContent={props.renderRowContent} />;
+});
+
+const NonVirtualTimelineRows = memo(function NonVirtualTimelineRows(props: {
+  rows: ReadonlyArray<TimelineRow>;
+  renderRowContent: (row: TimelineRow) => ReactNode;
 }) {
   return props.rows.map((row) => (
     <div key={`non-virtual-row:${row.id}`}>{props.renderRowContent(row)}</div>

apps/web/src/lib/providerReactQuery.test.ts

@@ -141,6 +141,28 @@ describe("checkpointDiffQueryOptions", () => {
     expect(retry(3, new Error("Something else failed."))).toBe(false);
   });
 
+  it("retries transient checkpoint errors for full thread diffs too", () => {
+    const options = checkpointDiffQueryOptions({
+      environmentId,
+      threadId,
+      fromTurnCount: 0,
+      toTurnCount: 2,
+      cacheScope: "thread:all",
+    });
+    const retry = options.retry;
+    expect(typeof retry).toBe("function");
+    if (typeof retry !== "function") {
+      throw new Error("Expected retry to be a function.");
+    }
+
+    expect(
+      retry(1, new Error("Filesystem checkpoint is unavailable for turn 2 in thread thread-1.")),
+    ).toBe(true);
+    expect(
+      retry(12, new Error("Filesystem checkpoint is unavailable for turn 2 in thread thread-1.")),
+    ).toBe(false);
+  });
+
   it("backs off longer for checkpoint-not-ready errors", () => {
     const options = checkpointDiffQueryOptions({
       environmentId,

apps/web/src/lib/providerReactQuery.ts

@@ -94,8 +94,6 @@ function isCheckpointTemporarilyUnavailable(error: unknown): boolean {
 
 export function checkpointDiffQueryOptions(input: CheckpointDiffQueryInput) {
   const decodedRequest = decodeCheckpointDiffRequest(input);
-  const isFullThreadDiffRequest =
-    decodedRequest._tag === "Some" && decodedRequest.value.kind === "fullThreadDiff";
 
   return queryOptions({
     queryKey: providerQueryKeys.checkpointDiff(input),
@@ -120,9 +118,6 @@ export function checkpointDiffQueryOptions(input: CheckpointDiffQueryInput) {
       decodedRequest._tag === "Some",
     staleTime: Infinity,
     retry: (failureCount, error) => {
-      if (isFullThreadDiffRequest) {
-        return false;
-      }
       if (isCheckpointTemporarilyUnavailable(error)) {
         return failureCount < 12;
       }