diffstalker 0.2.2 → 0.2.4

package/dist/App.js

@@ -3,25 +3,21 @@ import { LayoutManager } from './ui/Layout.js';
 import { setupKeyBindings } from './KeyBindings.js';
 import { renderTopPane, renderBottomPane } from './ui/PaneRenderers.js';
 import { setupMouseHandlers } from './MouseHandlers.js';
+import { NavigationController } from './NavigationController.js';
+import { StagingOperations } from './StagingOperations.js';
+import { ModalController } from './ModalController.js';
 import { FollowMode } from './FollowMode.js';
 import { formatHeader } from './ui/widgets/Header.js';
 import { formatFooter } from './ui/widgets/Footer.js';
-import { getFileAtIndex, getRowFromFileIndex } from './ui/widgets/FileList.js';
-import { getCommitAtIndex } from './ui/widgets/HistoryView.js';
-import { getNextCompareSelection, getRowFromCompareSelection, } from './ui/widgets/CompareListView.js';
 import { ExplorerStateManager, } from './core/ExplorerStateManager.js';
-import { ThemePicker } from './ui/modals/ThemePicker.js';
-import { HotkeysModal } from './ui/modals/HotkeysModal.js';
-import { BaseBranchPicker } from './ui/modals/BaseBranchPicker.js';
-import { DiscardConfirm } from './ui/modals/DiscardConfirm.js';
-import { FileFinder } from './ui/modals/FileFinder.js';
 import { CommitFlowState } from './state/CommitFlowState.js';
 import { UIState } from './state/UIState.js';
 import { getManagerForRepo, removeManagerForRepo, } from './core/GitStateManager.js';
-import { saveConfig } from './config.js';
-import { getCategoryForIndex, getIndexForCategoryPosition, } from './utils/fileCategories.js';
+import { saveConfig, addRecentRepo } from './config.js';
+import { getIndexForCategoryPosition } from './utils/fileCategories.js';
 import { buildFlatFileList, getFlatFileAtIndex, getFlatFileIndexByPath, } from './utils/flatFileList.js';
