diff: sync hunk status after stage all

Author: bohutang

packages/ui/src/components/layout/DiffOverlay.test.tsx

@@ -1,5 +1,5 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { render, waitFor } from '@testing-library/react';
+import { render, waitFor, act } from '@testing-library/react';
 import { DiffOverlay } from './DiffOverlay';
 import { API } from '../../utils/api';
 
@@ -17,6 +17,12 @@ describe('DiffOverlay', () => {
     vi.clearAllMocks();
     (API.sessions.getDiff as any).mockResolvedValue({ success: true, data: { diff: '' } });
     (API.sessions.getFileContent as any).mockResolvedValue({ success: true, data: { content: 'a\nb\nc' } });
+
+    (window as any).electronAPI = {
+      events: {
+        onGitStatusUpdated: vi.fn(),
+      },
+    };
   });
 
   it('reloads when filePath changes while open', async () => {
@@ -41,5 +47,38 @@ describe('DiffOverlay', () => {
       expect(API.sessions.getFileContent).toHaveBeenCalledWith('s1', expect.objectContaining({ filePath: 'b.txt' }));
     });
   });
-});
 
+  it('refreshes when git status updates while open', async () => {
+    const onGitStatusUpdated = (window as any).electronAPI.events.onGitStatusUpdated as any;
+    let cb: ((data: any) => void) | null = null;
+    onGitStatusUpdated.mockImplementation((fn: any) => {
+      cb = fn;
+      return () => {};
+    });
+
+    render(
+      <DiffOverlay
+        isOpen={true}
+        sessionId="s1"
+        filePath="a.txt"
+        target={{ kind: 'working', scope: 'all' } as any}
+        onClose={vi.fn()}
+        files={[]}
+      />
+    );
+
+    await waitFor(() => {
+      expect(onGitStatusUpdated).toHaveBeenCalled();
+    });
+
+    const callsBefore = (API.sessions.getDiff as any).mock.calls.length;
+    await act(async () => {
+      cb?.({ sessionId: 's1', gitStatus: { state: 'modified' } });
+      await new Promise((r) => setTimeout(r, 120));
+    });
+
+    await waitFor(() => {
+      expect((API.sessions.getDiff as any).mock.calls.length).toBeGreaterThan(callsBefore);
+    });
+  });
+});

packages/ui/src/components/layout/DiffOverlay.tsx

@@ -1,4 +1,4 @@
-import React, { useState, useEffect, useCallback, useMemo } from 'react';
+import React, { useState, useEffect, useCallback, useMemo, useRef } from 'react';
 import { X, ArrowLeft, RefreshCw, Copy, Check } from 'lucide-react';
 import { ZedDiffViewer } from '../panels/diff/ZedDiffViewer';
 import { API } from '../../utils/api';
@@ -47,6 +47,7 @@ export const DiffOverlay: React.FC<DiffOverlayProps> = React.memo(({
   const [loading, setLoading] = useState(false);
   const [error, setError] = useState<string | null>(null);
   const [copied, setCopied] = useState(false);
+  const overlayRefreshTimerRef = useRef<number | null>(null);
 
   const derivedFiles = useMemo(() => {
     if (!diff) return [];
@@ -226,6 +227,29 @@ export const DiffOverlay: React.FC<DiffOverlayProps> = React.memo(({
     }
   }, [filePath]);
 
+  // Keep overlay in sync with staging actions triggered outside the overlay (e.g. Stage/Unstage All in RightPanel).
+  useEffect(() => {
+    if (!isOpen || !sessionId || !target) return;
+    if (target.kind !== 'working' || !filePath) return;
+    const unsub = window.electronAPI?.events?.onGitStatusUpdated?.((data) => {
+      if (!data || data.sessionId !== sessionId) return;
+      if (overlayRefreshTimerRef.current) {
+        window.clearTimeout(overlayRefreshTimerRef.current);
+      }
+      overlayRefreshTimerRef.current = window.setTimeout(() => {
+        overlayRefreshTimerRef.current = null;
+        void handleRefresh();
+      }, 80);
+    });
+    return () => {
+      if (overlayRefreshTimerRef.current) {
+        window.clearTimeout(overlayRefreshTimerRef.current);
+        overlayRefreshTimerRef.current = null;
+      }
+      if (unsub) unsub();
+    };
+  }, [isOpen, sessionId, target, filePath, handleRefresh]);
+
   if (!isOpen) return null;
 
   const workingScope = target?.kind === 'working' ? (target.scope || 'all') : null;