From 43a4c0c874ac0220375c12a26f7b701f84529d6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E6=9B=9C=E5=B3=A5=E8=A1=8C?=
 <Yaozhenghang.Ma@gmail.com>
Date: Wed, 15 Apr 2026 01:08:59 +0800
Subject: [PATCH] add tree view (#906)

---
 .../sections/openchamber/GitSettings.tsx      |  67 +++-
 .../ui/src/components/views/git/ChangeRow.tsx |   3 +
 .../components/views/git/ChangesSection.tsx   | 356 ++++++++++++++++--
 packages/ui/src/lib/api/types.ts              |   1 +
 packages/ui/src/lib/appearanceAutoSave.ts     |   7 +
 packages/ui/src/lib/desktop.ts                |   1 +
 packages/ui/src/lib/persistence.ts            |  12 +
 packages/ui/src/stores/useUIStore.ts          |  16 +-
 .../server/lib/opencode/settings-helpers.js   |   6 +
 9 files changed, 434 insertions(+), 35 deletions(-)

diff --git a/packages/ui/src/components/sections/openchamber/GitSettings.tsx b/packages/ui/src/components/sections/openchamber/GitSettings.tsx
index dfa7179c..8c057fb6 100644
--- a/packages/ui/src/components/sections/openchamber/GitSettings.tsx
+++ b/packages/ui/src/components/sections/openchamber/GitSettings.tsx
@@ -1,7 +1,9 @@
 import React from 'react';
 import { Checkbox } from '@/components/ui/checkbox';
+import { Radio } from '@/components/ui/radio';
 import { updateDesktopSettings } from '@/lib/persistence';
 import { useConfigStore } from '@/stores/useConfigStore';
+import { useUIStore } from '@/stores/useUIStore';
 import { getRegisteredRuntimeAPIs } from '@/contexts/runtimeAPIRegistry';
 import { setFilesViewShowGitignored, useFilesViewShowGitignored } from '@/lib/filesViewShowGitignored';
 
@@ -9,14 +11,21 @@ export const GitSettings: React.FC = () => {
   const settingsGitmojiEnabled = useConfigStore((state) => state.settingsGitmojiEnabled);
   const setSettingsGitmojiEnabled = useConfigStore((state) => state.setSettingsGitmojiEnabled);
   const showGitignored = useFilesViewShowGitignored();
+  const gitChangesViewMode = useUIStore((state) => state.gitChangesViewMode);
+  const setGitChangesViewMode = useUIStore((state) => state.setGitChangesViewMode);
 
   const [isLoading, setIsLoading] = React.useState(true);
 
+  type GitSettingsPayload = {
+    gitmojiEnabled?: boolean;
+    gitChangesViewMode?: 'flat' | 'tree';
+  };
+
   // Load current settings
   React.useEffect(() => {
     const loadSettings = async () => {
       try {
-        let data: { gitmojiEnabled?: boolean } | null = null;
+        let data: GitSettingsPayload | null = null;
 
         // 1. Runtime settings API (VSCode)
         if (!data) {
@@ -30,6 +39,11 @@ export const GitSettings: React.FC = () => {
                   gitmojiEnabled: typeof (settings as Record<string, unknown>).gitmojiEnabled === 'boolean'
                     ? ((settings as Record<string, unknown>).gitmojiEnabled as boolean)
                     : undefined,
+                  gitChangesViewMode:
+                    (settings as Record<string, unknown>).gitChangesViewMode === 'flat'
+                    || (settings as Record<string, unknown>).gitChangesViewMode === 'tree'
+                      ? ((settings as Record<string, unknown>).gitChangesViewMode as 'flat' | 'tree')
+                      : undefined,
                 };
               }
             } catch {
@@ -53,6 +67,9 @@ export const GitSettings: React.FC = () => {
           if (typeof data.gitmojiEnabled === 'boolean') {
             setSettingsGitmojiEnabled(data.gitmojiEnabled);
           }
+          if (data.gitChangesViewMode === 'flat' || data.gitChangesViewMode === 'tree') {
+            setGitChangesViewMode(data.gitChangesViewMode);
+          }
         }
 
       } catch (error) {
@@ -62,7 +79,7 @@ export const GitSettings: React.FC = () => {
       }
     };
     loadSettings();
-  }, [setSettingsGitmojiEnabled]);
+  }, [setGitChangesViewMode, setSettingsGitmojiEnabled]);
 
   const handleGitmojiChange = React.useCallback(async (enabled: boolean) => {
     setSettingsGitmojiEnabled(enabled);
@@ -75,6 +92,15 @@ export const GitSettings: React.FC = () => {
     }
   }, [setSettingsGitmojiEnabled]);
 
+  const handleGitChangesViewModeChange = React.useCallback((mode: 'flat' | 'tree') => {
+    if (mode === gitChangesViewMode) {
+      return;
+    }
+
+    setGitChangesViewMode(mode);
+    void updateDesktopSettings({ gitChangesViewMode: mode });
+  }, [gitChangesViewMode, setGitChangesViewMode]);
+
   if (isLoading) {
     return null;
   }
@@ -86,6 +112,43 @@ export const GitSettings: React.FC = () => {
       </div>
 
       <section className="px-2 pb-2 pt-0 space-y-0.5">
+        <div className="pt-1 pb-1">
+          <h4 className="typography-ui-header font-medium text-foreground">Changes View</h4>
+          <div role="radiogroup" aria-label="Git changes view mode" className="mt-0.5 space-y-0">
+            {[
+              { id: 'flat' as const, label: 'Flat List' },
+              { id: 'tree' as const, label: 'Tree View' },
+            ].map((option) => {
+              const selected = gitChangesViewMode === option.id;
+              return (
+                <div
+                  key={option.id}
+                  role="button"
+                  tabIndex={0}
+                  aria-pressed={selected}
+                  onClick={() => { handleGitChangesViewModeChange(option.id); }}
+                  onKeyDown={(event) => {
+                    if (event.key === ' ' || event.key === 'Enter') {
+                      event.preventDefault();
+                      handleGitChangesViewModeChange(option.id);
+                    }
+                  }}
+                  className="flex w-full items-center gap-2 py-0 text-left"
+                >
+                  <Radio
+                    checked={selected}
+                    onChange={() => { handleGitChangesViewModeChange(option.id); }}
+                    ariaLabel={`Git changes view mode: ${option.label}`}
+                  />
+                  <span className={selected ? 'typography-ui-label font-normal text-foreground' : 'typography-ui-label font-normal text-foreground/50'}>
+                    {option.label}
+                  </span>
+                </div>
+              );
+            })}
+          </div>
+        </div>
+
         <div
           className="group flex cursor-pointer items-center gap-2 py-1.5"
           role="button"
diff --git a/packages/ui/src/components/views/git/ChangeRow.tsx b/packages/ui/src/components/views/git/ChangeRow.tsx
index 213e45e3..c17ba43e 100644
--- a/packages/ui/src/components/views/git/ChangeRow.tsx
+++ b/packages/ui/src/components/views/git/ChangeRow.tsx
@@ -50,6 +50,7 @@ interface ChangeRowProps {
   isReverting: boolean;
   stats?: { insertions: number; deletions: number };
   rowPaddingClassName?: string;
+  indentPx?: number;
 }
 
 export const ChangeRow = React.memo<ChangeRowProps>(function ChangeRow({
@@ -61,6 +62,7 @@ export const ChangeRow = React.memo<ChangeRowProps>(function ChangeRow({
   isReverting,
   stats,
   rowPaddingClassName,
+  indentPx = 0,
 }) {
   const descriptor = useMemo(() => describeChange(file), [file]);
   const indicatorLabel = descriptor.description;
@@ -105,6 +107,7 @@ export const ChangeRow = React.memo<ChangeRowProps>(function ChangeRow({
       tabIndex={0}
       onClick={onViewDiff}
       onKeyDown={handleKeyDown}
+      style={indentPx > 0 ? { paddingLeft: `${indentPx}px` } : undefined}
     >
         <button
           type="button"
diff --git a/packages/ui/src/components/views/git/ChangesSection.tsx b/packages/ui/src/components/views/git/ChangesSection.tsx
index b068e0fb..20d7a1f6 100644
--- a/packages/ui/src/components/views/git/ChangesSection.tsx
+++ b/packages/ui/src/components/views/git/ChangesSection.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { useVirtualizer } from '@tanstack/react-virtual';
-import { RiCheckboxBlankLine, RiCheckboxLine } from '@remixicon/react';
+import { RiArrowDownSLine, RiArrowRightSLine, RiCheckboxBlankLine, RiCheckboxLine, RiSubtractLine } from '@remixicon/react';
 import { Button } from '@/components/ui/button';
 import {
   Dialog,
@@ -15,6 +15,7 @@ import { OverlayScrollbar } from '@/components/ui/OverlayScrollbar';
 import { ChangeRow } from './ChangeRow';
 import type { GitStatus } from '@/lib/api/types';
 import { cn } from '@/lib/utils';
+import { useUIStore } from '@/stores/useUIStore';
 
 interface ChangesSectionProps {
   changeEntries: GitStatus['files'];
@@ -35,6 +36,137 @@ interface ChangesSectionProps {
 const CHANGE_LIST_VIRTUALIZE_THRESHOLD = 120;
 const CHANGE_ROW_ESTIMATE_PX = 34;
 
+type ChangesTreeDirectoryNode = {
+  id: string;
+  path: string;
+  name: string;
+  children: Map<string, ChangesTreeDirectoryNode>;
+  directFiles: GitStatus['files'];
+  files: GitStatus['files'];
+};
+
+type FlattenedTreeRow =
+  | {
+      key: string;
+      kind: 'directory';
+      depth: number;
+      directory: ChangesTreeDirectoryNode;
+    }
+  | {
+      key: string;
+      kind: 'file';
+      depth: number;
+      file: GitStatus['files'][number];
+    };
+
+const TREE_INDENT_PX = 14;
+
+const normalizePathForTree = (value: string): string => value.replace(/\\/g, '/').replace(/^\/+/, '').trim();
+
+const createDirectoryNode = (path: string, name: string): ChangesTreeDirectoryNode => ({
+  id: `dir:${path}`,
+  path,
+  name,
+  children: new Map(),
+  directFiles: [],
+  files: [],
+});
+
+const buildChangesTree = (entries: GitStatus['files']): ChangesTreeDirectoryNode => {
+  const root = createDirectoryNode('', '');
+
+  for (const file of entries) {
+    const normalized = normalizePathForTree(file.path);
+    if (!normalized) {
+      continue;
+    }
+
+    const segments = normalized.split('/').filter(Boolean);
+    const directorySegments = segments.slice(0, -1);
+    let current = root;
+    current.files.push(file);
+
+    if (directorySegments.length > 0) {
+      let currentPath = '';
+      for (const segment of directorySegments) {
+        currentPath = currentPath ? `${currentPath}/${segment}` : segment;
+        const existing = current.children.get(segment);
+        if (existing) {
+          existing.files.push(file);
+          current = existing;
+          continue;
+        }
+
+        const created = createDirectoryNode(currentPath, segment);
+        created.files.push(file);
+        current.children.set(segment, created);
+        current = created;
+      }
+    }
+
+    current.directFiles.push(file);
+  }
+
+  return root;
+};
+
+const flattenChangesTree = (
+  root: ChangesTreeDirectoryNode,
+  expandedDirectories: Set<string>,
+): FlattenedTreeRow[] => {
+  const rows: FlattenedTreeRow[] = [];
+
+  const walk = (node: ChangesTreeDirectoryNode, depth: number) => {
+    const directories = Array.from(node.children.values()).sort((a, b) => a.path.localeCompare(b.path));
+    for (const directory of directories) {
+      rows.push({
+        key: directory.id,
+        kind: 'directory',
+        depth,
+        directory,
+      });
+
+      if (expandedDirectories.has(directory.path)) {
+        walk(directory, depth + 1);
+      }
+    }
+
+    const directFiles = [...node.directFiles].sort((a, b) => a.path.localeCompare(b.path));
+
+    for (const file of directFiles) {
+      rows.push({
+        key: `file:${normalizePathForTree(file.path)}`,
+        kind: 'file',
+        depth,
+        file,
+      });
+    }
+  };
+
+  walk(root, 0);
+  return rows;
+};
+
+const getDirectorySelectionState = (
+  directory: ChangesTreeDirectoryNode,
+  selectedPaths: Set<string>
+): 'none' | 'partial' | 'all' => {
+  if (directory.files.length === 0) {
+    return 'none';
+  }
+
+  let selectedCount = 0;
+  for (const file of directory.files) {
+    if (selectedPaths.has(file.path)) {
+      selectedCount += 1;
+    }
+  }
+
+  if (selectedCount === 0) return 'none';
+  if (selectedCount === directory.files.length) return 'all';
+  return 'partial';
+};
+
 export const ChangesSection: React.FC<ChangesSectionProps> = ({
   changeEntries,
   selectedPaths,
@@ -51,16 +183,53 @@ export const ChangesSection: React.FC<ChangesSectionProps> = ({
   onVisiblePathsChange,
 }) => {
   const scrollRef = React.useRef<HTMLDivElement | null>(null);
+  const gitChangesViewMode = useUIStore((state) => state.gitChangesViewMode);
+  const isTreeView = gitChangesViewMode === 'tree';
   const selectedCount = selectedPaths.size;
   const totalCount = changeEntries.length;
   const [confirmRevertAllOpen, setConfirmRevertAllOpen] = React.useState(false);
-  const shouldVirtualize = totalCount >= CHANGE_LIST_VIRTUALIZE_THRESHOLD;
+  const treeRoot = React.useMemo(() => buildChangesTree(changeEntries), [changeEntries]);
+  const [expandedDirectories, setExpandedDirectories] = React.useState<Set<string>>(new Set());
+
+  const topLevelDirectoryPaths = React.useMemo(
+    () => Array.from(treeRoot.children.values()).map((directory) => directory.path),
+    [treeRoot]
+  );
+
+  React.useEffect(() => {
+    if (!isTreeView) {
+      return;
+    }
+
+    setExpandedDirectories((previous) => {
+      const next = new Set<string>();
+      const validTopLevel = new Set(topLevelDirectoryPaths);
+
+      previous.forEach((path) => {
+        if (path.includes('/')) {
+          next.add(path);
+          return;
+        }
+        if (validTopLevel.has(path)) {
+          next.add(path);
+        }
+      });
+
+      topLevelDirectoryPaths.forEach((path) => next.add(path));
+      return next;
+    });
+  }, [isTreeView, topLevelDirectoryPaths]);
+
+  const treeRows = React.useMemo(() => flattenChangesTree(treeRoot, expandedDirectories), [expandedDirectories, treeRoot]);
+  const rowItems = React.useMemo(() => (isTreeView ? treeRows : changeEntries), [changeEntries, isTreeView, treeRows]);
+  const rowCount = rowItems.length;
+  const shouldVirtualize = rowCount >= CHANGE_LIST_VIRTUALIZE_THRESHOLD;
   const hasAnySelected = selectedCount > 0;
   const areAllSelected = totalCount > 0 && selectedCount === totalCount;
   const isPartiallySelected = hasAnySelected && !areAllSelected;
 
   const rowVirtualizer = useVirtualizer({
-    count: totalCount,
+    count: rowCount,
     getScrollElement: () => scrollRef.current,
     estimateSize: () => CHANGE_ROW_ESTIMATE_PX,
     overscan: 10,
@@ -104,24 +273,161 @@ export const ChangesSection: React.FC<ChangesSectionProps> = ({
       return;
     }
 
-    if (totalCount === 0) {
+    if (rowCount === 0) {
       onVisiblePathsChange([]);
       return;
     }
 
+    const toVisiblePath = (item: GitStatus['files'][number] | FlattenedTreeRow): string | null => {
+      if (!isTreeView) {
+        return (item as GitStatus['files'][number]).path;
+      }
+
+      const treeItem = item as FlattenedTreeRow;
+      return treeItem.kind === 'file' ? treeItem.file.path : null;
+    };
+
     if (!shouldVirtualize) {
-      onVisiblePathsChange(changeEntries.slice(0, Math.min(30, totalCount)).map((entry) => entry.path));
+      onVisiblePathsChange(
+        rowItems
+          .slice(0, Math.min(30, rowCount))
+          .map((item) => toVisiblePath(item))
+          .filter((value): value is string => Boolean(value))
+      );
       return;
     }
 
-    onVisiblePathsChange(virtualRows.map((row) => changeEntries[row.index]?.path).filter((value): value is string => Boolean(value)));
-  }, [changeEntries, onVisiblePathsChange, shouldVirtualize, totalCount, virtualRows]);
+    onVisiblePathsChange(
+      virtualRows
+        .map((row) => rowItems[row.index])
+        .map((item) => (item ? toVisiblePath(item) : null))
+        .filter((value): value is string => Boolean(value))
+    );
+  }, [isTreeView, onVisiblePathsChange, rowCount, rowItems, shouldVirtualize, virtualRows]);
 
   const containerClassName = 'flex flex-col flex-1 min-h-0';
   const headerClassName = 'flex items-center justify-between gap-2 px-0 py-3 border-b border-border/40';
   const scrollOuterClassName = `flex-1 min-h-0 pr-0 ${maxListHeightClassName ?? ''}`.trim();
   const rowPaddingClassName = 'pl-0 pr-2';
 
+  const toggleDirectoryExpanded = React.useCallback((path: string) => {
+    setExpandedDirectories((previous) => {
+      const next = new Set(previous);
+      if (next.has(path)) {
+        next.delete(path);
+      } else {
+        next.add(path);
+      }
+      return next;
+    });
+  }, []);
+
+  const toggleDirectorySelection = React.useCallback((directory: ChangesTreeDirectoryNode) => {
+    const state = getDirectorySelectionState(directory, selectedPaths);
+    const shouldSelectAll = state !== 'all';
+
+    for (const file of directory.files) {
+      const isSelected = selectedPaths.has(file.path);
+      if (shouldSelectAll && !isSelected) {
+        onToggleFile(file.path);
+      } else if (!shouldSelectAll && isSelected) {
+        onToggleFile(file.path);
+      }
+    }
+  }, [onToggleFile, selectedPaths]);
+
+  const renderRow = React.useCallback((item: GitStatus['files'][number] | FlattenedTreeRow) => {
+    if (!isTreeView) {
+      const file = item as GitStatus['files'][number];
+      return (
+        <ChangeRow
+          file={file}
+          checked={selectedPaths.has(file.path)}
+          stats={diffStats?.[file.path]}
+          onToggle={() => onToggleFile(file.path)}
+          onViewDiff={() => onViewDiff(file.path)}
+          onRevert={() => onRevertFile(file.path)}
+          isReverting={revertingPaths.has(file.path) || isRevertingAll}
+          rowPaddingClassName={rowPaddingClassName}
+        />
+      );
+    }
+
+    const row = item as FlattenedTreeRow;
+
+    if (row.kind === 'file') {
+      const file = row.file;
+      return (
+        <ChangeRow
+          file={file}
+          checked={selectedPaths.has(file.path)}
+          stats={diffStats?.[file.path]}
+          onToggle={() => onToggleFile(file.path)}
+          onViewDiff={() => onViewDiff(file.path)}
+          onRevert={() => onRevertFile(file.path)}
+          isReverting={revertingPaths.has(file.path) || isRevertingAll}
+          rowPaddingClassName={rowPaddingClassName}
+          indentPx={row.depth * TREE_INDENT_PX}
+        />
+      );
+    }
+
+    const directory = row.directory;
+    const isExpanded = expandedDirectories.has(directory.path);
+    const selectionState = getDirectorySelectionState(directory, selectedPaths);
+
+    return (
+      <div
+        className={cn('group flex items-center gap-2 py-1.5 hover:bg-sidebar/40', rowPaddingClassName)}
+        style={{ paddingLeft: `${row.depth * TREE_INDENT_PX}px` }}
+      >
+        <button
+          type="button"
+          onClick={() => toggleDirectoryExpanded(directory.path)}
+          className="flex size-5 shrink-0 items-center justify-center rounded text-muted-foreground hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary"
+          aria-label={isExpanded ? `Collapse ${directory.path}` : `Expand ${directory.path}`}
+        >
+          {isExpanded ? <RiArrowDownSLine className="size-4" /> : <RiArrowRightSLine className="size-4" />}
+        </button>
+
+        <button
+          type="button"
+          role="checkbox"
+          aria-checked={selectionState === 'partial' ? 'mixed' : selectionState === 'all'}
+          aria-label={`Toggle selection for directory ${directory.path}`}
+          onClick={() => toggleDirectorySelection(directory)}
+          className="flex size-5 shrink-0 items-center justify-center rounded text-muted-foreground hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary"
+        >
+          {selectionState === 'all' ? (
+            <RiCheckboxLine className="size-4 text-primary" />
+          ) : selectionState === 'partial' ? (
+            <RiSubtractLine className="size-4 text-primary" />
+          ) : (
+            <RiCheckboxBlankLine className="size-4" />
+          )}
+        </button>
+
+        <span className="min-w-0 truncate typography-ui-label text-foreground" title={directory.path}>
+          {directory.name}
+        </span>
+        <span className="ml-auto shrink-0 typography-micro text-muted-foreground">{directory.files.length}</span>
+      </div>
+    );
+  }, [
+    diffStats,
+    expandedDirectories,
+    isRevertingAll,
+    isTreeView,
+    onRevertFile,
+    onToggleFile,
+    onViewDiff,
+    revertingPaths,
+    rowPaddingClassName,
+    selectedPaths,
+    toggleDirectoryExpanded,
+    toggleDirectorySelection,
+  ]);
+
   const handleConfirmRevertAll = React.useCallback(async () => {
     if (!onRevertAll || isRevertingAll || changeEntries.length === 0) {
       return;
@@ -184,14 +490,18 @@ export const ChangesSection: React.FC<ChangesSectionProps> = ({
                 style={{ height: `${rowVirtualizer.getTotalSize()}px` }}
               >
                 {virtualRows.map((row) => {
-                  const file = changeEntries[row.index];
-                  if (!file) {
+                  const item = rowItems[row.index];
+                  if (!item) {
                     return null;
                   }
 
+                  const key = isTreeView
+                    ? (item as FlattenedTreeRow).key
+                    : `file:${(item as GitStatus['files'][number]).path}`;
+
                   return (
                     <div
-                      key={file.path}
+                      key={key}
                       ref={rowVirtualizer.measureElement}
                       data-index={row.index}
                       className={cn(
@@ -200,40 +510,22 @@ export const ChangesSection: React.FC<ChangesSectionProps> = ({
                       )}
                       style={{ transform: `translateY(${row.start}px)` }}
                     >
-                      <ChangeRow
-                        file={file}
-                        checked={selectedPaths.has(file.path)}
-                        stats={diffStats?.[file.path]}
-                        onToggle={() => onToggleFile(file.path)}
-                        onViewDiff={() => onViewDiff(file.path)}
-                        onRevert={() => onRevertFile(file.path)}
-                        isReverting={revertingPaths.has(file.path) || isRevertingAll}
-                        rowPaddingClassName={rowPaddingClassName}
-                      />
+                      {renderRow(item)}
                     </div>
                   );
                 })}
               </div>
             ) : (
               <div role="list" aria-label="Changed files">
-                {changeEntries.map((file, index) => (
+                {rowItems.map((item, index) => (
                   <div
-                    key={file.path}
+                    key={isTreeView ? (item as FlattenedTreeRow).key : `file:${(item as GitStatus['files'][number]).path}`}
                     className={cn(
                       'relative',
                       index > 0 && 'before:pointer-events-none before:absolute before:left-0 before:right-2 before:top-0 before:border-t before:border-border/60'
                     )}
                   >
-                    <ChangeRow
-                      file={file}
-                      checked={selectedPaths.has(file.path)}
-                      stats={diffStats?.[file.path]}
-                      onToggle={() => onToggleFile(file.path)}
-                      onViewDiff={() => onViewDiff(file.path)}
-                      onRevert={() => onRevertFile(file.path)}
-                      isReverting={revertingPaths.has(file.path) || isRevertingAll}
-                      rowPaddingClassName={rowPaddingClassName}
-                    />
+                    {renderRow(item)}
                   </div>
                 ))}
               </div>
diff --git a/packages/ui/src/lib/api/types.ts b/packages/ui/src/lib/api/types.ts
index 9f9c253c..3e5c27dc 100644
--- a/packages/ui/src/lib/api/types.ts
+++ b/packages/ui/src/lib/api/types.ts
@@ -557,6 +557,7 @@ export interface SettingsPayload {
   inputBarOffset?: number;
   diffLayoutPreference?: 'dynamic' | 'inline' | 'side-by-side';
   diffViewMode?: 'single' | 'stacked';
+  gitChangesViewMode?: 'flat' | 'tree';
   directoryShowHidden?: boolean;
   filesViewShowGitignored?: boolean;
   openInAppId?: string;
diff --git a/packages/ui/src/lib/appearanceAutoSave.ts b/packages/ui/src/lib/appearanceAutoSave.ts
index 1e492ba6..7250c389 100644
--- a/packages/ui/src/lib/appearanceAutoSave.ts
+++ b/packages/ui/src/lib/appearanceAutoSave.ts
@@ -31,6 +31,7 @@ type AppearanceSlice = {
   inputBarOffset: number;
   diffLayoutPreference: 'dynamic' | 'inline' | 'side-by-side';
   diffViewMode: 'single' | 'stacked';
+  gitChangesViewMode: 'flat' | 'tree';
 };
 
 let initialized = false;
@@ -66,6 +67,7 @@ export const startAppearanceAutoSave = (): void => {
     inputBarOffset: useUIStore.getState().inputBarOffset,
     diffLayoutPreference: useUIStore.getState().diffLayoutPreference,
     diffViewMode: useUIStore.getState().diffViewMode,
+    gitChangesViewMode: useUIStore.getState().gitChangesViewMode,
   };
 
   let pending: Partial<DesktopSettings> | null = null;
@@ -113,6 +115,7 @@ export const startAppearanceAutoSave = (): void => {
       inputBarOffset: state.inputBarOffset,
       diffLayoutPreference: state.diffLayoutPreference,
       diffViewMode: state.diffViewMode,
+      gitChangesViewMode: state.gitChangesViewMode,
     };
 
     const diff: Partial<DesktopSettings> = {};
@@ -186,6 +189,9 @@ export const startAppearanceAutoSave = (): void => {
     if (current.diffViewMode !== previous.diffViewMode) {
       diff.diffViewMode = current.diffViewMode;
     }
+    if (current.gitChangesViewMode !== previous.gitChangesViewMode) {
+      diff.gitChangesViewMode = current.gitChangesViewMode;
+    }
 
     previous = current;
 
@@ -193,4 +199,5 @@ export const startAppearanceAutoSave = (): void => {
       schedule(diff);
     }
   });
+
 };
diff --git a/packages/ui/src/lib/desktop.ts b/packages/ui/src/lib/desktop.ts
index e7655a68..8c26bf85 100644
--- a/packages/ui/src/lib/desktop.ts
+++ b/packages/ui/src/lib/desktop.ts
@@ -137,6 +137,7 @@ export type DesktopSettings = {
   recentModels?: Array<{ providerID: string; modelID: string }>;
   diffLayoutPreference?: 'dynamic' | 'inline' | 'side-by-side';
   diffViewMode?: 'single' | 'stacked';
+  gitChangesViewMode?: 'flat' | 'tree';
   directoryShowHidden?: boolean;
   filesViewShowGitignored?: boolean;
 
diff --git a/packages/ui/src/lib/persistence.ts b/packages/ui/src/lib/persistence.ts
index dc97187a..f7880fce 100644
--- a/packages/ui/src/lib/persistence.ts
+++ b/packages/ui/src/lib/persistence.ts
@@ -450,6 +450,12 @@ const applyDesktopUiPreferences = (settings: DesktopSettings) => {
       store.setDiffViewMode(settings.diffViewMode);
     }
   }
+  if (typeof settings.gitChangesViewMode === 'string'
+    && (settings.gitChangesViewMode === 'flat' || settings.gitChangesViewMode === 'tree')) {
+    if (settings.gitChangesViewMode !== store.gitChangesViewMode) {
+      store.setGitChangesViewMode(settings.gitChangesViewMode);
+    }
+  }
   if (typeof settings.directoryShowHidden === 'boolean') {
     setDirectoryShowHidden(settings.directoryShowHidden, { persist: false });
   }
@@ -832,6 +838,12 @@ const sanitizeWebSettings = (payload: unknown): DesktopSettings | null => {
   ) {
     result.diffViewMode = candidate.diffViewMode;
   }
+  if (
+    typeof candidate.gitChangesViewMode === 'string'
+    && (candidate.gitChangesViewMode === 'flat' || candidate.gitChangesViewMode === 'tree')
+  ) {
+    result.gitChangesViewMode = candidate.gitChangesViewMode;
+  }
   if (typeof candidate.directoryShowHidden === 'boolean') {
     result.directoryShowHidden = candidate.directoryShowHidden;
   }
diff --git a/packages/ui/src/stores/useUIStore.ts b/packages/ui/src/stores/useUIStore.ts
index 89b26e02..4f9a59f8 100644
--- a/packages/ui/src/stores/useUIStore.ts
+++ b/packages/ui/src/stores/useUIStore.ts
@@ -524,6 +524,7 @@ interface UIStore {
   diffFileLayout: Record<string, 'inline' | 'side-by-side'>;
   diffWrapLines: boolean;
   diffViewMode: 'single' | 'stacked';
+  gitChangesViewMode: 'flat' | 'tree';
   isTimelineDialogOpen: boolean;
   isImagePreviewOpen: boolean;
   nativeNotificationsEnabled: boolean;
@@ -645,6 +646,7 @@ interface UIStore {
   setDiffFileLayout: (filePath: string, mode: 'inline' | 'side-by-side') => void;
   setDiffWrapLines: (wrap: boolean) => void;
   setDiffViewMode: (mode: 'single' | 'stacked') => void;
+  setGitChangesViewMode: (mode: 'flat' | 'tree') => void;
   setMultiRunLauncherOpen: (open: boolean) => void;
   setTimelineDialogOpen: (open: boolean) => void;
   setImagePreviewOpen: (open: boolean) => void;
@@ -751,6 +753,7 @@ export const useUIStore = create<UIStore>()(
         diffFileLayout: {},
         diffWrapLines: false,
         diffViewMode: 'stacked',
+        gitChangesViewMode: 'flat',
         isTimelineDialogOpen: false,
         isImagePreviewOpen: false,
         nativeNotificationsEnabled: false,
@@ -1431,6 +1434,10 @@ export const useUIStore = create<UIStore>()(
         setDiffViewMode: (mode) => {
           set({ diffViewMode: mode });
         },
+
+        setGitChangesViewMode: (mode) => {
+          set({ gitChangesViewMode: mode });
+        },
  
         setInputBarOffset: (offset) => {
           set({ inputBarOffset: offset });
@@ -1746,7 +1753,7 @@ export const useUIStore = create<UIStore>()(
       {
         name: 'ui-store',
         storage: createJSONStorage(() => getSafeStorage()),
-        version: 7,
+        version: 8,
         migrate: (persistedState, version) => {
           if (!persistedState || typeof persistedState !== 'object') {
             return persistedState;
@@ -1815,6 +1822,12 @@ export const useUIStore = create<UIStore>()(
             state.contextPanelByDirectory = sanitizeContextPanelByDirectory(state.contextPanelByDirectory);
           }
 
+          if (version < 8) {
+            if (state.gitChangesViewMode !== 'flat' && state.gitChangesViewMode !== 'tree') {
+              state.gitChangesViewMode = 'flat';
+            }
+          }
+
           return state;
         },
         partialize: (state) => ({
@@ -1859,6 +1872,7 @@ export const useUIStore = create<UIStore>()(
           diffLayoutPreference: state.diffLayoutPreference,
           diffWrapLines: state.diffWrapLines,
           diffViewMode: state.diffViewMode,
+          gitChangesViewMode: state.gitChangesViewMode,
           nativeNotificationsEnabled: state.nativeNotificationsEnabled,
           notificationMode: state.notificationMode,
           showTerminalQuickKeysOnDesktop: state.showTerminalQuickKeysOnDesktop,
diff --git a/packages/web/server/lib/opencode/settings-helpers.js b/packages/web/server/lib/opencode/settings-helpers.js
index 71e2d219..be2ea0ea 100644
--- a/packages/web/server/lib/opencode/settings-helpers.js
+++ b/packages/web/server/lib/opencode/settings-helpers.js
@@ -371,6 +371,12 @@ export const createSettingsHelpers = (dependencies) => {
         result.diffViewMode = mode;
       }
     }
+    if (typeof candidate.gitChangesViewMode === 'string') {
+      const mode = candidate.gitChangesViewMode.trim();
+      if (mode === 'flat' || mode === 'tree') {
+        result.gitChangesViewMode = mode;
+      }
+    }
     if (typeof candidate.directoryShowHidden === 'boolean') {
       result.directoryShowHidden = candidate.directoryShowHidden;
     }