-import { extractHunkPatch } from './git/diff.js';
+import { getFileAtIndex } from './ui/widgets/FileList.js';
+import { resolveFileAtIndex as resolveFile, getFileListMaxIndex as getMaxIndex, } from './utils/fileResolution.js';
 /**
  * Main application controller.
  * Coordinates between GitStateManager, UIState, and blessed widgets.
@@ -35,33 +31,39 @@ export class App {
     explorerManager = null;
     config;
     commandServer;
+    navigation;
+    staging;
+    modals;
     // Current state
     repoPath;
     currentTheme;
+    recentRepos;
     // Commit flow state
     commitFlowState;
     commitTextarea = null;
-    // Active modals
-    activeModal = null;
+    // Auto-clear timer for remote operation status
+    remoteClearTimer = null;
     // Cached total rows and hunk info for scroll bounds (single source of truth from render)
     bottomPaneTotalRows = 0;
     bottomPaneHunkCount = 0;
     bottomPaneHunkBoundaries = [];
-    // Selection anchor: remembers category + position before stage/unstage
-    pendingSelectionAnchor = null;
+    // Auto-tab transition tracking
+    prevFileCount = 0;
     // Flat view mode state
     cachedFlatFiles = [];
-    pendingFlatSelectionPath = null;
-    pendingHunkIndex = null;
     combinedHunkMapping = [];
     constructor(options) {
         this.config = options.config;
         this.commandServer = options.commandServer ?? null;
         this.repoPath = options.initialPath ?? process.cwd();
         this.currentTheme = options.config.theme;
+        this.recentRepos = options.config.recentRepos ?? [];
         // Initialize UI state with config values
         this.uiState = new UIState({
             splitRatio: options.config.splitRatio ?? 0.4,
+            autoTabEnabled: options.config.autoTabEnabled ?? false,
+            wrapMode: options.config.wrapMode ?? false,
+            mouseEnabled: options.config.mouseEnabled ?? true,
         });
         // Create blessed screen
         this.screen = blessed.screen({
@@ -89,9 +91,9 @@ export class App {
         });
         // Initialize commit flow state
         this.commitFlowState = new CommitFlowState({
-            getHeadMessage: () => this.gitManager?.getHeadCommitMessage() ?? Promise.resolve(''),
+            getHeadMessage: () => this.gitManager?.history.getHeadCommitMessage() ?? Promise.resolve(''),
             onCommit: async (message, amend) => {
-                await this.gitManager?.commit(message, amend);
+                await this.gitManager?.workingTree.commit(message, amend);
             },
             onSuccess: () => {
                 this.uiState.setTab('diff');
@@ -124,6 +126,50 @@ export class App {
                 this.commitFlowState.setMessage(value);
             });
         });
+        // Setup navigation controller
+        this.navigation = new NavigationController({
+            uiState: this.uiState,
+            getGitManager: () => this.gitManager,
+            getExplorerManager: () => this.explorerManager,
+            getTopPaneHeight: () => this.layout.dimensions.topPaneHeight,
+            getBottomPaneHeight: () => this.layout.dimensions.bottomPaneHeight,
+            getCachedFlatFiles: () => this.cachedFlatFiles,
+            getHunkCount: () => this.bottomPaneHunkCount,
+            getHunkBoundaries: () => this.bottomPaneHunkBoundaries,
+            getRepoPath: () => this.repoPath,
+            onError: (message) => this.showError(message),
+            resolveFileAtIndex: (index) => resolveFile(index, this.uiState.state.flatViewMode, this.cachedFlatFiles, this.gitManager?.workingTree.state.status?.files ?? []),
+            getFileListMaxIndex: () => getMaxIndex(this.uiState.state.flatViewMode, this.cachedFlatFiles, this.gitManager?.workingTree.state.status?.files ?? []),
+        });
+        // Setup modal controller
+        this.modals = new ModalController({
+            screen: this.screen,
+            uiState: this.uiState,
+            getGitManager: () => this.gitManager,
+            getExplorerManager: () => this.explorerManager,
+            getTopPaneHeight: () => this.layout.dimensions.topPaneHeight,
+            getCurrentTheme: () => this.currentTheme,
+            setCurrentTheme: (theme) => {
+                this.currentTheme = theme;
+            },
+            getRepoPath: () => this.repoPath,
+            getRecentRepos: () => this.recentRepos,
+            onRepoSwitch: (repoPath) => this.switchToRepo(repoPath),
+            render: () => this.render(),
+        });
+        // Setup staging operations
+        this.staging = new StagingOperations({
+            uiState: this.uiState,
+            getGitManager: () => this.gitManager,
+            getCachedFlatFiles: () => this.cachedFlatFiles,
+            getCombinedHunkMapping: () => this.combinedHunkMapping,
+            resolveFileAtIndex: (index) => resolveFile(index, this.uiState.state.flatViewMode, this.cachedFlatFiles, this.gitManager?.workingTree.state.status?.files ?? []),
+        });
+        // If mouse was persisted as disabled, disable it now
+        if (!this.uiState.state.mouseEnabled) {
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            this.screen.program.disableMouse();
+        }
         // Setup keyboard handlers
         this.setupKeyboardHandlers();
         // Setup mouse handlers
@@ -147,102 +193,95 @@ export class App {
         // Initial render
         this.render();
     }
+    /**
+     * Display an error in the UI by emitting a state change with the error set.
+     */
+    showError(message) {
+        if (!this.gitManager)
+            return;
+        const wt = this.gitManager.workingTree;
+        wt.emit('state-change', { ...wt.state, error: message });
+    }
     setupKeyboardHandlers() {
         setupKeyBindings(this.screen, {
             exit: () => this.exit(),
-            navigateDown: () => this.navigateDown(),
-            navigateUp: () => this.navigateUp(),
-            stageSelected: () => this.stageSelected(),
-            unstageSelected: () => this.unstageSelected(),
-            stageAll: () => this.stageAll(),
-            unstageAll: () => this.unstageAll(),
-            toggleSelected: () => this.toggleSelected(),
-            enterExplorerDirectory: () => this.enterExplorerDirectory(),
-            goExplorerUp: () => this.goExplorerUp(),
-            openFileFinder: () => this.openFileFinder(),
+            navigateDown: () => this.navigation.navigateDown(),
+            navigateUp: () => this.navigation.navigateUp(),
+            stageSelected: () => this.staging.stageSelected(),
+            unstageSelected: () => this.staging.unstageSelected(),
+            stageAll: () => this.staging.stageAll(),
+            unstageAll: () => this.staging.unstageAll(),
+            toggleSelected: () => this.staging.toggleSelected(),
+            enterExplorerDirectory: () => this.navigation.enterExplorerDirectory(),
+            goExplorerUp: () => this.navigation.goExplorerUp(),
+            openFileFinder: () => this.modals.openFileFinder(),
             focusCommitInput: () => this.focusCommitInput(),
             unfocusCommitInput: () => this.unfocusCommitInput(),
-            refresh: () => this.refresh(),
+            openRepoPicker: () => this.modals.openRepoPicker(),
+            openThemePicker: () => this.modals.openThemePicker(),
+            openHotkeysModal: () => this.modals.openHotkeysModal(),
+            openBaseBranchPicker: () => this.modals.openBaseBranchPicker(),
+            closeActiveModal: () => this.modals.closeActiveModal(),
             toggleMouseMode: () => this.toggleMouseMode(),
             toggleFollow: () => this.toggleFollow(),
-            showDiscardConfirm: (file) => this.showDiscardConfirm(file),
+            openDiscardConfirm: (file) => this.modals.openDiscardConfirm(file),
             render: () => this.render(),
-            toggleCurrentHunk: () => this.toggleCurrentHunk(),
-            navigateNextHunk: () => this.navigateNextHunk(),
-            navigatePrevHunk: () => this.navigatePrevHunk(),
+            toggleCurrentHunk: () => this.staging.toggleCurrentHunk(),
+            navigateNextHunk: () => this.navigation.navigateNextHunk(),
+            navigatePrevHunk: () => this.navigation.navigatePrevHunk(),
+            openCherryPickConfirm: () => this.modals.openCherryPickConfirm(),
+            openRevertConfirm: () => this.modals.openRevertConfirm(),
         }, {
-            hasActiveModal: () => this.activeModal !== null,
+            hasActiveModal: () => this.modals.hasActiveModal(),
+            getActiveModalType: () => this.modals.getActiveModalType(),
             getBottomTab: () => this.uiState.state.bottomTab,
             getCurrentPane: () => this.uiState.state.currentPane,
+            getFocusedZone: () => this.uiState.state.focusedZone,
             isCommitInputFocused: () => this.commitFlowState.state.inputFocused,
-            getStatusFiles: () => this.gitManager?.state.status?.files ?? [],
+            getStatusFiles: () => this.gitManager?.workingTree.state.status?.files ?? [],
             getSelectedIndex: () => this.uiState.state.selectedIndex,
             uiState: this.uiState,
             getExplorerManager: () => this.explorerManager,
             commitFlowState: this.commitFlowState,
             getGitManager: () => this.gitManager,
             layout: this.layout,
-            getCachedFlatFiles: () => this.cachedFlatFiles,
+            resolveFileAtIndex: (index) => resolveFile(index, this.uiState.state.flatViewMode, this.cachedFlatFiles, this.gitManager?.workingTree.state.status?.files ?? []),
         });
     }
     setupMouseEventHandlers() {
         setupMouseHandlers(this.layout, {
-            selectHistoryCommitByIndex: (index) => this.selectHistoryCommitByIndex(index),
-            selectCompareItem: (selection) => this.selectCompareItem(selection),
-            selectFileByIndex: (index) => this.selectFileByIndex(index),
-            toggleFileByIndex: (index) => this.toggleFileByIndex(index),
-            enterExplorerDirectory: () => this.enterExplorerDirectory(),
+            selectHistoryCommitByIndex: (index) => this.navigation.selectHistoryCommitByIndex(index),
+            selectCompareItem: (selection) => this.navigation.selectCompareItem(selection),
+            selectFileByIndex: (index) => this.navigation.selectFileByIndex(index),
+            toggleFileByIndex: (index) => this.staging.toggleFileByIndex(index),
+            enterExplorerDirectory: () => this.navigation.enterExplorerDirectory(),
             toggleMouseMode: () => this.toggleMouseMode(),
             toggleFollow: () => this.toggleFollow(),
-            selectHunkAtRow: (row) => this.selectHunkAtRow(row),
+            selectHunkAtRow: (row) => this.navigation.selectHunkAtRow(row),
+            focusCommitInput: () => this.focusCommitInput(),
+            openHotkeysModal: () => this.modals.openHotkeysModal(),
             render: () => this.render(),
         }, {
             uiState: this.uiState,
             getExplorerManager: () => this.explorerManager,
-            getStatusFiles: () => this.gitManager?.state.status?.files ?? [],
-            getHistoryCommitCount: () => this.gitManager?.historyState.commits.length ?? 0,
-            getCompareCommits: () => this.gitManager?.compareState?.compareDiff?.commits ?? [],
-            getCompareFiles: () => this.gitManager?.compareState?.compareDiff?.files ?? [],
+            getStatusFiles: () => this.gitManager?.workingTree.state.status?.files ?? [],
+            getHistoryCommitCount: () => this.gitManager?.history.historyState.commits.length ?? 0,
+            getCompareCommits: () => this.gitManager?.compare.compareState?.compareDiff?.commits ?? [],
+            getCompareFiles: () => this.gitManager?.compare.compareState?.compareDiff?.files ?? [],
             getBottomPaneTotalRows: () => this.bottomPaneTotalRows,
             getScreenWidth: () => this.screen.width || 80,
             getCachedFlatFiles: () => this.cachedFlatFiles,
         });
     }
