feat(git): add per-file agent edits mode and thread diff support

Author: Dimillian

src/App.tsx

@@ -339,6 +339,10 @@ function MainApp() {
   });
 
   const { errorToasts, dismissErrorToast } = useErrorToasts();
+  const queueGitStatusRefreshRef = useRef<() => void>(() => {});
+  const handleThreadMessageActivity = useCallback(() => {
+    queueGitStatusRefreshRef.current();
+  }, []);
 
   // Access mode is thread-scoped (best-effort persisted) and falls back to the app default.
 
@@ -364,69 +368,6 @@ function MainApp() {
     resetGitHubPanelState,
   } = useGitHubPanelController();
 
-  const {
-    centerMode,
-    setCenterMode,
-    selectedDiffPath,
-    setSelectedDiffPath,
-    diffScrollRequestId,
-    gitPanelMode,
-    setGitPanelMode,
-    gitDiffViewStyle,
-    setGitDiffViewStyle,
-    filePanelMode,
-    setFilePanelMode,
-    selectedPullRequest,
-    setSelectedPullRequest,
-    selectedCommitSha,
-    setSelectedCommitSha,
-    diffSource,
-    setDiffSource,
-    gitStatus,
-    refreshGitStatus,
-    queueGitStatusRefresh,
-    refreshGitDiffs,
-    gitLogEntries,
-    gitLogTotal,
-    gitLogAhead,
-    gitLogBehind,
-    gitLogAheadEntries,
-    gitLogBehindEntries,
-    gitLogUpstream,
-    gitLogLoading,
-    gitLogError,
-    refreshGitLog,
-    gitCommitDiffs,
-    shouldLoadDiffs,
-    activeDiffs,
-    activeDiffLoading,
-    activeDiffError,
-    handleSelectDiff,
-    handleSelectCommit,
-    handleActiveDiffPath,
-    handleGitPanelModeChange,
-    activeWorkspaceIdRef,
-    activeWorkspaceRef,
-  } = useGitPanelController({
-    activeWorkspace,
-    gitDiffPreloadEnabled: appSettings.preloadGitDiffs,
-    gitDiffIgnoreWhitespaceChanges: appSettings.gitDiffIgnoreWhitespaceChanges,
-    splitChatDiffView: appSettings.splitChatDiffView,
-    isCompact,
-    isTablet,
-    activeTab,
-    tabletTab,
-    setActiveTab,
-    prDiffs: gitPullRequestDiffs,
-    prDiffsLoading: gitPullRequestDiffsLoading,
-    prDiffsError: gitPullRequestDiffsError,
-  });
-
-  const shouldLoadGitHubPanelData =
-    gitPanelMode === "issues" ||
-    gitPanelMode === "prs" ||
-    (shouldLoadDiffs && diffSource === "pr");
-
   useEffect(() => {
     resetGitHubPanelState();
   }, [activeWorkspaceId, resetGitHubPanelState]);
@@ -544,6 +485,165 @@ function MainApp() {
     getWorkspacePromptsDir,
     getGlobalPromptsDir,
   } = useCustomPrompts({ activeWorkspace, onDebug: addDebugEntry });
