Revert "🤖 fix: make code review diff refresh robust and predictable (#1296)"

This reverts commit 4a3de01.

Author: ammario

src/browser/App.tsx

@@ -17,7 +17,6 @@ import { buildSortedWorkspacesByProject } from "./utils/ui/workspaceFiltering";
 import { useResumeManager } from "./hooks/useResumeManager";
 import { useUnreadTracking } from "./hooks/useUnreadTracking";
 import { useWorkspaceStoreRaw, useWorkspaceRecency } from "./stores/WorkspaceStore";
-import { setActiveWorkspace } from "./stores/GitStatusStore";
 
 import { useStableReference, compareMaps } from "./hooks/useStableReference";
 import { CommandRegistryProvider, useCommandRegistry } from "./contexts/CommandRegistryContext";
@@ -134,11 +133,6 @@ function AppInner() {
     prevWorkspaceRef.current = selectedWorkspace;
   }, [selectedWorkspace, telemetry]);
 
-  // Tell GitStatusStore which workspace is active (for prioritized 1s refresh)
-  useEffect(() => {
-    setActiveWorkspace(selectedWorkspace?.workspaceId ?? null);
-  }, [selectedWorkspace?.workspaceId]);
-
   // Track last-read timestamps for unread indicators
   const { lastReadTimestamps, onToggleUnread } = useUnreadTracking(selectedWorkspace);
 

src/browser/components/RightSidebar/CodeReview/RefreshButton.tsx

@@ -5,30 +5,14 @@
 import React, { useState, useRef, useEffect } from "react";
 import { Tooltip, TooltipTrigger, TooltipContent } from "@/browser/components/ui/tooltip";
 import { formatKeybind, KEYBINDS } from "@/browser/utils/ui/keybinds";
-import { formatRelativeTimeCompact } from "@/browser/utils/ui/dateTime";
 import { cn } from "@/common/lib/utils";
-import type { LastRefreshInfo, RefreshTrigger } from "@/browser/utils/RefreshController";
 
 interface RefreshButtonProps {
   onClick: () => void;
   isLoading?: boolean;
-  /** Debug info about last refresh (timestamp and trigger) */
-  lastRefreshInfo?: LastRefreshInfo | null;
 }
 
