Refine stacked diff view

2026-06-13 22:30:03 +03:00
parent 676f0b3898
commit cf8eac966e
28 changed files with 93 additions and 628 deletions
@@ -2283,11 +2283,11 @@ export const ContextPanel: React.FC = () => {
        key={activeTab.id}
        hideStackedFileSidebar
        stackedDefaultCollapsedAll
-        hideFileSelector
        pinSelectedFileHeaderToTopOnNavigate
        showOpenInEditorAction
        diffScope={activeTab.stagedDiff ? 'staged' : 'working'}
        targetFilePath={activeTab.targetPath}
+        flushContent
      />
    )
    : activeTab?.mode === 'context'
@@ -73,19 +73,6 @@ const DIFF_LAYOUT_OPTIONS: Option<'dynamic' | 'inline' | 'side-by-side'>[] = [
    },
 ];

-const DIFF_VIEW_MODE_OPTIONS: Option<'single' | 'stacked'>[] = [
-    {
-        id: 'single',
-        labelKey: 'settings.openchamber.visual.option.diffViewMode.single.label',
-        descriptionKey: 'settings.openchamber.visual.option.diffViewMode.single.description',
-    },
-    {
-        id: 'stacked',
-        labelKey: 'settings.openchamber.visual.option.diffViewMode.stacked.label',
-        descriptionKey: 'settings.openchamber.visual.option.diffViewMode.stacked.description',
-    },
-];
-
 const MERMAID_RENDERING_OPTIONS: Option<'svg' | 'ascii'>[] = [
    {
        id: 'svg',
@@ -297,8 +284,6 @@ export const OpenChamberVisualSettings: React.FC<OpenChamberVisualSettingsProps>
    const setMobileKeyboardMode = useUIStore(state => state.setMobileKeyboardMode);
    const diffLayoutPreference = useUIStore(state => state.diffLayoutPreference);
    const setDiffLayoutPreference = useUIStore(state => state.setDiffLayoutPreference);
-    const diffViewMode = useUIStore(state => state.diffViewMode);
-    const setDiffViewMode = useUIStore(state => state.setDiffViewMode);
    const showTerminalQuickKeysOnDesktop = useUIStore(state => state.showTerminalQuickKeysOnDesktop);
    const setShowTerminalQuickKeysOnDesktop = useUIStore(state => state.setShowTerminalQuickKeysOnDesktop);
    const fileEditorKeymap = useUIStore(state => state.fileEditorKeymap);
@@ -1696,41 +1681,6 @@ export const OpenChamberVisualSettings: React.FC<OpenChamberVisualSettingsProps>
                                        </section>
                                    )}

-                                    {shouldShow('diffLayout') && !isVSCode && (
-                                        <section className="p-2">
-                                            <h4 className="typography-ui-header font-medium text-foreground">{t('settings.openchamber.visual.section.diffViewMode')}</h4>
-                                            <div role="radiogroup" aria-label={t('settings.openchamber.visual.section.diffViewModeAria')} className="mt-0.5 space-y-0">
-                                                {DIFF_VIEW_MODE_OPTIONS.map((option) => {
-                                                    const selected = diffViewMode === option.id;
-                                                    return (
-                                                        <div
-                                                            key={option.id}
-                                                            role="button"
-                                                            tabIndex={0}
-                                                            aria-pressed={selected}
-                                                            onClick={() => setDiffViewMode(option.id)}
-                                                            onKeyDown={(event) => {
-                                                                if (event.key === ' ' || event.key === 'Enter') {
-                                                                    event.preventDefault();
-                                                                    setDiffViewMode(option.id);
-                                                                }
-                                                            }}
-                                                            className="flex w-full items-center gap-2 py-0 text-left"
-                                                        >
-                                                            <Radio
-                                                                checked={selected}
-                                                                onChange={() => setDiffViewMode(option.id)}
-                                                                ariaLabel={t('settings.openchamber.visual.field.diffViewModeAria', { option: tUnsafe(option.labelKey) })}
-                                                            />
-                                                            <span className={cn('typography-ui-label font-normal', selected ? 'text-foreground' : 'text-foreground/50')}>
-                                                                {tUnsafe(option.labelKey)}
-                                                            </span>
-                                                        </div>
-                                                    );
-                                                })}
-                                            </div>
-                                        </section>
-                                    )}
                                </div>
                            )}

@@ -8,10 +8,8 @@ import type { GitStatus } from '@/lib/api/types';
 import {
    DropdownMenu,
    DropdownMenuContent,
-    DropdownMenuLabel,
    DropdownMenuRadioGroup,
    DropdownMenuRadioItem,
-    DropdownMenuSeparator,
    DropdownMenuTrigger,
 } from '@/components/ui/dropdown-menu';
 import { Button } from '@/components/ui/button';
@@ -64,8 +62,6 @@ const BinaryDiffPlaceholder = React.memo(() => {
    );
 });