-    /**
-     * Toggle staging for a flat file entry (stage if unstaged/partial, unstage if fully staged).
-     */
-    async toggleFlatEntry(entry) {
-        this.pendingFlatSelectionPath = entry.path;
-        if (entry.stagingState === 'staged') {
-            if (entry.stagedEntry)
-                await this.gitManager?.unstage(entry.stagedEntry);
-        }
-        else {
-            if (entry.unstagedEntry)
-                await this.gitManager?.stage(entry.unstagedEntry);
-        }
-    }
-    async toggleFileByIndex(index) {
-        if (this.uiState.state.flatViewMode) {
-            const flatEntry = getFlatFileAtIndex(this.cachedFlatFiles, index);
-            if (flatEntry)
-                await this.toggleFlatEntry(flatEntry);
-        }
-        else {
-            const files = this.gitManager?.state.status?.files ?? [];
-            const file = getFileAtIndex(files, index);
-            if (file) {
-                this.pendingSelectionAnchor = getCategoryForIndex(files, this.uiState.state.selectedIndex);
-                if (file.staged) {
-                    await this.gitManager?.unstage(file);
-                }
-                else {
-                    await this.gitManager?.stage(file);
-                }
-            }
-        }
-    }
     setupStateListeners() {
+        // Apply auto-tab logic when toggled on
+        let prevAutoTab = this.uiState.state.autoTabEnabled;
+        this.uiState.on('change', (state) => {
+            if (state.autoTabEnabled && !prevAutoTab) {
+                this.applyAutoTab();
+            }
+            prevAutoTab = state.autoTabEnabled;
+        });
         // Update footer when UI state changes
         this.uiState.on('change', () => {
             this.render();
@@ -254,10 +293,10 @@ export class App {
                 this.uiState.setSelectedHunkIndex(0);
             }
             if (tab === 'history') {
-                this.gitManager?.loadHistory();
+                this.loadHistory();
             }
             else if (tab === 'compare') {
-                this.gitManager?.refreshCompareDiff(this.uiState.state.includeUncommitted);
+                this.gitManager?.compare.refreshCompareDiff(this.uiState.state.includeUncommitted);
             }
             else if (tab === 'explorer') {
                 // Explorer is already loaded on init, but refresh if needed
@@ -266,60 +305,23 @@ export class App {
                 }
             }
         });
-        // Handle modal opening/closing
-        this.uiState.on('modal-change', (modal) => {
-            // Close any existing modal
-            if (this.activeModal) {
-                this.activeModal = null;
-            }
-            // Open new modal if requested
-            if (modal === 'theme') {
-                this.activeModal = new ThemePicker(this.screen, this.currentTheme, (theme) => {
-                    this.currentTheme = theme;
-                    saveConfig({ theme });
-                    this.activeModal = null;
-                    this.uiState.closeModal();
-                    this.render();
-                }, () => {
-                    this.activeModal = null;
-                    this.uiState.closeModal();
-                });
-                this.activeModal.focus();
-            }
-            else if (modal === 'hotkeys') {
-                this.activeModal = new HotkeysModal(this.screen, () => {
-                    this.activeModal = null;
-                    this.uiState.closeModal();
-                });
-                this.activeModal.focus();
-            }
-            else if (modal === 'baseBranch') {
-                // Load candidate branches and show picker
-                this.gitManager?.getCandidateBaseBranches().then((branches) => {
-                    const currentBranch = this.gitManager?.compareState.compareBaseBranch ?? null;
-                    this.activeModal = new BaseBranchPicker(this.screen, branches, currentBranch, (branch) => {
-                        this.activeModal = null;
-                        this.uiState.closeModal();
-                        // Set base branch and refresh compare view
-                        const includeUncommitted = this.uiState.state.includeUncommitted;
-                        this.gitManager?.setCompareBaseBranch(branch, includeUncommitted);
-                    }, () => {
-                        this.activeModal = null;
-                        this.uiState.closeModal();
-                    });
-                    this.activeModal.focus();
-                });
-            }
-        });
-        // Save split ratio to config when it changes
+        // Persist UI state to config when toggles or split ratio change
         let saveTimer = null;
         this.uiState.on('change', (state) => {
             if (saveTimer)
                 clearTimeout(saveTimer);
             saveTimer = setTimeout(() => {
-                if (state.splitRatio !== this.config.splitRatio) {
-                    saveConfig({ splitRatio: state.splitRatio });
-                }
+                const updates = {};
+                if (state.splitRatio !== this.config.splitRatio)
+                    updates.splitRatio = state.splitRatio;
+                if (state.autoTabEnabled !== this.config.autoTabEnabled)
+                    updates.autoTabEnabled = state.autoTabEnabled;
+                if (state.wrapMode !== this.config.wrapMode)
+                    updates.wrapMode = state.wrapMode;
+                if (state.mouseEnabled !== this.config.mouseEnabled)
+                    updates.mouseEnabled = state.mouseEnabled;
+                if (Object.keys(updates).length > 0)
+                    saveConfig(updates);
             }, 500);
         });
     }