-/** Human-readable trigger labels */
-const TRIGGER_LABELS: Record<RefreshTrigger, string> = {
-  manual: "manual click",
-  scheduled: "tool completion",
-  priority: "tool completion (priority)",
-  focus: "window focus",
-  visibility: "tab visible",
-  unpaused: "interaction ended",
-  "in-flight-followup": "queued followup",
-};
-
-export const RefreshButton: React.FC<RefreshButtonProps> = (props) => {
-  const { onClick, isLoading = false, lastRefreshInfo } = props;
+export const RefreshButton: React.FC<RefreshButtonProps> = ({ onClick, isLoading = false }) => {
   // Track animation state for graceful stopping
   const [animationState, setAnimationState] = useState<"idle" | "spinning" | "stopping">("idle");
   const spinOnceTimeoutRef = useRef<number | null>(null);
@@ -92,19 +76,9 @@ export const RefreshButton: React.FC<RefreshButtonProps> = (props) => {
         </button>
       </TooltipTrigger>
       <TooltipContent side="bottom" align="start">
-        {animationState !== "idle" ? (
-          "Refreshing..."
-        ) : (
-          <span>
-            Refresh diff ({formatKeybind(KEYBINDS.REFRESH_REVIEW)})
-            {lastRefreshInfo && (
-              <span className="text-muted block text-[10px]">
-                Last: {formatRelativeTimeCompact(lastRefreshInfo.timestamp)} via{" "}
-                {TRIGGER_LABELS[lastRefreshInfo.trigger] ?? lastRefreshInfo.trigger}
-              </span>
-            )}
-          </span>
-        )}
+        {animationState !== "idle"
+          ? "Refreshing..."
+          : `Refresh diff (${formatKeybind(KEYBINDS.REFRESH_REVIEW)})`}
       </TooltipContent>
     </Tooltip>
   );

src/browser/components/RightSidebar/CodeReview/ReviewControls.tsx

@@ -5,7 +5,6 @@
 import React, { useState } from "react";
 import { usePersistedState } from "@/browser/hooks/usePersistedState";
 import type { ReviewFilters, ReviewStats } from "@/common/types/review";
-import type { LastRefreshInfo } from "@/browser/utils/RefreshController";
 import { RefreshButton } from "./RefreshButton";
 import { UntrackedStatus } from "./UntrackedStatus";
 
@@ -18,8 +17,6 @@ interface ReviewControlsProps {
   workspaceId: string;
   workspacePath: string;
   refreshTrigger?: number;
-  /** Debug info about last refresh */
-  lastRefreshInfo?: LastRefreshInfo | null;
 }
 
 export const ReviewControls: React.FC<ReviewControlsProps> = ({
@@ -31,7 +28,6 @@ export const ReviewControls: React.FC<ReviewControlsProps> = ({
   workspaceId,
   workspacePath,
   refreshTrigger,
-  lastRefreshInfo,
 }) => {
   // Local state for input value - only commit on blur/Enter
   const [inputValue, setInputValue] = useState(filters.diffBase);
@@ -87,13 +83,7 @@ export const ReviewControls: React.FC<ReviewControlsProps> = ({
 
   return (
     <div className="bg-separator border-border-light flex flex-wrap items-center gap-3 border-b px-3 py-2 text-[11px]">
-      {onRefresh && (
-        <RefreshButton
-          onClick={onRefresh}
-          isLoading={isLoading}
-          lastRefreshInfo={lastRefreshInfo}
-        />
-      )}
+      {onRefresh && <RefreshButton onClick={onRefresh} isLoading={isLoading} />}
       <label className="text-muted font-medium whitespace-nowrap">Base:</label>
       <input
         type="text"

src/browser/components/RightSidebar/CodeReview/ReviewPanel.tsx

@@ -94,31 +94,6 @@ type DiffState =
 const REVIEW_PANEL_CACHE_MAX_ENTRIES = 20;
 const REVIEW_PANEL_CACHE_MAX_SIZE_BYTES = 20 * 1024 * 1024; // 20MB
 
-/**
- * Preserve object references for unchanged hunks to prevent re-renders.
- * Compares by ID and content - if a hunk exists in prev with same content, reuse it.
- */
-function preserveHunkReferences(prev: DiffHunk[], next: DiffHunk[]): DiffHunk[] {
-  if (prev.length === 0) return next;
-
-  const prevById = new Map(prev.map((h) => [h.id, h]));
-  let allSame = prev.length === next.length;
-
-  const result = next.map((hunk, i) => {
-    const prevHunk = prevById.get(hunk.id);
-    // Fast path: same ID and content means unchanged (content hash is part of ID)
-    if (prevHunk && prevHunk.content === hunk.content) {
-      if (allSame && prev[i]?.id !== hunk.id) allSame = false;
-      return prevHunk;
-    }
-    allSame = false;
-    return hunk;
-  });
-
-  // If all hunks are reused in same order, return prev array to preserve top-level reference
-  return allSame ? prev : result;
-}
-
 interface ReviewPanelDiffCacheValue {
   hunks: DiffHunk[];
   truncationWarning: string | null;
@@ -143,53 +118,6 @@ const reviewPanelCache = new LRUCache<string, ReviewPanelCacheValue>({
   sizeCalculation: (value) => estimateJsonSizeBytes(value),
 });
 
-function getOriginBranchForFetch(diffBase: string): string | null {
-  const trimmed = diffBase.trim();
-  if (!trimmed.startsWith("origin/")) return null;
-
-  const branch = trimmed.slice("origin/".length);
-
-  // Avoid shell injection; diffBase is user-controlled.
-  if (!/^[0-9A-Za-z._/-]+$/.test(branch)) return null;
-
-  return branch;
-}
-
-interface OriginFetchState {
-  key: string;
-  promise: Promise<void>;
-}
-
-async function ensureOriginFetched(params: {
-  api: APIClient;
-  workspaceId: string;
-  diffBase: string;
-  refreshToken: number;
-  originFetchRef: React.MutableRefObject<OriginFetchState | null>;
-}): Promise<void> {
-  const originBranch = getOriginBranchForFetch(params.diffBase);
-  if (!originBranch) return;
-
-  const key = [params.workspaceId, params.diffBase, String(params.refreshToken)].join("\u0000");
-  const existing = params.originFetchRef.current;
-  if (existing?.key === key) {
-    await existing.promise;
-    return;
-  }
-
-  // Ensure manual refresh doesn't hang on credential prompts.
-  const promise = params.api.workspace
-    .executeBash({
-      workspaceId: params.workspaceId,
-      script: `GIT_TERMINAL_PROMPT=0 git fetch origin ${originBranch} --quiet || true`,
-      options: { timeout_secs: 30 },
-    })
-    .then(() => undefined)
-    .catch(() => undefined);
-
-  params.originFetchRef.current = { key, promise };
-  await promise;
-}
 function makeReviewPanelCacheKey(params: {
   workspaceId: string;
   workspacePath: string;
@@ -233,7 +161,6 @@ export const ReviewPanel: React.FC<ReviewPanelProps> = ({
   isCreating = false,
   onStatsChange,
 }) => {
-  const originFetchRef = useRef<OriginFetchState | null>(null);
   const { api } = useAPI();
   const panelRef = useRef<HTMLDivElement>(null);
   const scrollContainerRef = useRef<HTMLDivElement>(null);
@@ -382,15 +309,6 @@ export const ReviewPanel: React.FC<ReviewPanelProps> = ({
     const loadFileTree = async () => {
       setIsLoadingTree(true);
       try {
-        await ensureOriginFetched({
-          api,
-          workspaceId,
-          diffBase: filters.diffBase,
-          refreshToken: refreshTrigger,
-          originFetchRef,
-        });
-        if (cancelled) return;
-
         const tree = await executeWorkspaceBashAndCache({
           api,
           workspaceId,
@@ -502,15 +420,6 @@ export const ReviewPanel: React.FC<ReviewPanelProps> = ({
 
     const loadDiff = async () => {
       try {
-        await ensureOriginFetched({
-          api,
-          workspaceId,
-          diffBase: filters.diffBase,
-          refreshToken: refreshTrigger,
-          originFetchRef,
-        });
-        if (cancelled) return;
-
         // Git-level filters (affect what data is fetched):
         // - diffBase: what to diff against
         // - includeUncommitted: include working directory changes
@@ -549,19 +458,10 @@ export const ReviewPanel: React.FC<ReviewPanelProps> = ({
         if (cancelled) return;
 
         setDiagnosticInfo(data.diagnosticInfo);
-
-        // Preserve object references for unchanged hunks to prevent unnecessary re-renders.
-        // HunkViewer is memoized on hunk object identity, so reusing references avoids
-        // re-rendering (and re-highlighting) hunks that haven't actually changed.
-        setDiffState((prev) => {
-          const prevHunks =
-            prev.status === "loaded" || prev.status === "refreshing" ? prev.hunks : [];
-          const hunks = preserveHunkReferences(prevHunks, data.hunks);
-          return {
-            status: "loaded",
-            hunks,
-            truncationWarning: data.truncationWarning,
-          };
+        setDiffState({
+          status: "loaded",
+          hunks: data.hunks,
+          truncationWarning: data.truncationWarning,
         });
 
         if (data.hunks.length > 0) {
@@ -911,7 +811,6 @@ export const ReviewPanel: React.FC<ReviewPanelProps> = ({
         workspaceId={workspaceId}
         workspacePath={workspacePath}
         refreshTrigger={refreshTrigger}
-        lastRefreshInfo={refreshController.lastRefreshInfo}
       />
 
       {diffState.status === "error" ? (