+  const resolvedModel = selectedModel?.model ?? null;
+  const resolvedEffort = reasoningSupported ? selectedEffort : null;
+
+  const { collaborationModePayload } = useCollaborationModeSelection({
+    selectedCollaborationMode,
+    selectedCollaborationModeId,
+    selectedEffort: resolvedEffort,
+    resolvedModel,
+  });
+
+  const {
+    setActiveThreadId,
+    activeThreadId,
+    activeItems,
+    approvals,
+    userInputRequests,
+    threadsByWorkspace,
+    threadParentById,
+    threadStatusById,
+    threadResumeLoadingById,
+    threadListLoadingByWorkspace,
+    threadListPagingByWorkspace,
+    threadListCursorByWorkspace,
+    activeTurnIdByThread,
+    tokenUsageByThread,
+    rateLimitsByWorkspace,
+    accountByWorkspace,
+    planByThread,
+    lastAgentMessageByThread,
+    interruptTurn,
+    removeThread,
+    pinThread,
+    unpinThread,
+    isThreadPinned,
+    getPinTimestamp,
+    renameThread,
+    startThreadForWorkspace,
+    listThreadsForWorkspace,
+    loadOlderThreadsForWorkspace,
+    resetWorkspaceThreads,
+    refreshThread,
+    sendUserMessage,
+    sendUserMessageToThread,
+    startFork,
+    startReview,
+    startResume,
+    startCompact,
+    startApps,
+    startMcp,
+    startStatus,
+    reviewPrompt,
+    closeReviewPrompt,
+    showPresetStep,
+    choosePreset,
+    highlightedPresetIndex,
+    setHighlightedPresetIndex,
+    highlightedBranchIndex,
+    setHighlightedBranchIndex,
+    highlightedCommitIndex,
+    setHighlightedCommitIndex,
+    handleReviewPromptKeyDown,
+    confirmBranch,
+    selectBranch,
+    selectBranchAtIndex,
+    selectCommit,
+    selectCommitAtIndex,
+    confirmCommit,
+    updateCustomInstructions,
+    confirmCustom,
+    handleApprovalDecision,
+    handleApprovalRemember,
+    handleUserInputSubmit,
+    refreshAccountInfo,
+    refreshAccountRateLimits,
+  } = useThreads({
+    activeWorkspace,
+    onWorkspaceConnected: markWorkspaceConnected,
+    onDebug: addDebugEntry,
+    model: resolvedModel,
+    effort: resolvedEffort,
+    collaborationMode: collaborationModePayload,
+    accessMode,
+    reviewDeliveryMode: appSettings.reviewDeliveryMode,
+    steerEnabled: appSettings.steerEnabled,
+    threadTitleAutogenerationEnabled: appSettings.threadTitleAutogenerationEnabled,
+    customPrompts: prompts,
+    onMessageActivity: handleThreadMessageActivity,
+    threadSortKey: threadListSortKey,
+  });
+  const {
+    centerMode,
+    setCenterMode,
+    selectedDiffPath,
+    setSelectedDiffPath,
+    diffScrollRequestId,
+    gitPanelMode,
+    setGitPanelMode,
+    gitDiffViewStyle,
+    setGitDiffViewStyle,
+    filePanelMode,
+    setFilePanelMode,
+    selectedPullRequest,
+    setSelectedPullRequest,
+    selectedCommitSha,
+    setSelectedCommitSha,
+    diffSource,
+    setDiffSource,
+    gitStatus,
+    refreshGitStatus,
+    queueGitStatusRefresh,
+    refreshGitDiffs,
+    gitLogEntries,
+    gitLogTotal,
+    gitLogAhead,
+    gitLogBehind,
+    gitLogAheadEntries,
+    gitLogBehindEntries,
+    gitLogUpstream,
+    gitLogLoading,
+    gitLogError,
+    refreshGitLog,
+    gitCommitDiffs,
+    shouldLoadDiffs,
+    activeDiffs,
+    activeDiffLoading,
+    activeDiffError,
+    perFileDiffGroups,
+    handleSelectDiff,
+    handleSelectPerFileDiff,
+    handleSelectCommit,
+    handleActiveDiffPath,
+    handleGitPanelModeChange,
+    activeWorkspaceIdRef,
+    activeWorkspaceRef,
+  } = useGitPanelController({
+    activeWorkspace,
+    activeItems,
+    gitDiffPreloadEnabled: appSettings.preloadGitDiffs,
+    gitDiffIgnoreWhitespaceChanges: appSettings.gitDiffIgnoreWhitespaceChanges,
+    splitChatDiffView: appSettings.splitChatDiffView,
+    isCompact,
+    isTablet,
+    activeTab,
+    tabletTab,
+    setActiveTab,
+    prDiffs: gitPullRequestDiffs,
+    prDiffsLoading: gitPullRequestDiffsLoading,
+    prDiffsError: gitPullRequestDiffsError,
+  });
+  queueGitStatusRefreshRef.current = queueGitStatusRefresh;
+
+  const shouldLoadGitHubPanelData =
+    gitPanelMode === "issues" ||
+    gitPanelMode === "prs" ||
+    (shouldLoadDiffs && diffSource === "pr");
+
+  const alertError = useCallback((error: unknown) => {
+    alert(error instanceof Error ? error.message : String(error));
+  }, []);
   const { branches, checkoutBranch, checkoutPullRequest, createBranch } = useGitBranches({
     activeWorkspace,
     onDebug: addDebugEntry
@@ -583,9 +683,6 @@ function MainApp() {
     isEnabled: isBranchSwitcherEnabled,
     onTrigger: openBranchSwitcher,
   });
-  const alertError = useCallback((error: unknown) => {
-    alert(error instanceof Error ? error.message : String(error));
-  }, []);
   const {
     applyWorktreeChanges: handleApplyWorktreeChanges,
     revertAllGitChanges: handleRevertAllGitChanges,
@@ -602,9 +699,6 @@ function MainApp() {
     onRefreshGitDiffs: refreshGitDiffs,
     onError: alertError,
   });
-
-  const resolvedModel = selectedModel?.model ?? null;
-  const resolvedEffort = reasoningSupported ? selectedEffort : null;
   const { activeGitRoot, handleSetGitRoot, handlePickGitRoot } = useGitRootSelection({
     activeWorkspace,
     updateWorkspaceSettings,
@@ -646,102 +740,16 @@ function MainApp() {
     ],
   );
 
-
   useSyncSelectedDiffPath({
     diffSource,
     centerMode,
     gitPullRequestDiffs,
     gitCommitDiffs,
+    perFileDiffGroups,
     selectedDiffPath,
     setSelectedDiffPath,
   });
 
-  const { collaborationModePayload } = useCollaborationModeSelection({
-    selectedCollaborationMode,
-    selectedCollaborationModeId,
-    selectedEffort: resolvedEffort,
-    resolvedModel,
-  });
-
-  const {
-    setActiveThreadId,
-    activeThreadId,
-    activeItems,
-    approvals,
-    userInputRequests,
-    threadsByWorkspace,
-    threadParentById,
-    threadStatusById,
-    threadResumeLoadingById,
-    threadListLoadingByWorkspace,
-    threadListPagingByWorkspace,
-    threadListCursorByWorkspace,
-    activeTurnIdByThread,
-    tokenUsageByThread,
-    rateLimitsByWorkspace,
-    accountByWorkspace,
-    planByThread,
-    lastAgentMessageByThread,
-    interruptTurn,
-    removeThread,
-    pinThread,
-    unpinThread,
-    isThreadPinned,
-    getPinTimestamp,
-    renameThread,
-    startThreadForWorkspace,
-    listThreadsForWorkspace,
-    loadOlderThreadsForWorkspace,
-    resetWorkspaceThreads,
-    refreshThread,
-    sendUserMessage,
-    sendUserMessageToThread,
-    startFork,
-    startReview,
-    startResume,
-    startCompact,
-    startApps,
-    startMcp,
-    startStatus,
-    reviewPrompt,
-    closeReviewPrompt,
-    showPresetStep,
-    choosePreset,
-    highlightedPresetIndex,
-    setHighlightedPresetIndex,
-    highlightedBranchIndex,
-    setHighlightedBranchIndex,
-    highlightedCommitIndex,
-    setHighlightedCommitIndex,
-    handleReviewPromptKeyDown,
-    confirmBranch,
-    selectBranch,
-    selectBranchAtIndex,
-    selectCommit,
-    selectCommitAtIndex,
-    confirmCommit,
-    updateCustomInstructions,
-    confirmCustom,
-    handleApprovalDecision,
-    handleApprovalRemember,
-    handleUserInputSubmit,
-    refreshAccountInfo,
-    refreshAccountRateLimits,
-  } = useThreads({
-    activeWorkspace,
-    onWorkspaceConnected: markWorkspaceConnected,
-    onDebug: addDebugEntry,
-    model: resolvedModel,
-    effort: resolvedEffort,
-    collaborationMode: collaborationModePayload,
-    accessMode,
-    reviewDeliveryMode: appSettings.reviewDeliveryMode,
-    steerEnabled: appSettings.steerEnabled,
-    threadTitleAutogenerationEnabled: appSettings.threadTitleAutogenerationEnabled,
-    customPrompts: prompts,
-    onMessageActivity: queueGitStatusRefresh,
-    threadSortKey: threadListSortKey,
-  });
   const { apps } = useApps({
     activeWorkspace,
     activeThreadId,
@@ -1920,9 +1928,11 @@ function MainApp() {
       : undefined,
     gitStatus,
     fileStatus,
+    perFileDiffGroups,
     selectedDiffPath,
     diffScrollRequestId,
     onSelectDiff: handleSelectDiff,
+    onSelectPerFileDiff: handleSelectPerFileDiff,
     diffSource,
     gitLogEntries,
     gitLogTotal,