-type DiffTabViewMode = 'single' | 'stacked';
-
 type ChangeDescriptor = {
    code: string;
    color: string;
@@ -83,23 +79,6 @@ const CHANGE_DESCRIPTORS: Record<string, ChangeDescriptor> = {

 const DEFAULT_CHANGE_DESCRIPTOR = CHANGE_DESCRIPTORS.M;

-const DIFF_VIEW_MODE_OPTIONS: Array<{
-    value: DiffTabViewMode;
-    labelKey: I18nKey;
-    descriptionKey: I18nKey;
-}> = [
-    {
-        value: 'single',
-        labelKey: 'diffView.mode.single.label',
-        descriptionKey: 'diffView.mode.single.description',
-    },
-    {
-        value: 'stacked',
-        labelKey: 'diffView.mode.stacked.label',
-        descriptionKey: 'diffView.mode.stacked.description',
-    },
-];
-
 const getChangeSymbol = (file: GitStatus['files'][number]): string => {
    const indexCode = file.index?.trim();
    const workingCode = file.working_dir?.trim();
@@ -189,15 +168,50 @@ const formatDiffTotals = (insertions?: number, deletions?: number) => {
    );
 };

+const DiffFilePathLabel = React.memo<{
+    path: string;
+    className?: string;
+}>(({ path, className }) => {
+    const lastSlash = path.lastIndexOf('/');
+    if (lastSlash === -1) {
+        return (
+            <span
+                className={cn('block min-w-0 truncate typography-ui-label text-foreground', className)}
+                title={path}
+                style={{ direction: 'rtl', textAlign: 'left', unicodeBidi: 'plaintext' }}
+            >
+                {path}
+            </span>
+        );
+    }
+
+    const dir = path.slice(0, lastSlash);
+    const name = path.slice(lastSlash + 1);
+
+    return (
+        <span
+            className={cn('flex min-w-0 items-baseline overflow-hidden typography-ui-label', className)}
+            title={path}
+        >
+            <span
+                className="min-w-0 truncate text-muted-foreground"
+                style={{ direction: 'rtl', textAlign: 'left', unicodeBidi: 'plaintext' }}
+            >
+                {dir}
+            </span>
+            <span className="flex-shrink-0">
+                <span className="text-muted-foreground">/</span>
+                <span className="text-foreground">{name}</span>
+            </span>
+        </span>
+    );
+});
+
 interface FileSelectorProps {
    changedFiles: FileEntry[];
    selectedFile: string | null;
    selectedFileEntry: FileEntry | null;
    onSelectFile: (path: string) => void;
-    isMobile: boolean;
-    showModeSelector?: boolean;
-    mode?: DiffTabViewMode;
-    onModeChange?: (mode: DiffTabViewMode) => void;
 }

 const FileSelector = React.memo<FileSelectorProps>(({
@@ -205,30 +219,19 @@ const FileSelector = React.memo<FileSelectorProps>(({
    selectedFile,
    selectedFileEntry,
    onSelectFile,
-    isMobile,
-    showModeSelector = false,
-    mode,
-    onModeChange,
 }) => {
    const { t } = useI18n();
-    const getLabel = React.useCallback((path: string) => {
-        if (!isMobile) return path;
-        const lastSlash = path.lastIndexOf('/');
-        return lastSlash >= 0 ? path.slice(lastSlash + 1) : path;
-    }, [isMobile]);

    if (changedFiles.length === 0) return null;

    return (
        <DropdownMenu>
            <DropdownMenuTrigger asChild>
-                <button className="flex h-7 items-center gap-2 rounded-lg border border-input bg-transparent px-2 typography-ui-label text-foreground outline-none hover:bg-interactive-hover hover:text-foreground focus-visible:ring-2 focus-visible:ring-ring">
+                <button className="flex h-7 min-w-0 max-w-[min(52rem,60vw)] items-center gap-2 rounded-lg border border-input bg-transparent px-2 typography-ui-label text-foreground outline-none hover:bg-interactive-hover hover:text-foreground focus-visible:ring-2 focus-visible:ring-ring">
                    {selectedFileEntry ? (
-                        <div className="flex min-w-0 items-center gap-3">
+                        <div className="flex min-w-0 flex-1 items-center gap-3">
                            <FileTypeIcon filePath={selectedFileEntry.path} className="h-3.5 w-3.5 flex-shrink-0" />
-                            <span className="min-w-0 flex-1 truncate typography-meta">
-                                {getLabel(selectedFileEntry.path)}
-                            </span>
+                            <DiffFilePathLabel path={selectedFileEntry.path} className="flex-1" />
                            {formatDiffTotals(selectedFileEntry.insertions, selectedFileEntry.deletions)}
                        </div>
                    ) : (
@@ -237,42 +240,14 @@ const FileSelector = React.memo<FileSelectorProps>(({
                    <Icon name="arrow-down-s" className="size-4 opacity-50" />
                </button>
            </DropdownMenuTrigger>
-            <DropdownMenuContent className="max-h-[70vh] min-w-[320px] overflow-y-auto">
-                {showModeSelector && mode && onModeChange ? (
-                    <>
-                        <DropdownMenuLabel className="typography-meta text-muted-foreground">
-                            {t('diffView.selector.viewMode')}
-                        </DropdownMenuLabel>
-                        <DropdownMenuRadioGroup
-                            value={mode}
-                            onValueChange={(value) => onModeChange(value as DiffTabViewMode)}
-                        >
-                            {DIFF_VIEW_MODE_OPTIONS.map((option) => (
-                                <DropdownMenuRadioItem
-                                    key={option.value}
-                                    value={option.value}
-                                    className="items-center"
-                                >
-                                    <span className="typography-meta text-foreground">
-                                        {t(option.labelKey)}
-                                    </span>
-                                </DropdownMenuRadioItem>
-                            ))}
-                        </DropdownMenuRadioGroup>
-                        <DropdownMenuSeparator />
-                    </>
-                ) : null}
+            <DropdownMenuContent className="max-h-[70vh] w-[max(var(--anchor-width),min(28rem,calc(100vw-2rem)))] max-w-[calc(100vw-2rem)] overflow-y-auto">
                <DropdownMenuRadioGroup value={selectedFile ?? ''} onValueChange={onSelectFile}>
                    {changedFiles.map((file) => (
-                        <DropdownMenuRadioItem key={file.path} value={file.path}>
+                        <DropdownMenuRadioItem key={file.path} value={file.path} className="min-w-0 items-center">
                            <div className="flex w-full min-w-0 items-center gap-3">
                                <FileTypeIcon filePath={file.path} className="h-3.5 w-3.5 flex-shrink-0" />
-                                <span className="min-w-0 flex-1 truncate typography-meta">
-                                    {getLabel(file.path)}
-                                </span>
-                                <span className="ml-auto">
-                                    {formatDiffTotals(file.insertions, file.deletions)}
-                                </span>
+                                <DiffFilePathLabel path={file.path} className="flex-1" />
+                                {formatDiffTotals(file.insertions, file.deletions)}
                            </div>
                        </DropdownMenuRadioItem>
                    ))}
@@ -282,44 +257,6 @@ const FileSelector = React.memo<FileSelectorProps>(({
    );
 });

-interface DiffViewModeSelectorProps {
-    mode: DiffTabViewMode;
-    onModeChange: (mode: DiffTabViewMode) => void;
-}
-
-const DiffViewModeSelector = React.memo<DiffViewModeSelectorProps>(({ mode, onModeChange }) => {
-    const { t } = useI18n();
-    const currentOption =
-        DIFF_VIEW_MODE_OPTIONS.find((option) => option.value === mode) ?? DIFF_VIEW_MODE_OPTIONS[0];
-
-    return (
-        <DropdownMenu>
-            <DropdownMenuTrigger asChild>
-                <button className="flex h-7 items-center gap-2 rounded-lg border border-input bg-transparent px-2 typography-ui-label text-foreground outline-none hover:bg-interactive-hover hover:text-foreground focus-visible:ring-2 focus-visible:ring-ring">
-                    <span className="min-w-0 truncate typography-meta">
-                        {t(currentOption.labelKey)}
-                    </span>
-                    <Icon name="arrow-down-s" className="size-4 opacity-50" />
-                </button>
-            </DropdownMenuTrigger>
-            <DropdownMenuContent className="min-w-[140px]">
-                <DropdownMenuRadioGroup
-                    value={mode}
-                    onValueChange={(value) => onModeChange(value as DiffTabViewMode)}
-                >
-                    {DIFF_VIEW_MODE_OPTIONS.map((option) => (
-                        <DropdownMenuRadioItem key={option.value} value={option.value}>
-                            <span className="typography-meta text-foreground">
-                                {t(option.labelKey)}
-                            </span>
-                        </DropdownMenuRadioItem>
-                    ))}
-                </DropdownMenuRadioGroup>
-            </DropdownMenuContent>
-        </DropdownMenu>
-    );
-});
-
 interface FileListProps {
    changedFiles: FileEntry[];
    selectedFile: string | null;
@@ -380,68 +317,6 @@ const FileList = React.memo<FileListProps>(({
 });

 // Image diff viewer for binary image files
-interface ImageDiffViewerProps {
-    filePath: string;
-    diff: DiffData;
-    isVisible: boolean;
-    renderSideBySide: boolean;
-}
-
-const ImageDiffViewer = React.memo<ImageDiffViewerProps>(({
-    filePath,
-    diff,
-    isVisible,
-    renderSideBySide,
-}) => {
-    const { t } = useI18n();
-    const hasOriginal = diff.original.length > 0;
-    const hasModified = diff.modified.length > 0;
-
-    if (!isVisible) {
-        return <div className="absolute inset-0 hidden" />;
-    }
-
-    // Render side-by-side or stacked based on preference
-    const containerClass = renderSideBySide
-        ? 'flex flex-row gap-6 items-start justify-center h-full'
-        : 'flex flex-col gap-4 items-center';
-
-    const imageContainerClass = renderSideBySide
-        ? 'flex flex-col items-center gap-2 flex-1 min-w-0 h-full'
-        : 'flex flex-col items-center gap-2';
-
-    return (
-        <div className="absolute inset-0 overflow-auto p-4" style={{ contain: 'size layout' }}>
-            <div className={containerClass}>
-                {hasOriginal && (
-                    <div className={imageContainerClass}>
-                        <span className="typography-meta text-muted-foreground font-medium">{t('diffView.image.original')}</span>
-                        <img
-                            src={diff.original}
-                            alt={t('diffView.image.originalAlt', { path: filePath })}
-                            className={renderSideBySide ? "max-w-full max-h-[calc(100%-2rem)] object-contain" : "max-w-full object-contain"}
-                            style={{ imageRendering: 'auto' }}
-                        />
-                    </div>
-                )}
-                {hasModified && (
-                    <div className={imageContainerClass}>
-                        <span className="typography-meta text-muted-foreground font-medium">
-                            {hasOriginal ? t('diffView.image.modified') : t('diffView.image.new')}
-                        </span>
-                        <img
-                            src={diff.modified}
-                            alt={t('diffView.image.modifiedAlt', { path: filePath })}
-                            className={renderSideBySide ? "max-w-full max-h-[calc(100%-2rem)] object-contain" : "max-w-full object-contain"}
-                            style={{ imageRendering: 'auto' }}
-                        />
-                    </div>
-                )}
-            </div>
-        </div>
-    );
-});
-
 interface InlineImageDiffViewerProps {
    filePath: string;
    diff: DiffData;
@@ -544,70 +419,6 @@ const InlineDiffViewer = React.memo<InlineDiffViewerProps>(({
    );
 });

-// Single diff viewer instance
-interface SingleDiffViewerProps {
-    filePath: string;
-    diff: DiffData;
-    isVisible: boolean;
-    renderSideBySide: boolean;
-    wrapLines: boolean;
-}
-
-const SingleDiffViewer = React.memo<SingleDiffViewerProps>(({ 
-    filePath,
-    diff,
-    isVisible,
-    renderSideBySide,
-    wrapLines,
-}) => {
-    const language = React.useMemo(
-        () => getLanguageFromExtension(filePath) || 'text',
-        [filePath]
-    );
-
-    if (diff.isBinary) {
-        return <BinaryDiffPlaceholder />;
-    }
-
-    // Don't render if not visible (memory optimization)
-    if (!isVisible) {
-        return null;
-    }
-
-    // Check if this is an image file
-    if (isImageFile(filePath)) {
-        return (
-            <ImageDiffViewer
-                filePath={filePath}
-                diff={diff}
-                isVisible={isVisible}
-                renderSideBySide={renderSideBySide}
-            />
-        );
-    }
-
-    return (
-        <ScrollableOverlay
-            outerClassName="absolute inset-0"
-            disableHorizontal={false}
-            observeMutations={false}
-            preventOverscroll
-            data-diff-virtual-root
-            data-diff-virtual-content
-        >
-            <PierreDiffViewer
-                original={diff.original}
-                modified={diff.modified}
-                language={language}
-                fileName={filePath}
-                renderSideBySide={renderSideBySide}
-                wrapLines={wrapLines}
-                layout="inline"
-            />
-        </ScrollableOverlay>
-    );
-});
-
 interface MultiFileDiffEntryProps {
    directory: string;
    file: FileEntry;
@@ -794,20 +605,19 @@ const MultiFileDiffEntry = React.memo<MultiFileDiffEntryProps>(({
    }, [handleOpenChange, handleSelect, isExpanded]);

    return (
-        <div ref={setSectionRef} className="scroll-mt-4">
-            <div className="sticky top-0 z-10 bg-background">
+        <div ref={setSectionRef} className="scroll-mt-9 border-b border-[var(--interactive-border)]/40 last:border-b-0">
+            <div className="sticky top-0 z-10 bg-[var(--surface-muted)]">
                <button
                    type="button"
                    onClick={handleToggle}
                    className={cn(
-                        'group/header relative flex w-full items-center gap-2 px-3 py-1.5 rounded-t-xl border border-border/60 overflow-hidden',
-                        'bg-background',
-                        isExpanded ? 'rounded-b-none' : 'rounded-b-xl',
+                        'group/header relative flex w-full items-center gap-2 px-3 py-1.5 overflow-hidden',
+                        'bg-transparent',
                        'text-muted-foreground hover:text-foreground',
-                        isSelected ? 'ring-1 ring-inset ring-[var(--interactive-selection)]' : null
+                        isSelected ? 'bg-[var(--interactive-selection)]/40' : null
                    )}
                >
-                    <div className="absolute inset-0 pointer-events-none group-hover/header:bg-interactive-hover" />
+                    <div className="absolute inset-0 pointer-events-none group-hover/header:bg-[var(--interactive-hover)]/50" />
                    <div className="relative flex min-w-0 flex-1 items-center gap-2">
                        <span className="flex size-5 items-center justify-center opacity-70 group-hover/header:opacity-100">
                            {isExpanded ? (
@@ -898,7 +708,7 @@ const MultiFileDiffEntry = React.memo<MultiFileDiffEntryProps>(({
                </button>
            </div>
            {isExpanded && (
-                <div className="relative border border-t-0 border-border/60 bg-background rounded-b-xl overflow-hidden">
+                <div className="relative bg-background overflow-hidden">
                    {diffLoadError ? (
                        <div className="flex flex-col items-center gap-2 px-4 py-8 text-sm text-muted-foreground">
                            <div className="typography-ui-label font-semibold text-foreground">
@@ -961,6 +771,8 @@ interface DiffViewProps {
    showOpenInEditorAction?: boolean;
    diffScope?: DiffScope;
    targetFilePath?: string | null;
+    /** Render diff content flush with the container edges (no outer padding). */
+    flushContent?: boolean;
 }

 export const DiffView: React.FC<DiffViewProps> = ({
@@ -971,6 +783,7 @@ export const DiffView: React.FC<DiffViewProps> = ({
    showOpenInEditorAction = false,
    diffScope = 'all',
    targetFilePath = null,
+    flushContent = false,
 }) => {
    const { t } = useI18n();
    const { git, files } = useRuntimeAPIs();
@@ -995,9 +808,6 @@ export const DiffView: React.FC<DiffViewProps> = ({
    const [stackedExpandTarget, setStackedExpandTarget] = React.useState<string | null>(null);
    const [stackedExpandRequestNonce, setStackedExpandRequestNonce] = React.useState(0);
    const [pinnedStackedTarget, setPinnedStackedTarget] = React.useState<string | null>(null);
-    const [diffRetryNonce, setDiffRetryNonce] = React.useState(0);
-    const [diffLoadError, setDiffLoadError] = React.useState<string | null>(null);
-    const lastDiffRequestRef = React.useRef<string | null>(null);

    const pendingDiffFile = useUIStore((state) => state.pendingDiffFile);
    const pendingDiffStaged = useUIStore((state) => state.pendingDiffStaged);
@@ -1007,14 +817,11 @@ export const DiffView: React.FC<DiffViewProps> = ({
    const setDiffFileLayout = useUIStore((state) => state.setDiffFileLayout);
    const diffWrapLinesStore = useUIStore((state) => state.diffWrapLines);
    const setDiffWrapLines = useUIStore((state) => state.setDiffWrapLines);
-    const diffViewMode = useUIStore((state) => state.diffViewMode);
-    const setDiffViewMode = useUIStore((state) => state.setDiffViewMode);
    const openContextFileAtLine = useUIStore((state) => state.openContextFileAtLine);
    const diffWrapLines = diffWrapLinesStore;
    const forcedStaged = diffScope === 'staged' ? true : diffScope === 'working' ? false : null;
    const activeDiffStaged = forcedStaged ?? selectedFileStaged;

-    const isStackedView = diffViewMode === 'stacked';
    const isMobileLayout = isMobile || screenWidth <= 768;
    const showFileSidebar = !hideStackedFileSidebar && !isMobileLayout && screenWidth >= 1024;
    const diffScrollRef = React.useRef<HTMLElement | null>(null);
@@ -1024,7 +831,7 @@ export const DiffView: React.FC<DiffViewProps> = ({
    const shouldPinAfterAlignRef = React.useRef(false);

    React.useEffect(() => {
-        if (!pinSelectedFileHeaderToTopOnNavigate || !isStackedView || !pinnedStackedTarget) {
+        if (!pinSelectedFileHeaderToTopOnNavigate || !pinnedStackedTarget) {
            return;
        }

@@ -1116,7 +923,7 @@ export const DiffView: React.FC<DiffViewProps> = ({
            window.removeEventListener('keydown', cancelOnUserInput, true);
            scrollRoot.removeEventListener('scroll', cancelOnScroll);
        };
-    }, [isStackedView, pinSelectedFileHeaderToTopOnNavigate, pinnedStackedTarget]);
+    }, [pinSelectedFileHeaderToTopOnNavigate, pinnedStackedTarget]);

    const changedFiles: FileEntry[] = React.useMemo(() => {
        if (!status?.files) return [];
@@ -1200,14 +1007,12 @@ export const DiffView: React.FC<DiffViewProps> = ({
            setSelectedFileStaged(pendingDiffStaged);
            setSelectedStagedDiffData(null);
            setPendingDiffFile(null);
-            if (isStackedView) {
-                shouldPinAfterAlignRef.current = true;
-                pendingScrollTargetRef.current = pendingDiffFile;
-                setStackedExpandTarget(pendingDiffFile);
-                setStackedExpandRequestNonce((nonce) => nonce + 1);
-            }
+            shouldPinAfterAlignRef.current = true;
+            pendingScrollTargetRef.current = pendingDiffFile;
+            setStackedExpandTarget(pendingDiffFile);
+            setStackedExpandRequestNonce((nonce) => nonce + 1);
        }
-    }, [diffScope, isStackedView, pendingDiffFile, pendingDiffStaged, setPendingDiffFile]);
+    }, [diffScope, pendingDiffFile, pendingDiffStaged, setPendingDiffFile]);

    React.useEffect(() => {
        if (diffScope === 'all') {
@@ -1223,13 +1028,11 @@ export const DiffView: React.FC<DiffViewProps> = ({
        setSelectedFileStaged(diffScope === 'staged');
        setSelectedStagedDiffData(null);

-        if (isStackedView) {
-            shouldPinAfterAlignRef.current = true;
-            pendingScrollTargetRef.current = normalizedTarget;
-            setStackedExpandTarget(normalizedTarget);
-            setStackedExpandRequestNonce((nonce) => nonce + 1);
-        }
-    }, [diffScope, isStackedView, targetFilePath]);
+        shouldPinAfterAlignRef.current = true;
+        pendingScrollTargetRef.current = normalizedTarget;
+        setStackedExpandTarget(normalizedTarget);
+        setStackedExpandRequestNonce((nonce) => nonce + 1);
+    }, [diffScope, targetFilePath]);

    React.useEffect(() => {
        if (!activeDiffStaged) {
@@ -1237,8 +1040,6 @@ export const DiffView: React.FC<DiffViewProps> = ({
        }

        setSelectedStagedDiffData(null);
-        setDiffLoadError(null);
-        lastDiffRequestRef.current = null;
    }, [activeDiffStaged, indexRevision]);

    // Auto-select first file (skip if we have a pending file to consume)
@@ -1299,16 +1100,6 @@ export const DiffView: React.FC<DiffViewProps> = ({
    }, []);

    React.useEffect(() => {
-        if (!isStackedView) {
-            pendingScrollTargetRef.current = null;
-            shouldPinAfterAlignRef.current = false;
-            if (pendingScrollFrameRef.current !== null) {
-                window.cancelAnimationFrame(pendingScrollFrameRef.current);
-                pendingScrollFrameRef.current = null;
-            }
-            return;
-        }
-
        const target = pendingScrollTargetRef.current;
        if (!target) return;

@@ -1431,7 +1222,7 @@ export const DiffView: React.FC<DiffViewProps> = ({
                pendingScrollFrameRef.current = null;
            }
        };
-    }, [isStackedView, pinSelectedFileHeaderToTopOnNavigate, scrollToFile, selectedFile, stackedExpandRequestNonce]);
+    }, [pinSelectedFileHeaderToTopOnNavigate, scrollToFile, selectedFile, stackedExpandRequestNonce]);

    const handleSelectFile = React.useCallback((value: string) => {
        setSelectedFile(value);
@@ -1450,43 +1241,23 @@ export const DiffView: React.FC<DiffViewProps> = ({
        setSelectedFileStaged(false);
        setSelectedStagedDiffData(null);

-        if (!isStackedView) {
-            shouldPinAfterAlignRef.current = false;
-            return;
-        }
-
        shouldPinAfterAlignRef.current = true;
        pendingScrollTargetRef.current = value;
+        setStackedExpandTarget(value);
+        setStackedExpandRequestNonce((nonce) => nonce + 1);
        scrollToFile(value);
-    }, [isStackedView, scrollToFile]);
-
-    const handleDiffViewModeChange = React.useCallback((mode: DiffTabViewMode) => {
-        setDiffViewMode(mode);
-        if (mode === 'stacked' && selectedFile) {
-            const result = scrollToFile(selectedFile);
-            if (!result.aligned) {
-                pendingScrollTargetRef.current = selectedFile;
-            }
-        }
-    }, [scrollToFile, selectedFile, setDiffViewMode]);
+    }, [scrollToFile]);

    const handleHeaderLayoutChange = React.useCallback((mode: DiffViewMode) => {
        const nextLayout: 'inline' | 'side-by-side' =
            mode === 'side-by-side' ? 'side-by-side' : 'inline';

-        if (isStackedView) {
-            changedFiles.forEach((file) => {
-                setDiffFileLayout(file.path, nextLayout);
-            });
-            return;
-        }
+        changedFiles.forEach((file) => {
+            setDiffFileLayout(file.path, nextLayout);
+        });
+    }, [changedFiles, setDiffFileLayout]);

-        if (!selectedFileEntry) return;
-        setDiffFileLayout(selectedFileEntry.path, nextLayout);
-    }, [changedFiles, isStackedView, selectedFileEntry, setDiffFileLayout]);
-
-    const renderSideBySide = (currentLayoutForSelectedFile ?? 'side-by-side') === 'side-by-side';
-    const showFileSelector = !hideFileSelector && (!isStackedView || !showFileSidebar);
+    const showFileSelector = !hideFileSelector && !showFileSidebar;

    const selectedCachedDiff = useGitStore(React.useCallback((state) => {
        if (!effectiveDirectory || !selectedFile || activeDiffStaged) return null;
@@ -1572,85 +1343,6 @@ export const DiffView: React.FC<DiffViewProps> = ({

    const isOpeningSelectedInEditor = Boolean(selectedFile && openingEditorFilePath === selectedFile);

-    const hasCurrentDiff = activeDiffStaged ? !!selectedStagedDiffData : !!selectedCachedDiff;
-    const isCurrentFileLoading = !isStackedView && !!selectedFile && !hasCurrentDiff;
-
-    React.useEffect(() => {
-        if (isStackedView) {
-            return;
-        }
-
-        setDiffLoadError(null);
-
-        if (!effectiveDirectory || !selectedFile) {
-            lastDiffRequestRef.current = null;
-            return;
-        }
-
-        if (activeDiffStaged ? selectedStagedDiffData : selectedCachedDiff) {
-            lastDiffRequestRef.current = null;
-            return;
-        }
-
-        const requestKey = `${effectiveDirectory}::${selectedFile}::${activeDiffStaged ? `staged:${indexRevision}` : 'unstaged'}::${diffRetryNonce}`;
-        if (lastDiffRequestRef.current === requestKey) {
-            return;
-        }
-        lastDiffRequestRef.current = requestKey;
-
-        let cancelled = false;
-        const fetchPromise = git.getGitFileDiff(effectiveDirectory, { path: selectedFile, staged: activeDiffStaged });
-        const timeoutMs = DIFF_REQUEST_TIMEOUT_MS;
-        const timeoutPromise = new Promise<never>((_, reject) => {
-            setTimeout(() => reject(new Error(`Timed out after ${timeoutMs}ms`)), timeoutMs);
-        });
-
-        void Promise.race([fetchPromise, timeoutPromise])
-            .then((response) => {
-                if (cancelled) return;
-
-                const nextDiff = {
-                    original: response.original ?? '',
-                    modified: response.modified ?? '',
-                    isBinary: response.isBinary,
-                };
-                if (activeDiffStaged) {
-                    setSelectedStagedDiffData(nextDiff);
-                } else {
-                    setDiff(effectiveDirectory, selectedFile, nextDiff);
-                }
-            })
-            .catch((error) => {
-                if (cancelled) return;
-                const message = error instanceof Error ? error.message : String(error);
-                setDiffLoadError(message);
-            });
-
-        return () => {
-            cancelled = true;
-            if (lastDiffRequestRef.current === requestKey) {
-                // Allow a retry if this request was cancelled due to directory/path churn.
-                lastDiffRequestRef.current = null;
-            }
-        };
-    }, [activeDiffStaged, effectiveDirectory, indexRevision, isStackedView, selectedFile, selectedCachedDiff, selectedStagedDiffData, git, setDiff, diffRetryNonce]);
-
-    // Render only the selected diff viewer to prevent memory bloat with many files
-    const renderSelectedDiffViewer = () => {
-        if (!effectiveDirectory || !selectedFile || !selectedDiffData) return null;
-
-        return (
-            <SingleDiffViewer
-                key={selectedFile}
-                filePath={selectedFile}
-                diff={selectedDiffData}
-                isVisible={true}
-                renderSideBySide={renderSideBySide}
-                wrapLines={diffWrapLines}
-            />
-        );
-    };
-
    const renderStackedDiffView = () => {
        if (!effectiveDirectory) return null;

@@ -1663,7 +1355,7 @@ export const DiffView: React.FC<DiffViewProps> = ({
        };

        return (
-            <div className="flex flex-1 min-h-0 h-full gap-3 px-3 pb-3 pt-2">
+            <div className={cn('flex flex-1 min-h-0 h-full', flushContent ? 'gap-0' : 'gap-3 px-3 pb-3 pt-2')}>
                {showFileSidebar && (
                    <section className="hidden lg:flex w-72 flex-col rounded-xl border border-border/60 bg-background/70 overflow-hidden">
                        <div className="flex items-center justify-between px-3 py-1.5 border-b border-border/40">
@@ -1680,14 +1372,13 @@ export const DiffView: React.FC<DiffViewProps> = ({
                <ScrollableOverlay
                    ref={diffScrollRef}
                    outerClassName="flex-1 min-h-0 h-full"
-                    className="pr-2"
                    disableHorizontal
                    observeMutations={false}
                    preventOverscroll
                    data-diff-virtual-root
                    data-diff-virtual-content
                >
-                    <div className="flex flex-col gap-3">
+                    <div className="flex flex-col">
                        {changedFiles.map((file, index) => (
                            <MultiFileDiffEntry
                                key={`${getFileStaged(file.path) ? 'staged' : 'unstaged'}:${file.path}`}
@@ -1752,44 +1443,7 @@ export const DiffView: React.FC<DiffViewProps> = ({
            );
        }

-        if (isStackedView) {
-            return renderStackedDiffView();
-        }
-
-        return (
-            <div className="flex flex-1 min-h-0 overflow-hidden px-3 py-3 relative" data-diff-virtual-root data-diff-virtual-content>
-                {renderSelectedDiffViewer()}
-                {isCurrentFileLoading && !hasCurrentDiff && (
-                    <div className="absolute inset-0 flex items-center justify-center gap-2 text-sm text-muted-foreground">
-                        {diffLoadError ? (
-                            <div className="flex flex-col items-center gap-2">
-                                <div className="typography-ui-label font-semibold text-foreground">
-                                    {t('diffView.state.failedToLoadDiff')}
-                                </div>
-                                <div className="typography-meta text-muted-foreground max-w-[32rem] text-center">
-                                    {diffLoadError}
-                                </div>
-                                <button
-                                    type="button"
-                                    className="typography-ui-label text-primary hover:underline"
-                                    onClick={() => {
-                                        setDiffLoadError(null);
-                                        setDiffRetryNonce((n) => n + 1);
-                                    }}
-                                >
-                                    {t('diffView.actions.retry')}
-                                </button>
-                            </div>
-                        ) : (
-                            <>
-                                <Icon name="loader-4" className="size-4 animate-spin" />
-                                {t('diffView.state.loadingDiff')}
-                            </>
-                        )}
-                    </div>
-                )}
-            </div>
-        );
+        return renderStackedDiffView();
    };

    return (
@@ -1807,19 +1461,12 @@ export const DiffView: React.FC<DiffViewProps> = ({
                        </span>
                    </div>
                )}
-                {!isMobileLayout && (
-                    <DiffViewModeSelector mode={diffViewMode} onModeChange={handleDiffViewModeChange} />
-                )}
                {showFileSelector && (
                    <FileSelector
                        changedFiles={changedFiles}
                        selectedFile={selectedFile}
                        selectedFileEntry={selectedFileEntry}
                        onSelectFile={handleSelectFileAndScroll}
-                        isMobile={isMobileLayout}
-                        showModeSelector={isMobileLayout}
-                        mode={diffViewMode}
-                        onModeChange={handleDiffViewModeChange}
                    />
                )}
                <div className="flex-1" />
@@ -1837,7 +1484,7 @@ export const DiffView: React.FC<DiffViewProps> = ({
                        <Icon name="text-wrap" className="size-4" />
                    </Button>
                )}
-                {showOpenInEditorAction && selectedFileEntry && !isStackedView && (
+                {showOpenInEditorAction && selectedFileEntry && (
                    <Button
                        variant="ghost"
                        size="sm"
@@ -77,6 +77,10 @@ export const PIERRE_RUNTIME_BASE_CSS = `
 const WEBKIT_SCROLL_FIX_CSS = `
  ${PIERRE_RUNTIME_BASE_CSS}

+  :host {
+    --diffs-bg-separator-override: var(--surface-elevated);
+  }
+
  [data-diff-header],
  [data-diff] {
    [data-separator] {
@@ -672,7 +672,6 @@ export interface SettingsPayload {
  inputBarOffset?: number;
  shortcutOverrides?: Record<string, string>;
  diffLayoutPreference?: 'dynamic' | 'inline' | 'side-by-side';
-  diffViewMode?: 'single' | 'stacked';
  gitChangesViewMode?: 'flat' | 'tree';
  directoryShowHidden?: boolean;
  filesViewShowGitignored?: boolean;
@@ -36,7 +36,6 @@ type AppearanceSlice = {
  inputBarOffset: number;
  mobileKeyboardMode: MobileKeyboardMode;
  diffLayoutPreference: 'dynamic' | 'inline' | 'side-by-side';
-  diffViewMode: 'single' | 'stacked';
  gitChangesViewMode: 'flat' | 'tree';
 };

@@ -76,7 +75,6 @@ export const startAppearanceAutoSave = (): void => {
    inputBarOffset: useUIStore.getState().inputBarOffset,
    mobileKeyboardMode: useUIStore.getState().mobileKeyboardMode,
    diffLayoutPreference: useUIStore.getState().diffLayoutPreference,
-    diffViewMode: useUIStore.getState().diffViewMode,
    gitChangesViewMode: useUIStore.getState().gitChangesViewMode,
  };

@@ -128,7 +126,6 @@ export const startAppearanceAutoSave = (): void => {
      inputBarOffset: state.inputBarOffset,
      mobileKeyboardMode: state.mobileKeyboardMode,
      diffLayoutPreference: state.diffLayoutPreference,
-      diffViewMode: state.diffViewMode,
      gitChangesViewMode: state.gitChangesViewMode,
    };

@@ -212,9 +209,6 @@ export const startAppearanceAutoSave = (): void => {
    if (current.diffLayoutPreference !== previous.diffLayoutPreference) {
      diff.diffLayoutPreference = current.diffLayoutPreference;
    }
-    if (current.diffViewMode !== previous.diffViewMode) {
-      diff.diffViewMode = current.diffViewMode;
-    }
    if (current.gitChangesViewMode !== previous.gitChangesViewMode) {
      diff.gitChangesViewMode = current.gitChangesViewMode;
    }
@@ -160,7 +160,6 @@ export type DesktopSettings = {
  favoriteModels?: Array<{ providerID: string; modelID: string }>;
  recentModels?: Array<{ providerID: string; modelID: string }>;
  diffLayoutPreference?: 'dynamic' | 'inline' | 'side-by-side';
-  diffViewMode?: 'single' | 'stacked';
  gitChangesViewMode?: 'flat' | 'tree';
  directoryShowHidden?: boolean;
  filesViewShowGitignored?: boolean;
@@ -1577,8 +1577,6 @@ export const settingsDict = {
  'settings.openchamber.visual.section.mermaidRenderingAria': 'Mermaid rendering mode',
  'settings.openchamber.visual.section.diffLayout': 'Diff Layout',
  'settings.openchamber.visual.section.diffLayoutAria': 'Diff layout',
-  'settings.openchamber.visual.section.diffViewMode': 'Diff View Mode',
-  'settings.openchamber.visual.section.diffViewModeAria': 'Diff view mode',
  'settings.openchamber.visual.section.privacy': 'Privacy',
  'settings.openchamber.visual.field.lightTheme': 'Light Theme',
  'settings.openchamber.visual.field.darkTheme': 'Dark Theme',
@@ -1641,7 +1639,6 @@ export const settingsDict = {
  'settings.openchamber.visual.field.userMessageRenderingAria': 'User message rendering: {option}',
  'settings.openchamber.visual.field.mermaidRenderingAria': 'Mermaid rendering: {option}',
  'settings.openchamber.visual.field.diffLayoutAria': 'Diff layout: {option}',
-  'settings.openchamber.visual.field.diffViewModeAria': 'Diff view mode: {option}',
  'settings.openchamber.visual.field.showReasoningTracesAria': 'Show reasoning traces',
  'settings.openchamber.visual.field.showReasoningTraces': 'Show Reasoning Traces',
  'settings.openchamber.visual.field.collapsibleThinkingBlocksAria': 'Enable collapsible reasoning blocks',
@@ -1682,10 +1679,6 @@ export const settingsDict = {
  'settings.openchamber.visual.option.diffLayout.inline.description': 'Show as a single unified view.',
  'settings.openchamber.visual.option.diffLayout.sideBySide.label': 'Always side-by-side',
  'settings.openchamber.visual.option.diffLayout.sideBySide.description': 'Compare original and modified files.',
-  'settings.openchamber.visual.option.diffViewMode.single.label': 'Single file',
-  'settings.openchamber.visual.option.diffViewMode.single.description': 'Show one file at a time.',
-  'settings.openchamber.visual.option.diffViewMode.stacked.label': 'All files',
-  'settings.openchamber.visual.option.diffViewMode.stacked.description': 'Stack all changed files together.',
  'settings.openchamber.visual.option.mermaidRendering.svg.label': 'SVG',
  'settings.openchamber.visual.option.mermaidRendering.svg.description': 'Render diagrams as scalable graphics.',
  'settings.openchamber.visual.option.mermaidRendering.ascii.label': 'ASCII',
@@ -1184,12 +1184,7 @@ export const dict = {
  'diffView.change.renamed': 'Renamed file',
  'diffView.change.copied': 'Copied file',
  'diffView.change.modified': 'Modified file',
-  'diffView.mode.single.label': 'Single file',
-  'diffView.mode.single.description': 'Show one file at a time',
-  'diffView.mode.stacked.label': 'All files',
-  'diffView.mode.stacked.description': 'Stack all modified files together',
  'diffView.selector.selectFile': 'Select file',
-  'diffView.selector.viewMode': 'View mode',
  'diffView.image.original': 'Original',
  'diffView.image.modified': 'Modified',
  'diffView.image.new': 'New',
@@ -1544,8 +1544,6 @@ export const settingsDict = {
  "settings.openchamber.visual.section.mermaidRenderingAria": "Modo de Renderizado de Mermaid",
  "settings.openchamber.visual.section.diffLayout": "Diseño de comparación",
  "settings.openchamber.visual.section.diffLayoutAria": "Diseño de comparación",
-  "settings.openchamber.visual.section.diffViewMode": "Modo de vista de comparación",
-  "settings.openchamber.visual.section.diffViewModeAria": "Modo de vista de comparación",
  "settings.openchamber.visual.section.privacy": "Privacidad",
  "settings.openchamber.visual.field.lightTheme": "Tema claro",
  "settings.openchamber.visual.field.darkTheme": "Tema oscuro",
@@ -1608,7 +1606,6 @@ export const settingsDict = {
  "settings.openchamber.visual.field.userMessageRenderingAria": "Renderizado de mensajes del usuario: {option}",
  "settings.openchamber.visual.field.mermaidRenderingAria": "Renderizado de Mermaid: {option}",
  "settings.openchamber.visual.field.diffLayoutAria": "Diseño de comparación: {option}",
-  "settings.openchamber.visual.field.diffViewModeAria": "Modo de vista de comparación: {option}",
  "settings.openchamber.visual.field.showReasoningTracesAria": "Mostrar rastros de razonamiento",
  "settings.openchamber.visual.field.showReasoningTraces": "Mostrar trazas de razonamiento",
  "settings.openchamber.visual.field.collapsibleThinkingBlocksAria": "Habilitar bloques de razonamiento colapsables",
@@ -1649,10 +1646,6 @@ export const settingsDict = {
  "settings.openchamber.visual.option.diffLayout.inline.description": "Muestra una vista unificada.",
  "settings.openchamber.visual.option.diffLayout.sideBySide.label": "Siempre lado a lado",
  "settings.openchamber.visual.option.diffLayout.sideBySide.description": "Compara archivos originales y modificados.",
-  "settings.openchamber.visual.option.diffViewMode.single.label": "Archivo único",
-  "settings.openchamber.visual.option.diffViewMode.single.description": "Mostrar un archivo a la vez.",
-  "settings.openchamber.visual.option.diffViewMode.stacked.label": "Todos los archivos",
-  "settings.openchamber.visual.option.diffViewMode.stacked.description": "Muestra todos los archivos modificados en una sola vista.",
  "settings.openchamber.visual.option.mermaidRendering.svg.label": "SVG",
  "settings.openchamber.visual.option.mermaidRendering.svg.description": "Renderiza diagramas como gráficos escalables.",
  "settings.openchamber.visual.option.mermaidRendering.ascii.label": "ASCII",
@@ -1150,12 +1150,7 @@ export const dict: Record<I18nKey, string> = {
  "diffView.change.renamed": "Archivo renombrado",
  "diffView.change.copied": "Archivo copiado",
  "diffView.change.modified": "Archivo modificado",
-  "diffView.mode.single.label": "Archivo único",
-  "diffView.mode.single.description": "Mostrar un archivo a la vez",
-  "diffView.mode.stacked.label": "Todos los archivos",
-  "diffView.mode.stacked.description": "Muestra todos los archivos modificados en una sola vista.",
  "diffView.selector.selectFile": "Seleccionar archivo",
-  "diffView.selector.viewMode": "Modo de visualización",
  "diffView.image.original": "Original",
  "diffView.image.modified": "Modificado",
  "diffView.image.new": "Nuevo",
@@ -1527,8 +1527,6 @@ export const settingsDict = {
  'settings.openchamber.visual.section.mermaidRenderingAria': 'Mode de rendu Mermaid',
  'settings.openchamber.visual.section.diffLayout': 'Disposition différentielle',
  'settings.openchamber.visual.section.diffLayoutAria': 'Disposition différentielle',
-  'settings.openchamber.visual.section.diffViewMode': 'Mode d\'affichage différentiel',
-  'settings.openchamber.visual.section.diffViewModeAria': 'Mode d\'affichage différentiel',
  'settings.openchamber.visual.section.privacy': 'Confidentialité',
  'settings.openchamber.visual.field.lightTheme': 'Thème clair',
  'settings.openchamber.visual.field.darkTheme': 'Thème sombre',
@@ -1584,7 +1582,6 @@ export const settingsDict = {
  'settings.openchamber.visual.field.userMessageRenderingAria': 'Rendu du message utilisateur : {option}',
  'settings.openchamber.visual.field.mermaidRenderingAria': 'Rendu Mermaid : {option}',
  'settings.openchamber.visual.field.diffLayoutAria': 'Disposition des différences : {option}',
-  'settings.openchamber.visual.field.diffViewModeAria': 'Mode d\'affichage différentiel : {option}',
  'settings.openchamber.visual.field.showReasoningTracesAria': 'Afficher les traces de raisonnement',
  'settings.openchamber.visual.field.showReasoningTraces': 'Afficher les traces de raisonnement',
  'settings.openchamber.visual.field.collapsibleThinkingBlocksAria': 'Activer les blocs de raisonnement pliables',
@@ -1623,10 +1620,6 @@ export const settingsDict = {
  'settings.openchamber.visual.option.diffLayout.inline.description': 'Afficher sous forme de vue unifiée unique.',
  'settings.openchamber.visual.option.diffLayout.sideBySide.label': 'Toujours côte à côte',
  'settings.openchamber.visual.option.diffLayout.sideBySide.description': 'Comparez les fichiers originaux et modifiés.',
-  'settings.openchamber.visual.option.diffViewMode.single.label': 'Fichier unique',
-  'settings.openchamber.visual.option.diffViewMode.single.description': 'Afficher un fichier à la fois.',
-  'settings.openchamber.visual.option.diffViewMode.stacked.label': 'Tous les fichiers',
-  'settings.openchamber.visual.option.diffViewMode.stacked.description': 'Empilez tous les fichiers modifiés ensemble.',
  'settings.openchamber.visual.option.mermaidRendering.svg.label': 'SVG',
  'settings.openchamber.visual.option.mermaidRendering.svg.description': 'Rendre les diagrammes sous forme de graphiques évolutifs.',
  'settings.openchamber.visual.option.mermaidRendering.ascii.label': 'ASCII',
@@ -1057,12 +1057,7 @@ export const dict = {
  'diffView.change.renamed': 'Fichier renommé',
  'diffView.change.copied': 'Fichier copié',
  'diffView.change.modified': 'Fichier modifié',
-  'diffView.mode.single.label': 'Fichier unique',
-  'diffView.mode.single.description': 'Afficher un fichier à la fois',
-  'diffView.mode.stacked.label': 'Tous les fichiers',
-  'diffView.mode.stacked.description': 'Empilez tous les fichiers modifiés ensemble',
  'diffView.selector.selectFile': 'Sélectionner un fichier',
-  'diffView.selector.viewMode': 'Mode d\'affichage',
  'diffView.image.original': 'Original',
  'diffView.image.modified': 'Modifié',
  'diffView.image.new': 'Nouveau',
@@ -1544,8 +1544,6 @@ export const settingsDict = {
  'settings.openchamber.visual.section.mermaidRenderingAria': 'Mermaid 렌더링 모드',
  'settings.openchamber.visual.section.diffLayout': 'Diff 레이아웃',
  'settings.openchamber.visual.section.diffLayoutAria': 'Diff 레이아웃',
-  'settings.openchamber.visual.section.diffViewMode': 'Diff 보기 모드',
-  'settings.openchamber.visual.section.diffViewModeAria': 'Diff 보기 모드',
  'settings.openchamber.visual.section.privacy': '개인정보',
  'settings.openchamber.visual.field.lightTheme': '라이트 테마',
  'settings.openchamber.visual.field.darkTheme': '다크 테마',
@@ -1608,7 +1606,6 @@ export const settingsDict = {
  'settings.openchamber.visual.field.userMessageRenderingAria': '사용자 메시지 렌더링: {option}',
  'settings.openchamber.visual.field.mermaidRenderingAria': 'Mermaid 렌더링: {option}',
  'settings.openchamber.visual.field.diffLayoutAria': 'Diff 레이아웃: {option}',
-  'settings.openchamber.visual.field.diffViewModeAria': 'Diff 보기 모드: {option}',
  'settings.openchamber.visual.field.showReasoningTracesAria': 'Reasoning trace 표시',
  'settings.openchamber.visual.field.showReasoningTraces': 'Reasoning Trace 표시',
  'settings.openchamber.visual.field.collapsibleThinkingBlocksAria': '접을 수 있는 추론 블록 활성화',
@@ -1649,10 +1646,6 @@ export const settingsDict = {
  'settings.openchamber.visual.option.diffLayout.inline.description': '하나의 통합 보기로 표시합니다.',
  'settings.openchamber.visual.option.diffLayout.sideBySide.label': '항상 side-by-side',
  'settings.openchamber.visual.option.diffLayout.sideBySide.description': '원본 파일과 수정된 파일을 비교합니다.',
-  'settings.openchamber.visual.option.diffViewMode.single.label': '단일 파일',
-  'settings.openchamber.visual.option.diffViewMode.single.description': '한 번에 하나의 파일을 표시합니다.',
-  'settings.openchamber.visual.option.diffViewMode.stacked.label': '모든 파일',
-  'settings.openchamber.visual.option.diffViewMode.stacked.description': '변경된 모든 파일을 함께 쌓아 표시합니다.',
  'settings.openchamber.visual.option.mermaidRendering.svg.label': 'SVG',
  'settings.openchamber.visual.option.mermaidRendering.svg.description': '다이어그램을 확장 가능한 그래픽으로 렌더링합니다.',
  'settings.openchamber.visual.option.mermaidRendering.ascii.label': 'ASCII',
@@ -1187,12 +1187,7 @@ export const dict: Record<I18nKey, string> = {
  'diffView.change.renamed': '이름 변경된 파일',
  'diffView.change.copied': '복사된 파일',
  'diffView.change.modified': '수정된 파일',
-  'diffView.mode.single.label': '단일 파일',
-  'diffView.mode.single.description': '파일을 하나씩 표시',
-  'diffView.mode.stacked.label': '모든 파일',
-  'diffView.mode.stacked.description': '수정된 파일을 모두 쌓아서 표시',
  'diffView.selector.selectFile': '파일 선택',
-  'diffView.selector.viewMode': '보기 모드',
  'diffView.image.original': '원본',
  'diffView.image.modified': '수정됨',
  'diffView.image.new': '새 파일',
@@ -910,8 +910,8 @@ export const settingsDict = {
  'settings.openchamber.visual.field.codeFont': 'Czcionka kodu',
  'settings.openchamber.visual.field.darkTheme': 'Ciemny motyw',
  'settings.openchamber.visual.field.diffLayoutAria': 'Układ diffa: {option}',
-  'settings.openchamber.visual.field.diffViewModeAria': 'Tryb widoku diffa: {option}',
  'settings.openchamber.visual.field.editTools': 'Narzędzia edycji',
+
  'settings.openchamber.visual.field.enableSpellcheckInTextInputs': 'Włącz sprawdzanie pisowni w polach tekstowych',
  'settings.openchamber.visual.field.enableSpellcheckInTextInputsAria': 'Włącz sprawdzanie pisowni w polach tekstowych',
  'settings.openchamber.visual.field.fontSizePercentageAria': 'Procentowy rozmiar czcionki',
@@ -995,10 +995,6 @@ export const settingsDict = {
  'settings.openchamber.visual.option.diffLayout.inline.label': 'Zawsze inline',
  'settings.openchamber.visual.option.diffLayout.sideBySide.description': 'Porównuj oryginalne i zmodyfikowane pliki.',
  'settings.openchamber.visual.option.diffLayout.sideBySide.label': 'Zawsze obok siebie',
-  'settings.openchamber.visual.option.diffViewMode.single.description': 'Pokazuj jeden plik naraz.',
-  'settings.openchamber.visual.option.diffViewMode.single.label': 'Pojedynczy plik',
-  'settings.openchamber.visual.option.diffViewMode.stacked.description': 'Układaj wszystkie zmienione pliki jeden pod drugim.',
-  'settings.openchamber.visual.option.diffViewMode.stacked.label': 'Wszystkie pliki',
  'settings.openchamber.visual.option.mermaidRendering.ascii.description': 'Renderuj diagramy jako bloki tekstowe.',
  'settings.openchamber.visual.option.mermaidRendering.ascii.label': 'ASCII',
  'settings.openchamber.visual.option.mermaidRendering.svg.description': 'Renderuj diagramy jako skalowalną grafikę.',
@@ -1043,8 +1039,6 @@ export const settingsDict = {
  'settings.openchamber.visual.option.mobileLayout.new': 'Nowy',
  'settings.openchamber.visual.section.diffLayout': 'Układ diffa',
  'settings.openchamber.visual.section.diffLayoutAria': 'Układ diffa',
-  'settings.openchamber.visual.section.diffViewMode': 'Tryb widoku diffa',
-  'settings.openchamber.visual.section.diffViewModeAria': 'Tryb widoku diffa',
  'settings.openchamber.visual.section.localization': 'Lokalizacja',
  'settings.openchamber.visual.section.mermaidRendering': 'Renderowanie Mermaid',
  'settings.openchamber.visual.section.mermaidRenderingAria': 'Tryb renderowania Mermaid',
@@ -1425,13 +1425,8 @@ export const dict: Record<I18nKey, string> = {
  'diffView.image.new': 'Nowy',
  'diffView.image.original': 'Oryginał',
  'diffView.image.originalAlt': 'Oryginał: {path}',
-  'diffView.mode.single.description': 'Pokazuj jeden plik naraz',
-  'diffView.mode.single.label': 'Pojedynczy plik',
-  'diffView.mode.stacked.description': 'Pokaż wszystkie zmodyfikowane pliki razem',
-  'diffView.mode.stacked.label': 'Wszystkie pliki',
  'diffView.section.files': 'Pliki',
  'diffView.selector.selectFile': 'Wybierz plik',
-  'diffView.selector.viewMode': 'Tryb widoku',
  'diffView.state.cleanWorkingTree': 'Drzewo robocze jest czyste, brak zmian do wyświetlenia',
  'diffView.state.failedToLoadDiff': 'Nie udało się wczytać diffu',
  'diffView.state.loadingChanges': 'Ładowanie zmian...',
@@ -1544,8 +1544,6 @@ export const settingsDict = {
  "settings.openchamber.visual.section.mermaidRenderingAria": "Modo de Renderizado de Mermaid",
  "settings.openchamber.visual.section.diffLayout": "Layout de comparação",
  "settings.openchamber.visual.section.diffLayoutAria": "Layout de comparação",
-  "settings.openchamber.visual.section.diffViewMode": "Modo de visualização de comparação",
-  "settings.openchamber.visual.section.diffViewModeAria": "Modo de visualização de comparação",
  "settings.openchamber.visual.section.privacy": "Privacidade",
  "settings.openchamber.visual.field.lightTheme": "Tema claro",
  "settings.openchamber.visual.field.darkTheme": "Tema escuro",
@@ -1608,7 +1606,6 @@ export const settingsDict = {
  "settings.openchamber.visual.field.userMessageRenderingAria": "Renderizado de mensagens do usuário: {option}",
  "settings.openchamber.visual.field.mermaidRenderingAria": "Renderizado de Mermaid: {option}",
  "settings.openchamber.visual.field.diffLayoutAria": "Layout de comparação: {option}",
-  "settings.openchamber.visual.field.diffViewModeAria": "Modo de visualização de comparação: {option}",
  "settings.openchamber.visual.field.showReasoningTracesAria": "Mostrar rastros de raciocínio",
  "settings.openchamber.visual.field.showReasoningTraces": "Mostrar rastros de raciocínio",
  "settings.openchamber.visual.field.collapsibleThinkingBlocksAria": "Habilitar blocos de raciocínio recolhíveis",
@@ -1649,10 +1646,6 @@ export const settingsDict = {
  "settings.openchamber.visual.option.diffLayout.inline.description": "Mostra uma visualização unificada.",
  "settings.openchamber.visual.option.diffLayout.sideBySide.label": "Sempre lado a lado",
  "settings.openchamber.visual.option.diffLayout.sideBySide.description": "Compara arquivos originais e modificados.",
-  "settings.openchamber.visual.option.diffViewMode.single.label": "Arquivo único",
-  "settings.openchamber.visual.option.diffViewMode.single.description": "Mostrar um arquivo à vez.",
-  "settings.openchamber.visual.option.diffViewMode.stacked.label": "Todos os arquivos",
-  "settings.openchamber.visual.option.diffViewMode.stacked.description": "Mostra todos os arquivos modificados em uma única visualização.",
  "settings.openchamber.visual.option.mermaidRendering.svg.label": "SVG",
  "settings.openchamber.visual.option.mermaidRendering.svg.description": "Renderiza diagramas como gráficos escaláveis.",
  "settings.openchamber.visual.option.mermaidRendering.ascii.label": "ASCII",
@@ -1150,12 +1150,7 @@ export const dict: Record<I18nKey, string> = {
  "diffView.change.renamed": "Arquivo renomeado",
  "diffView.change.copied": "Arquivo copiado",
  "diffView.change.modified": "Arquivo modificado",
-  "diffView.mode.single.label": "Arquivo único",
-  "diffView.mode.single.description": "Mostrar um arquivo à vez",
-  "diffView.mode.stacked.label": "Todos os arquivos",
-  "diffView.mode.stacked.description": "Mostra todos os arquivos modificados em uma única visualização.",
  "diffView.selector.selectFile": "Selecionar arquivo",
-  "diffView.selector.viewMode": "Modo de visualização",
  "diffView.image.original": "Original",
  "diffView.image.modified": "Modificado",
  "diffView.image.new": "Novo",
@@ -1544,8 +1544,6 @@ export const settingsDict = {
  "settings.openchamber.visual.section.mermaidRenderingAria": "Режим візуалізації Mermaid",
  "settings.openchamber.visual.section.diffLayout": "Компонування diff",
  "settings.openchamber.visual.section.diffLayoutAria": "Компонування diff",
-  "settings.openchamber.visual.section.diffViewMode": "Режим перегляду diff",
-  "settings.openchamber.visual.section.diffViewModeAria": "Режим перегляду diff",
  "settings.openchamber.visual.section.privacy": "Конфіденційність",
  "settings.openchamber.visual.field.lightTheme": "Світла тема",
  "settings.openchamber.visual.field.darkTheme": "Темна тема",
@@ -1608,7 +1606,6 @@ export const settingsDict = {
  "settings.openchamber.visual.field.userMessageRenderingAria": "Відображення повідомлень користувача: {option}",
  "settings.openchamber.visual.field.mermaidRenderingAria": "Візуалізація Mermaid: {option}",
  "settings.openchamber.visual.field.diffLayoutAria": "Компонування diff: {option}",
-  "settings.openchamber.visual.field.diffViewModeAria": "Режим перегляду diff: {option}",
  "settings.openchamber.visual.field.showReasoningTracesAria": "Показати сліди міркувань",
  "settings.openchamber.visual.field.showReasoningTraces": "Показати сліди міркувань",
  "settings.openchamber.visual.field.collapsibleThinkingBlocksAria": "Увімкнути згортальні блоки міркувань",
@@ -1649,10 +1646,6 @@ export const settingsDict = {
  "settings.openchamber.visual.option.diffLayout.inline.description": "Показувати як єдиний unified diff.",
  "settings.openchamber.visual.option.diffLayout.sideBySide.label": "Завжди пліч-о-пліч",
  "settings.openchamber.visual.option.diffLayout.sideBySide.description": "Порівнювати оригінальний і змінений файл поруч.",
-  "settings.openchamber.visual.option.diffViewMode.single.label": "Один файл",
-  "settings.openchamber.visual.option.diffViewMode.single.description": "Показувати по одному файлу.",
-  "settings.openchamber.visual.option.diffViewMode.stacked.label": "Усі файли",
-  "settings.openchamber.visual.option.diffViewMode.stacked.description": "Показувати всі змінені файли разом.",
  "settings.openchamber.visual.option.mermaidRendering.svg.label": "SVG",
  "settings.openchamber.visual.option.mermaidRendering.svg.description": "Відображати діаграми як масштабовану графіку.",
  "settings.openchamber.visual.option.mermaidRendering.ascii.label": "ASCII",
@@ -1150,12 +1150,7 @@ export const dict: Record<I18nKey, string> = {
  "diffView.change.renamed": "Перейменований файл",
  "diffView.change.copied": "Скопійований файл",
  "diffView.change.modified": "Змінений файл",
-  "diffView.mode.single.label": "Один файл",
-  "diffView.mode.single.description": "Показувати по одному файлу",
-  "diffView.mode.stacked.label": "Усі файли",
-  "diffView.mode.stacked.description": "Показувати всі змінені файли разом",
  "diffView.selector.selectFile": "Вибрати файл",
-  "diffView.selector.viewMode": "Режим перегляду",
  "diffView.image.original": "Оригінал",
  "diffView.image.modified": "Змінено",
  "diffView.image.new": "Новий",
@@ -1544,8 +1544,6 @@ export const settingsDict = {
  'settings.openchamber.visual.section.mermaidRenderingAria': 'Mermaid 渲染模式',
  'settings.openchamber.visual.section.diffLayout': '差异布局',
  'settings.openchamber.visual.section.diffLayoutAria': '差异布局',
-  'settings.openchamber.visual.section.diffViewMode': '差异视图模式',
-  'settings.openchamber.visual.section.diffViewModeAria': '差异视图模式',
  'settings.openchamber.visual.section.privacy': '隐私',
  'settings.openchamber.visual.field.lightTheme': '浅色主题',
  'settings.openchamber.visual.field.darkTheme': '深色主题',
@@ -1608,7 +1606,6 @@ export const settingsDict = {
  'settings.openchamber.visual.field.userMessageRenderingAria': '用户消息渲染：{option}',
  'settings.openchamber.visual.field.mermaidRenderingAria': 'Mermaid 渲染：{option}',
  'settings.openchamber.visual.field.diffLayoutAria': '差异布局：{option}',
-  'settings.openchamber.visual.field.diffViewModeAria': '差异视图模式：{option}',
  'settings.openchamber.visual.field.showReasoningTracesAria': '显示推理轨迹',
  'settings.openchamber.visual.field.showReasoningTraces': '显示推理轨迹',
  'settings.openchamber.visual.field.collapsibleThinkingBlocksAria': '启用可折叠推理块',
@@ -1649,10 +1646,6 @@ export const settingsDict = {
  'settings.openchamber.visual.option.diffLayout.inline.description': '以单一统一视图显示。',
  'settings.openchamber.visual.option.diffLayout.sideBySide.label': '始终并排',
  'settings.openchamber.visual.option.diffLayout.sideBySide.description': '对比原始文件与修改后文件。',
-  'settings.openchamber.visual.option.diffViewMode.single.label': '单文件',
-  'settings.openchamber.visual.option.diffViewMode.single.description': '一次只显示一个文件。',
-  'settings.openchamber.visual.option.diffViewMode.stacked.label': '所有文件',
-  'settings.openchamber.visual.option.diffViewMode.stacked.description': '将所有变更文件堆叠显示。',
  'settings.openchamber.visual.option.mermaidRendering.svg.label': 'SVG',
  'settings.openchamber.visual.option.mermaidRendering.svg.description': '将图表渲染为可缩放图形。',
  'settings.openchamber.visual.option.mermaidRendering.ascii.label': 'ASCII',
@@ -1150,12 +1150,7 @@ export const dict: Record<I18nKey, string> = {
  'diffView.change.renamed': '已重命名文件',
  'diffView.change.copied': '已复制文件',
  'diffView.change.modified': '已修改文件',
-  'diffView.mode.single.label': '单文件',
-  'diffView.mode.single.description': '一次只显示一个文件',
-  'diffView.mode.stacked.label': '全部文件',
-  'diffView.mode.stacked.description': '将所有修改文件堆叠显示',
  'diffView.selector.selectFile': '选择文件',
-  'diffView.selector.viewMode': '视图模式',
  'diffView.image.original': '原始',
  'diffView.image.modified': '已修改',
  'diffView.image.new': '新文件',
@@ -1463,8 +1463,6 @@
  'settings.openchamber.visual.section.mermaidRenderingAria': 'Mermaid 渲染模式',
  'settings.openchamber.visual.section.diffLayout': '差異佈局',
  'settings.openchamber.visual.section.diffLayoutAria': '差異佈局',
-  'settings.openchamber.visual.section.diffViewMode': '差異檢視模式',
-  'settings.openchamber.visual.section.diffViewModeAria': '差異檢視模式',
  'settings.openchamber.visual.section.privacy': '隱私',
  'settings.openchamber.visual.field.lightTheme': '淺色主題',
  'settings.openchamber.visual.field.darkTheme': '深色主題',
@@ -1529,7 +1527,6 @@
  'settings.openchamber.visual.field.userMessageRenderingAria': '使用者訊息渲染：{option}',
  'settings.openchamber.visual.field.mermaidRenderingAria': 'Mermaid 渲染：{option}',
  'settings.openchamber.visual.field.diffLayoutAria': '差異佈局：{option}',
-  'settings.openchamber.visual.field.diffViewModeAria': '差異檢視模式：{option}',
  'settings.openchamber.visual.field.showReasoningTracesAria': '顯示推理軌跡',
  'settings.openchamber.visual.field.showReasoningTraces': '顯示推理軌跡',
  'settings.openchamber.visual.field.collapsibleThinkingBlocksAria': '啟用可摺疊推理區塊',
@@ -1570,10 +1567,6 @@
  'settings.openchamber.visual.option.diffLayout.inline.description': '以單一統一檢視顯示。',
  'settings.openchamber.visual.option.diffLayout.sideBySide.label': '始終並排',
  'settings.openchamber.visual.option.diffLayout.sideBySide.description': '對比原始檔案與修改後檔案。',
-  'settings.openchamber.visual.option.diffViewMode.single.label': '單檔案',
-  'settings.openchamber.visual.option.diffViewMode.single.description': '一次只顯示一個檔案。',
-  'settings.openchamber.visual.option.diffViewMode.stacked.label': '所有檔案',
-  'settings.openchamber.visual.option.diffViewMode.stacked.description': '將所有變更檔案堆疊顯示。',
  'settings.openchamber.visual.option.mermaidRendering.svg.label': 'SVG',
  'settings.openchamber.visual.option.mermaidRendering.svg.description': '將圖表轉譯為可縮放圖形。',
  'settings.openchamber.visual.option.mermaidRendering.ascii.label': 'ASCII',
@@ -1160,12 +1160,7 @@ export const dict: Record<I18nKey, string> = {
  'diffView.change.renamed': '已重新命名檔案',
  'diffView.change.copied': '已複製檔案',
  'diffView.change.modified': '已修改檔案',
-  'diffView.mode.single.label': '單一檔案',
-  'diffView.mode.single.description': '一次只顯示一個檔案',
-  'diffView.mode.stacked.label': '全部檔案',
-  'diffView.mode.stacked.description': '將所有修改檔案堆疊顯示',
  'diffView.selector.selectFile': '選擇檔案',
-  'diffView.selector.viewMode': '檢視模式',
  'diffView.image.original': '原始',
  'diffView.image.modified': '已修改',
  'diffView.image.new': '新檔案',
@@ -625,12 +625,6 @@ const applyDesktopUiPreferences = (settings: DesktopSettings) => {
      store.setDiffLayoutPreference(settings.diffLayoutPreference);
    }
  }
-  if (typeof settings.diffViewMode === 'string'
-    && (settings.diffViewMode === 'single' || settings.diffViewMode === 'stacked')) {
-    if (settings.diffViewMode !== store.diffViewMode) {
-      store.setDiffViewMode(settings.diffViewMode);
-    }
-  }
  if (typeof settings.gitChangesViewMode === 'string'
    && (settings.gitChangesViewMode === 'flat' || settings.gitChangesViewMode === 'tree')) {
    if (settings.gitChangesViewMode !== store.gitChangesViewMode) {
@@ -1065,12 +1059,6 @@ const sanitizeWebSettings = (payload: unknown): DesktopSettings | null => {
  ) {
    result.diffLayoutPreference = candidate.diffLayoutPreference;
  }
-  if (
-    typeof candidate.diffViewMode === 'string'
-    && (candidate.diffViewMode === 'single' || candidate.diffViewMode === 'stacked')
-  ) {
-    result.diffViewMode = candidate.diffViewMode;
-  }
  if (
    typeof candidate.gitChangesViewMode === 'string'
    && (candidate.gitChangesViewMode === 'flat' || candidate.gitChangesViewMode === 'tree')
@@ -579,7 +579,6 @@ interface UIStore {
  diffLayoutPreference: 'dynamic' | 'inline' | 'side-by-side';
  diffFileLayout: Record<string, 'inline' | 'side-by-side'>;
  diffWrapLines: boolean;
-  diffViewMode: 'single' | 'stacked';
  gitChangesViewMode: 'flat' | 'tree';
  isTimelineDialogOpen: boolean;
  isImagePreviewOpen: boolean;
@@ -735,7 +734,6 @@ interface UIStore {
  setDiffLayoutPreference: (mode: 'dynamic' | 'inline' | 'side-by-side') => void;
  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;
@@ -864,7 +862,6 @@ export const useUIStore = create<UIStore>()(
        diffLayoutPreference: 'inline',
        diffFileLayout: {},
        diffWrapLines: false,
-        diffViewMode: 'stacked',
        gitChangesViewMode: 'flat',
        isTimelineDialogOpen: false,
        isImagePreviewOpen: false,
@@ -1681,10 +1678,6 @@ export const useUIStore = create<UIStore>()(
          set({ diffWrapLines: wrap });
        },

-        setDiffViewMode: (mode) => {
-          set({ diffViewMode: mode });
-        },
-
        setGitChangesViewMode: (mode) => {
          set({ gitChangesViewMode: mode });
        },
@@ -2086,13 +2079,18 @@ export const useUIStore = create<UIStore>()(
      {
        name: 'ui-store',
        storage: createJSONStorage(() => getSafeStorage()),
-        version: 9,
+        version: 10,
        migrate: (persistedState, version) => {
          if (!persistedState || typeof persistedState !== 'object') {
            return persistedState;
          }
          const state = persistedState as Record<string, unknown>;

+          // v9 -> v10: remove obsolete single-file diff view mode setting
+          if (version < 10) {
+            delete state.diffViewMode;
+          }
+
          // v8 -> v9: initialize notes/todo panel height fields
          if (version < 9) {
            if (typeof state.notesPanelHeight !== 'number' || !Number.isFinite(state.notesPanelHeight)) {
@@ -2225,7 +2223,6 @@ export const useUIStore = create<UIStore>()(
          recentEfforts: state.recentEfforts,
          diffLayoutPreference: state.diffLayoutPreference,
          diffWrapLines: state.diffWrapLines,
-          diffViewMode: state.diffViewMode,
          gitChangesViewMode: state.gitChangesViewMode,
          nativeNotificationsEnabled: state.nativeNotificationsEnabled,
          notificationMode: state.notificationMode,