@@ -332,92 +334,160 @@ export class App {
         this.render();
     }
     handleFollowFileNavigate(rawContent) {
-        this.navigateToFile(rawContent);
+        this.navigation.navigateToFile(rawContent);
+        this.render();
+    }
+    recordCurrentRepo() {
+        const max = this.config.maxRecentRepos ?? 10;
+        const normalized = this.repoPath.replace(/\/$/, '');
+        this.recentRepos = [
+            normalized,
+            ...this.recentRepos.map((r) => r.replace(/\/$/, '')).filter((r) => r !== normalized),
+        ].slice(0, max);
+        addRecentRepo(this.repoPath, max);
+    }
+    switchToRepo(newPath) {
+        if (newPath === this.repoPath)
+            return;
+        if (this.followMode?.isEnabled)
+            this.followMode.stop();
+        const oldRepoPath = this.repoPath;
+        this.repoPath = newPath;
+        this.initGitManager(oldRepoPath);
+        this.resetRepoSpecificState();
+        this.loadCurrentTabData();
         this.render();
     }
     initGitManager(oldRepoPath) {
-        // Clean up existing manager
+        // Clean up existing manager's event listeners
         if (this.gitManager) {
-            this.gitManager.removeAllListeners();
+            this.gitManager.workingTree.removeAllListeners();
+            this.gitManager.history.removeAllListeners();
+            this.gitManager.compare.removeAllListeners();
+            this.gitManager.remote.removeAllListeners();
             // Use oldRepoPath if provided (when switching repos), otherwise use current path
             removeManagerForRepo(oldRepoPath ?? this.repoPath);
         }
         // Get or create manager for this repo
         this.gitManager = getManagerForRepo(this.repoPath);
-        // Listen to state changes
-        this.gitManager.on('state-change', () => {
+        // Listen to working tree state changes
+        this.gitManager.workingTree.on('state-change', () => {
             // Skip reconciliation while loading — the pending anchor must wait
             // for the new status to arrive before being consumed
-            if (!this.gitManager?.state.isLoading) {
+            if (!this.gitManager?.workingTree.state.isLoading) {
                 this.reconcileSelectionAfterStateChange();
+                this.applyAutoTab();
             }
             this.updateExplorerGitStatus();
             this.render();
         });
-        this.gitManager.on('history-state-change', (historyState) => {
+        // Listen to history state changes
+        this.gitManager.history.on('history-state-change', (historyState) => {
             // Auto-select first commit when history loads
             if (historyState.commits.length > 0 && !historyState.selectedCommit) {
                 const state = this.uiState.state;
                 if (state.bottomTab === 'history') {
-                    this.selectHistoryCommitByIndex(state.historySelectedIndex);
+                    this.navigation.selectHistoryCommitByIndex(state.historySelectedIndex);
                 }
             }
             this.render();
         });
-        this.gitManager.on('compare-state-change', () => {
+        // Listen to compare state changes
+        this.gitManager.compare.on('compare-state-change', () => {
+            this.render();
+        });
+        this.gitManager.compare.on('compare-selection-change', () => {
             this.render();
         });
-        this.gitManager.on('compare-selection-change', () => {
+        // Listen to remote operation state changes
+        this.gitManager.remote.on('remote-state-change', (remoteState) => {
+            // Auto-clear success after 3s, error after 5s
+            if (this.remoteClearTimer)
+                clearTimeout(this.remoteClearTimer);
+            if (remoteState.lastResult && !remoteState.inProgress) {
+                this.remoteClearTimer = setTimeout(() => {
+                    this.gitManager?.remote.clearRemoteState();
+                }, 3000);
+            }
+            else if (remoteState.error) {
+                this.remoteClearTimer = setTimeout(() => {
+                    this.gitManager?.remote.clearRemoteState();
+                }, 5000);
+            }
             this.render();
         });
         // Start watching and do initial refresh
-        this.gitManager.startWatching();
-        this.gitManager.refresh();
+        this.gitManager.workingTree.startWatching();
+        this.gitManager.workingTree.refresh();
         // Initialize explorer manager
         this.initExplorerManager();
+        // Record this repo in recent repos list
+        this.recordCurrentRepo();
+    }
+    /**
+     * Load history with error handling (moved from facade).
+     */
+    loadHistory(count = 100) {
+        this.gitManager?.history.loadHistory(count).catch((err) => {
+            this.showError(`Failed to load history: ${err instanceof Error ? err.message : String(err)}`);
+        });
     }
     /**
      * After git state changes, reconcile the selected file index.
      * Handles both flat mode (path-based anchoring) and categorized mode (category-based anchoring).
      */
     reconcileSelectionAfterStateChange() {
-        const files = this.gitManager?.state.status?.files ?? [];
-        if (this.uiState.state.flatViewMode && this.pendingFlatSelectionPath) {
-            const flatFiles = buildFlatFileList(files, this.gitManager?.state.hunkCounts ?? null);
-            const targetPath = this.pendingFlatSelectionPath;
-            this.pendingFlatSelectionPath = null;
-            const newIndex = getFlatFileIndexByPath(flatFiles, targetPath);
+        const files = this.gitManager?.workingTree.state.status?.files ?? [];
+        const pendingFlatPath = this.staging.consumePendingFlatSelectionPath();
+        if (this.uiState.state.flatViewMode && pendingFlatPath) {
+            const flatFiles = buildFlatFileList(files, this.gitManager?.workingTree.state.hunkCounts ?? null);
+            const newIndex = getFlatFileIndexByPath(flatFiles, pendingFlatPath);
             if (newIndex >= 0) {
                 this.uiState.setSelectedIndex(newIndex);
-                this.selectFileByIndex(newIndex);
+                this.navigation.selectFileByIndex(newIndex);
             }
             else if (flatFiles.length > 0) {
                 const clamped = Math.min(this.uiState.state.selectedIndex, flatFiles.length - 1);
                 this.uiState.setSelectedIndex(clamped);
-                this.selectFileByIndex(clamped);
+                this.navigation.selectFileByIndex(clamped);
             }
             return;
         }
-        if (this.pendingSelectionAnchor) {
-            const anchor = this.pendingSelectionAnchor;
-            this.pendingSelectionAnchor = null;
+        const anchor = this.staging.consumePendingSelectionAnchor();
+        if (anchor) {
             const newIndex = getIndexForCategoryPosition(files, anchor.category, anchor.categoryIndex);
             this.uiState.setSelectedIndex(newIndex);
-            this.selectFileByIndex(newIndex);
+            this.navigation.selectFileByIndex(newIndex);
             return;
         }
-        // No pending anchor — just clamp to valid range
+        // No pending anchor — clamp to valid range and sync diff if file changed
+        const currentSelected = this.gitManager?.workingTree.state.selectedFile ?? null;
         if (this.uiState.state.flatViewMode) {
-            const flatFiles = buildFlatFileList(files, this.gitManager?.state.hunkCounts ?? null);
+            const flatFiles = buildFlatFileList(files, this.gitManager?.workingTree.state.hunkCounts ?? null);
             const maxIndex = flatFiles.length - 1;
-            if (maxIndex >= 0 && this.uiState.state.selectedIndex > maxIndex) {
-                this.uiState.setSelectedIndex(maxIndex);
+            let idx = this.uiState.state.selectedIndex;
+            if (maxIndex >= 0 && idx > maxIndex) {
+                idx = maxIndex;
+                this.uiState.setSelectedIndex(idx);
+            }
+            const flatEntry = getFlatFileAtIndex(flatFiles, idx);
+            const fileAtIdx = flatEntry?.unstagedEntry ?? flatEntry?.stagedEntry ?? null;
+            if (fileAtIdx &&
+                (fileAtIdx.path !== currentSelected?.path || fileAtIdx.staged !== currentSelected?.staged)) {
+                this.navigation.selectFileByIndex(idx);
             }
         }
         else if (files.length > 0) {
             const maxIndex = files.length - 1;
-            if (this.uiState.state.selectedIndex > maxIndex) {
-                this.uiState.setSelectedIndex(maxIndex);
+            let idx = this.uiState.state.selectedIndex;
+            if (idx > maxIndex) {
+                idx = maxIndex;
+                this.uiState.setSelectedIndex(idx);
+            }
+            const fileAtIdx = getFileAtIndex(files, idx);
+            if (fileAtIdx &&
+                (fileAtIdx.path !== currentSelected?.path || fileAtIdx.staged !== currentSelected?.staged)) {
+                this.navigation.selectFileByIndex(idx);
             }
         }
     }
@@ -439,6 +509,8 @@ export class App {
         });
         // Load root directory
         this.explorerManager.loadDirectory('');
+        // Pre-load file paths for file finder (runs in background)
+        this.explorerManager.loadFilePaths();
         // Update git status after tree is loaded
         this.updateExplorerGitStatus();
     }
@@ -448,7 +520,7 @@ export class App {
     updateExplorerGitStatus() {
         if (!this.explorerManager || !this.gitManager)
             return;
-        const files = this.gitManager.state.status?.files ?? [];
+        const files = this.gitManager.workingTree.state.status?.files ?? [];
         const statusMap = {
             files: new Map(),
             directories: new Set(),
@@ -472,8 +544,8 @@ export class App {
      * Called when switching to a new repo via file watcher.
      */
     resetRepoSpecificState() {
-        // Reset compare selection (App-level state)
-        this.compareSelection = null;
+        // Reset compare selection (owned by NavigationController)
+        this.navigation.compareSelection = null;
         // Reset UI state scroll offsets and selections
         this.uiState.resetForNewRepo();
     }
@@ -484,26 +556,26 @@ export class App {
     loadCurrentTabData() {
         const tab = this.uiState.state.bottomTab;
         if (tab === 'history') {
-            this.gitManager?.loadHistory();
+            this.loadHistory();
         }
         else if (tab === 'compare') {
-            this.gitManager?.refreshCompareDiff(this.uiState.state.includeUncommitted);
+            this.gitManager?.compare.refreshCompareDiff(this.uiState.state.includeUncommitted);
         }
-        // Diff tab data is loaded by gitManager.refresh() in initGitManager
+        // Diff tab data is loaded by gitManager.workingTree.refresh() in initGitManager
         // Explorer data is loaded by initExplorerManager()
     }
     setupCommandHandler() {
         if (!this.commandServer)
             return;
         const handler = {
-            navigateUp: () => this.navigateUp(),
-            navigateDown: () => this.navigateDown(),
+            navigateUp: () => this.navigation.navigateUp(),
+            navigateDown: () => this.navigation.navigateDown(),
             switchTab: (tab) => this.uiState.setTab(tab),
             togglePane: () => this.uiState.togglePane(),
-            stage: async () => this.stageSelected(),
-            unstage: async () => this.unstageSelected(),
-            stageAll: async () => this.stageAll(),
-            unstageAll: async () => this.unstageAll(),
+            stage: async () => this.staging.stageSelected(),
+            unstage: async () => this.staging.unstageSelected(),
+            stageAll: async () => this.staging.stageAll(),
+            unstageAll: async () => this.staging.unstageAll(),
             commit: async (message) => this.commit(message),
             refresh: async () => this.refresh(),
             getState: () => this.getAppState(),
@@ -514,8 +586,8 @@ export class App {
     }
     getAppState() {
         const state = this.uiState.state;
-        const gitState = this.gitManager?.state;
-        const historyState = this.gitManager?.historyState;
+        const gitState = this.gitManager?.workingTree.state;
+        const historyState = this.gitManager?.history.historyState;
         const files = gitState?.status?.files ?? [];
         const commits = historyState?.commits ?? [];
         return {
@@ -542,486 +614,11 @@ export class App {
             autoTabEnabled: state.autoTabEnabled,
         };
     }
-    // Navigation methods
-    /**
-     * Scroll the content pane (diff or explorer file content) by delta lines.
-     */
-    scrollActiveDiffPane(delta) {
-        const state = this.uiState.state;
-        if (state.bottomTab === 'explorer') {
-            const newOffset = Math.max(0, state.explorerFileScrollOffset + delta);
-            this.uiState.setExplorerFileScrollOffset(newOffset);
-        }
-        else {
-            const newOffset = Math.max(0, state.diffScrollOffset + delta);
-            this.uiState.setDiffScrollOffset(newOffset);
-        }
-    }
-    /**
-     * Navigate the file list by one item and keep selection visible.
-     */
-    navigateFileList(direction) {
-        const state = this.uiState.state;
-        const files = this.gitManager?.state.status?.files ?? [];
-        // Determine max index based on view mode
-        const maxIndex = state.flatViewMode ? this.cachedFlatFiles.length - 1 : files.length - 1;
-        if (maxIndex < 0)
-            return;
-        const newIndex = direction === -1
-            ? Math.max(0, state.selectedIndex - 1)
-            : Math.min(maxIndex, state.selectedIndex + 1);
-        this.uiState.setSelectedIndex(newIndex);
-        this.selectFileByIndex(newIndex);
-        // In flat mode row === index + 1 (header row); in categorized mode account for headers/spacers
-        const row = state.flatViewMode ? newIndex + 1 : getRowFromFileIndex(newIndex, files);
-        this.scrollToKeepRowVisible(row, direction, state.fileListScrollOffset);
-    }
-    /**
-     * Scroll the file list to keep a given row visible.
-     */
-    scrollToKeepRowVisible(row, direction, currentOffset) {
-        if (direction === -1 && row < currentOffset) {
-            this.uiState.setFileListScrollOffset(row);
-        }
-        else if (direction === 1) {
-            const visibleEnd = currentOffset + this.layout.dimensions.topPaneHeight - 1;
-            if (row >= visibleEnd) {
-                this.uiState.setFileListScrollOffset(currentOffset + (row - visibleEnd + 1));
-            }
-        }
-    }
-    /**
-     * Navigate the active list pane by one item in the given direction.
-     */
-    navigateActiveList(direction) {
-        const tab = this.uiState.state.bottomTab;
-        if (tab === 'history') {
-            if (direction === -1)
-                this.navigateHistoryUp();
-            else
-                this.navigateHistoryDown();
-        }
-        else if (tab === 'compare') {
-            if (direction === -1)
-                this.navigateCompareUp();
-            else
-                this.navigateCompareDown();
-        }
-        else if (tab === 'explorer') {
-            if (direction === -1)
-                this.navigateExplorerUp();
-            else
-                this.navigateExplorerDown();
-        }
-        else {
-            this.navigateFileList(direction);
-        }
-    }
-    navigateUp() {
-        const state = this.uiState.state;
-        const isListPane = state.currentPane !== 'diff';
-        if (isListPane) {
-            this.navigateActiveList(-1);
-        }
-        else {
-            this.scrollActiveDiffPane(-3);
-        }
-    }
-    navigateDown() {
-        const state = this.uiState.state;
-        const isListPane = state.currentPane !== 'diff';
-        if (isListPane) {
-            this.navigateActiveList(1);
-        }
-        else {
-            this.scrollActiveDiffPane(3);
-        }
-    }
-    navigateHistoryUp() {
-        const state = this.uiState.state;
-        const newIndex = Math.max(0, state.historySelectedIndex - 1);
-        if (newIndex !== state.historySelectedIndex) {
-            this.uiState.setHistorySelectedIndex(newIndex);
-            // Keep selection visible
-            if (newIndex < state.historyScrollOffset) {
-                this.uiState.setHistoryScrollOffset(newIndex);
-            }
-            this.selectHistoryCommitByIndex(newIndex);
-        }
-    }
-    navigateHistoryDown() {
-        const state = this.uiState.state;
-        const commits = this.gitManager?.historyState.commits ?? [];
-        const newIndex = Math.min(commits.length - 1, state.historySelectedIndex + 1);
-        if (newIndex !== state.historySelectedIndex) {
-            this.uiState.setHistorySelectedIndex(newIndex);
-            // Keep selection visible
-            const visibleEnd = state.historyScrollOffset + this.layout.dimensions.topPaneHeight - 1;
-            if (newIndex >= visibleEnd) {
-                this.uiState.setHistoryScrollOffset(state.historyScrollOffset + 1);
-            }
-            this.selectHistoryCommitByIndex(newIndex);
-        }
-    }
-    selectHistoryCommitByIndex(index) {
-        const commits = this.gitManager?.historyState.commits ?? [];
-        const commit = getCommitAtIndex(commits, index);
-        if (commit) {
-            this.uiState.setDiffScrollOffset(0);
-            this.gitManager?.selectHistoryCommit(commit);
-        }
-    }
-    // Compare navigation
-    compareSelection = null;
-    navigateCompareUp() {
-        const compareState = this.gitManager?.compareState;
-        const commits = compareState?.compareDiff?.commits ?? [];
-        const files = compareState?.compareDiff?.files ?? [];
-        if (commits.length === 0 && files.length === 0)
-            return;
-        const next = getNextCompareSelection(this.compareSelection, commits, files, 'up');
-        if (next &&
-            (next.type !== this.compareSelection?.type || next.index !== this.compareSelection?.index)) {
-            this.selectCompareItem(next);
-            // Keep selection visible - scroll up if needed
-            const state = this.uiState.state;
-            const row = getRowFromCompareSelection(next, commits, files);
-            if (row < state.compareScrollOffset) {
-                this.uiState.setCompareScrollOffset(row);
-            }
-        }
-    }
-    navigateCompareDown() {
-        const compareState = this.gitManager?.compareState;
-        const commits = compareState?.compareDiff?.commits ?? [];
-        const files = compareState?.compareDiff?.files ?? [];
-        if (commits.length === 0 && files.length === 0)
-            return;
-        // Auto-select first item if nothing selected
-        if (!this.compareSelection) {
-            // Select first commit if available, otherwise first file
-            if (commits.length > 0) {
-                this.selectCompareItem({ type: 'commit', index: 0 });
-            }
-            else if (files.length > 0) {
-                this.selectCompareItem({ type: 'file', index: 0 });
-            }
-            return;
-        }
-        const next = getNextCompareSelection(this.compareSelection, commits, files, 'down');
-        if (next &&
-            (next.type !== this.compareSelection?.type || next.index !== this.compareSelection?.index)) {
-            this.selectCompareItem(next);
-            // Keep selection visible - scroll down if needed
-            const state = this.uiState.state;
-            const row = getRowFromCompareSelection(next, commits, files);
-            const visibleEnd = state.compareScrollOffset + this.layout.dimensions.topPaneHeight - 1;
-            if (row >= visibleEnd) {
-                this.uiState.setCompareScrollOffset(state.compareScrollOffset + (row - visibleEnd + 1));
-            }
-        }
-    }
-    selectCompareItem(selection) {
-        this.compareSelection = selection;
-        this.uiState.setDiffScrollOffset(0);
-        if (selection.type === 'commit') {
-            this.gitManager?.selectCompareCommit(selection.index);
-        }
-        else {
-            this.gitManager?.selectCompareFile(selection.index);
-        }
-    }
-    // Explorer navigation
-    navigateExplorerUp() {
-        const state = this.uiState.state;
-        const rows = this.explorerManager?.state.displayRows ?? [];
-        if (rows.length === 0)
-            return;
-        const newScrollOffset = this.explorerManager?.navigateUp(state.explorerScrollOffset);
-        if (newScrollOffset !== null && newScrollOffset !== undefined) {
-            this.uiState.setExplorerScrollOffset(newScrollOffset);
-        }
-        this.uiState.setExplorerSelectedIndex(this.explorerManager?.state.selectedIndex ?? 0);
-    }
-    navigateExplorerDown() {
-        const state = this.uiState.state;
-        const rows = this.explorerManager?.state.displayRows ?? [];
-        if (rows.length === 0)
-            return;
-        const visibleHeight = this.layout.dimensions.topPaneHeight;
-        const newScrollOffset = this.explorerManager?.navigateDown(state.explorerScrollOffset, visibleHeight);
-        if (newScrollOffset !== null && newScrollOffset !== undefined) {
-            this.uiState.setExplorerScrollOffset(newScrollOffset);
-        }
-        this.uiState.setExplorerSelectedIndex(this.explorerManager?.state.selectedIndex ?? 0);
-    }
-    async enterExplorerDirectory() {
-        await this.explorerManager?.enterDirectory();
-        // Reset file content scroll when expanding/collapsing
-        this.uiState.setExplorerFileScrollOffset(0);
-        // Sync selected index from explorer manager (it maintains selection by path)
-        this.uiState.setExplorerSelectedIndex(this.explorerManager?.state.selectedIndex ?? 0);
-    }
-    async goExplorerUp() {
-        await this.explorerManager?.goUp();
-        // Reset file content scroll when collapsing
-        this.uiState.setExplorerFileScrollOffset(0);
-        // Sync selected index from explorer manager
-        this.uiState.setExplorerSelectedIndex(this.explorerManager?.state.selectedIndex ?? 0);
-    }
-    selectFileByIndex(index) {
-        if (this.uiState.state.flatViewMode) {
-            const flatEntry = getFlatFileAtIndex(this.cachedFlatFiles, index);
-            if (flatEntry) {
-                // Prefer unstaged entry (shows unstaged diff for partial files), fallback to staged
-                const file = flatEntry.unstagedEntry ?? flatEntry.stagedEntry;
-                if (file) {
-                    this.uiState.setDiffScrollOffset(0);
-                    this.uiState.setSelectedHunkIndex(0);
-                    this.gitManager?.selectFile(file);
-                }
-            }
-        }
-        else {
-            const files = this.gitManager?.state.status?.files ?? [];
-            const file = getFileAtIndex(files, index);
-            if (file) {
-                this.uiState.setDiffScrollOffset(0);
-                this.uiState.setSelectedHunkIndex(0);
-                this.gitManager?.selectFile(file);
-            }
-        }
-    }
-    /**
-     * Navigate to a file given its absolute path.
-     * Extracts the relative path and finds the file in the current file list.
-     */
-    navigateToFile(absolutePath) {
-        if (!absolutePath || !this.repoPath)
-            return;
-        // Check if the path is within the current repo
-        const repoPrefix = this.repoPath.endsWith('/') ? this.repoPath : this.repoPath + '/';
-        if (!absolutePath.startsWith(repoPrefix))
-            return;
-        // Extract relative path
-        const relativePath = absolutePath.slice(repoPrefix.length);
-        if (!relativePath)
-            return;
-        // Find the file in the list
-        const files = this.gitManager?.state.status?.files ?? [];
-        const fileIndex = files.findIndex((f) => f.path === relativePath);
-        if (fileIndex >= 0) {
-            this.uiState.setSelectedIndex(fileIndex);
-            this.selectFileByIndex(fileIndex);
-        }
-    }
-    // Git operations
-    async stageSelected() {
-        const files = this.gitManager?.state.status?.files ?? [];
-        const index = this.uiState.state.selectedIndex;
-        if (this.uiState.state.flatViewMode) {
-            const flatEntry = getFlatFileAtIndex(this.cachedFlatFiles, index);
-            if (!flatEntry)
-                return;
-            // Stage: operate on the unstaged entry if available
-            const file = flatEntry.unstagedEntry;
-            if (file) {
-                this.pendingFlatSelectionPath = flatEntry.path;
-                await this.gitManager?.stage(file);
-            }
-        }
-        else {
-            const selectedFile = getFileAtIndex(files, index);
-            if (selectedFile && !selectedFile.staged) {
-                this.pendingSelectionAnchor = getCategoryForIndex(files, index);
-                await this.gitManager?.stage(selectedFile);
-            }
-        }
-    }
-    async unstageSelected() {
-        const files = this.gitManager?.state.status?.files ?? [];
-        const index = this.uiState.state.selectedIndex;
-        if (this.uiState.state.flatViewMode) {
-            const flatEntry = getFlatFileAtIndex(this.cachedFlatFiles, index);
-            if (!flatEntry)
-                return;
-            const file = flatEntry.stagedEntry;
-            if (file) {
-                this.pendingFlatSelectionPath = flatEntry.path;
-                await this.gitManager?.unstage(file);
-            }
-        }
-        else {
-            const selectedFile = getFileAtIndex(files, index);
-            if (selectedFile?.staged) {
-                this.pendingSelectionAnchor = getCategoryForIndex(files, index);
-                await this.gitManager?.unstage(selectedFile);
-            }
-        }
-    }
-    async toggleSelected() {
-        const index = this.uiState.state.selectedIndex;
-        if (this.uiState.state.flatViewMode) {
-            const flatEntry = getFlatFileAtIndex(this.cachedFlatFiles, index);
-            if (flatEntry)
-                await this.toggleFlatEntry(flatEntry);
-        }
-        else {
-            const files = this.gitManager?.state.status?.files ?? [];
-            const selectedFile = getFileAtIndex(files, index);
-            if (selectedFile) {
-                this.pendingSelectionAnchor = getCategoryForIndex(files, index);
-                if (selectedFile.staged) {
-                    await this.gitManager?.unstage(selectedFile);
-                }
-                else {
-                    await this.gitManager?.stage(selectedFile);
-                }
-            }
-        }
-    }
-    async stageAll() {
-        await this.gitManager?.stageAll();
-    }
-    async unstageAll() {
-        await this.gitManager?.unstageAll();
-    }
-    showDiscardConfirm(file) {
-        this.activeModal = new DiscardConfirm(this.screen, file.path, async () => {
-            this.activeModal = null;
-            await this.gitManager?.discard(file);
-        }, () => {
-            this.activeModal = null;
-        });
-        this.activeModal.focus();
-    }
-    // Hunk navigation and staging
-    navigateNextHunk() {
-        const current = this.uiState.state.selectedHunkIndex;
-        if (this.bottomPaneHunkCount > 0 && current < this.bottomPaneHunkCount - 1) {
-            this.uiState.setSelectedHunkIndex(current + 1);
-            this.scrollHunkIntoView(current + 1);
-        }
-    }
-    navigatePrevHunk() {
-        const current = this.uiState.state.selectedHunkIndex;
-        if (current > 0) {
-            this.uiState.setSelectedHunkIndex(current - 1);
-            this.scrollHunkIntoView(current - 1);
-        }
-    }
-    scrollHunkIntoView(hunkIndex) {
-        const boundary = this.bottomPaneHunkBoundaries[hunkIndex];
-        if (!boundary)
-            return;
-        const scrollOffset = this.uiState.state.diffScrollOffset;
-        const visibleHeight = this.layout.dimensions.bottomPaneHeight;
-        // If hunk header is outside the visible area, scroll so it's at top
-        if (boundary.startRow < scrollOffset || boundary.startRow >= scrollOffset + visibleHeight) {
-            this.uiState.setDiffScrollOffset(boundary.startRow);
-        }
-    }
-    selectHunkAtRow(visualRow) {
-        if (this.uiState.state.bottomTab !== 'diff')
-            return;
-        if (this.bottomPaneHunkBoundaries.length === 0)
-            return;
-        // Focus the diff pane so the hunk gutter appears
-        this.uiState.setPane('diff');
-        const absoluteRow = this.uiState.state.diffScrollOffset + visualRow;
-        for (let i = 0; i < this.bottomPaneHunkBoundaries.length; i++) {
-            const b = this.bottomPaneHunkBoundaries[i];
-            if (absoluteRow >= b.startRow && absoluteRow < b.endRow) {
-                this.uiState.setSelectedHunkIndex(i);
-                return;
-            }
-        }
-    }
-    async toggleCurrentHunk() {
-        const selectedFile = this.gitManager?.state.selectedFile;
-        if (!selectedFile || selectedFile.status === 'untracked')
-            return;
-        if (this.uiState.state.flatViewMode) {
-            await this.toggleCurrentHunkFlat();
-        }
-        else {
-            await this.toggleCurrentHunkCategorized(selectedFile);
-        }
-    }
-    async toggleCurrentHunkFlat() {
-        const mapping = this.combinedHunkMapping[this.uiState.state.selectedHunkIndex];
-        if (!mapping)
-            return;
-        const combined = this.gitManager?.state.combinedFileDiffs;
-        if (!combined)
-            return;
-        const rawDiff = mapping.source === 'unstaged' ? combined.unstaged.raw : combined.staged.raw;
-        const patch = extractHunkPatch(rawDiff, mapping.hunkIndex);
-        if (!patch)
-            return;
-        // Preserve hunk index across refresh — file stays selected via path-only fallback
-        this.pendingHunkIndex = this.uiState.state.selectedHunkIndex;
-        if (mapping.source === 'staged') {
-            await this.gitManager?.unstageHunk(patch);
-        }
-        else {
-            await this.gitManager?.stageHunk(patch);
-        }
-    }
-    async toggleCurrentHunkCategorized(selectedFile) {
-        const rawDiff = this.gitManager?.state.diff?.raw;
-        if (!rawDiff)
-            return;
-        const patch = extractHunkPatch(rawDiff, this.uiState.state.selectedHunkIndex);
-        if (!patch)
-            return;
-        const files = this.gitManager?.state.status?.files ?? [];
-        this.pendingSelectionAnchor = getCategoryForIndex(files, this.uiState.state.selectedIndex);
-        if (selectedFile.staged) {
-            await this.gitManager?.unstageHunk(patch);
-        }
-        else {
-            await this.gitManager?.stageHunk(patch);
-        }
-    }
-    async openFileFinder() {
-        const allPaths = (await this.explorerManager?.getAllFilePaths()) ?? [];
-        if (allPaths.length === 0)
-            return;
-        this.activeModal = new FileFinder(this.screen, allPaths, async (selectedPath) => {
-            this.activeModal = null;
-            // Switch to explorer tab if not already there
-            if (this.uiState.state.bottomTab !== 'explorer') {
-                this.uiState.setTab('explorer');
-            }
-            // Navigate to the selected file in explorer
-            const success = await this.explorerManager?.navigateToPath(selectedPath);
-            if (success) {
-                // Sync selected index from explorer manager
-                const selectedIndex = this.explorerManager?.state.selectedIndex ?? 0;
-                this.uiState.setExplorerSelectedIndex(selectedIndex);
-                this.uiState.setExplorerFileScrollOffset(0);
-                // Scroll to make selected file visible
-                const visibleHeight = this.layout.dimensions.topPaneHeight;
-                if (selectedIndex >= visibleHeight) {
-                    this.uiState.setExplorerScrollOffset(selectedIndex - Math.floor(visibleHeight / 2));
-                }
-                else {
-                    this.uiState.setExplorerScrollOffset(0);
-                }
-            }
-            this.render();
-        }, () => {
-            this.activeModal = null;
-            this.render();
-        });
-        this.activeModal.focus();
-    }
     async commit(message) {
-        await this.gitManager?.commit(message);
+        await this.gitManager?.workingTree.commit(message);
     }
     async refresh() {
-        await this.gitManager?.refresh();
+        await this.gitManager?.workingTree.refresh();
     }
     toggleMouseMode() {
         const willEnable = !this.uiState.state.mouseEnabled;
@@ -1036,6 +633,29 @@ export class App {
             program.disableMouse();
         }
     }
+    /**
+     * When auto-tab is enabled, switch tabs based on file count transitions:
+     * - Files disappear (prev > 0, current === 0): switch to history
+     * - Files appear (prev === 0, current > 0): switch to diff
+     * Always updates prevFileCount so enabling doesn't trigger on stale state.
+     */
+    applyAutoTab() {
+        const files = this.gitManager?.workingTree.state.status?.files ?? [];
+        const currentCount = files.length;
+        const prev = this.prevFileCount;
+        this.prevFileCount = currentCount;
+        if (!this.uiState.state.autoTabEnabled)
+            return;
+        const tab = this.uiState.state.bottomTab;
+        if (prev > 0 && currentCount === 0 && (tab === 'diff' || tab === 'commit')) {
+            this.uiState.setHistorySelectedIndex(0);
+            this.uiState.setHistoryScrollOffset(0);
+            this.uiState.setTab('history');
+        }
+        else if (prev === 0 && currentCount > 0 && tab === 'history') {
+            this.uiState.setTab('diff');
+        }
+    }
     toggleFollow() {
         if (!this.followMode) {
             this.followMode = new FollowMode(this.config.targetFile, () => this.repoPath, {
@@ -1071,44 +691,56 @@ export class App {
         this.updateTopPane();
         this.updateBottomPane();
         // Restore hunk index after diff refresh (e.g. after hunk toggle in flat mode)
-        if (this.pendingHunkIndex !== null && this.bottomPaneHunkCount > 0) {
-            const restored = Math.min(this.pendingHunkIndex, this.bottomPaneHunkCount - 1);
-            this.pendingHunkIndex = null;
+        const pendingHunk = this.staging.consumePendingHunkIndex();
+        if (pendingHunk !== null && this.bottomPaneHunkCount > 0) {
+            const restored = Math.min(pendingHunk, this.bottomPaneHunkCount - 1);
             this.uiState.setSelectedHunkIndex(restored);
             this.updateBottomPane(); // Re-render with correct hunk selection
         }
+        this.updateSeparators();
         this.updateFooter();
         this.screen.render();
     }
+    updateSeparators() {
+        const zone = this.uiState.state.focusedZone;
+        // Top-pane zones: fileList, historyList, compareList, explorerTree
+        const isTopPaneZone = zone === 'fileList' ||
+            zone === 'historyList' ||
+            zone === 'compareList' ||
+            zone === 'explorerTree';
+        this.layout.middleSeparator.style.fg = isTopPaneZone ? 'cyan' : 'gray';
+    }
     updateHeader() {
-        const gitState = this.gitManager?.state;
+        const gitState = this.gitManager?.workingTree.state;
         const width = this.screen.width || 80;
-        const content = formatHeader(this.repoPath, gitState?.status?.branch ?? null, gitState?.isLoading ?? false, gitState?.error ?? null, width);
+        const content = formatHeader(this.repoPath, gitState?.status?.branch ?? null, gitState?.isLoading ?? false, gitState?.error ?? null, width, this.gitManager?.remote.remoteState ?? null);
         this.layout.headerBox.setContent(content);
     }
     updateTopPane() {
         const state = this.uiState.state;
         const width = this.screen.width || 80;
-        const files = this.gitManager?.state.status?.files ?? [];
+        const files = this.gitManager?.workingTree.state.status?.files ?? [];
         // Build and cache flat file list when in flat mode
         if (state.flatViewMode) {
-            this.cachedFlatFiles = buildFlatFileList(files, this.gitManager?.state.hunkCounts ?? null);
+            this.cachedFlatFiles = buildFlatFileList(files, this.gitManager?.workingTree.state.hunkCounts ?? null);
         }
-        const content = renderTopPane(state, files, this.gitManager?.historyState?.commits ?? [], this.gitManager?.compareState?.compareDiff ?? null, this.compareSelection, this.explorerManager?.state, width, this.layout.dimensions.topPaneHeight, this.gitManager?.state.hunkCounts, state.flatViewMode ? this.cachedFlatFiles : undefined);
+        const content = renderTopPane(state, files, this.gitManager?.history.historyState?.commits ?? [], this.gitManager?.compare.compareState?.compareDiff ?? null, this.navigation.compareSelection, this.explorerManager?.state, width, this.layout.dimensions.topPaneHeight, this.gitManager?.workingTree.state.hunkCounts, state.flatViewMode ? this.cachedFlatFiles : undefined);
         this.layout.topPane.setContent(content);
     }
     updateBottomPane() {
         const state = this.uiState.state;
         const width = this.screen.width || 80;
-        const files = this.gitManager?.state.status?.files ?? [];
+        const files = this.gitManager?.workingTree.state.status?.files ?? [];
         const stagedCount = files.filter((f) => f.staged).length;
         // Update staged count for commit validation
         this.commitFlowState.setStagedCount(stagedCount);
         // Pass selectedHunkIndex and staged status only when diff pane is focused on diff tab
         const diffPaneFocused = state.bottomTab === 'diff' && state.currentPane === 'diff';
         const hunkIndex = diffPaneFocused ? state.selectedHunkIndex : undefined;
-        const isFileStaged = diffPaneFocused ? this.gitManager?.state.selectedFile?.staged : undefined;
-        const { content, totalRows, hunkCount, hunkBoundaries, hunkMapping } = renderBottomPane(state, this.gitManager?.state.diff ?? null, this.gitManager?.historyState, this.gitManager?.compareSelectionState, this.explorerManager?.state?.selectedFile ?? null, this.commitFlowState.state, stagedCount, this.currentTheme, width, this.layout.dimensions.bottomPaneHeight, hunkIndex, isFileStaged, state.flatViewMode ? this.gitManager?.state.combinedFileDiffs : undefined);
+        const isFileStaged = diffPaneFocused
+            ? this.gitManager?.workingTree.state.selectedFile?.staged
+            : undefined;
+        const { content, totalRows, hunkCount, hunkBoundaries, hunkMapping } = renderBottomPane(state, this.gitManager?.workingTree.state.diff ?? null, this.gitManager?.history.historyState, this.gitManager?.compare.compareSelectionState, this.explorerManager?.state?.selectedFile ?? null, this.commitFlowState.state, stagedCount, this.currentTheme, width, this.layout.dimensions.bottomPaneHeight, hunkIndex, isFileStaged, state.flatViewMode ? this.gitManager?.workingTree.state.combinedFileDiffs : undefined, state.focusedZone);
         this.bottomPaneTotalRows = totalRows;
         this.bottomPaneHunkCount = hunkCount;
         this.bottomPaneHunkBoundaries = hunkBoundaries;
@@ -1149,6 +781,9 @@ export class App {
         if (this.commandServer) {
             this.commandServer.stop();
         }
+        if (this.remoteClearTimer) {
+            clearTimeout(this.remoteClearTimer);
+        }
         // Destroy screen (this will clean up terminal)
         this.screen.destroy();
     }