diffstalker 0.2.3 → 0.2.4

package/dist/KeyBindings.js

@@ -1,12 +1,17 @@
 import { SPLIT_RATIO_STEP } from './ui/Layout.js';
-import { getFileAtIndex } from './ui/widgets/FileList.js';
-import { getFlatFileAtIndex } from './utils/flatFileList.js';
 /**
  * Register all keyboard bindings on the blessed screen.
  */
 export function setupKeyBindings(screen, actions, ctx) {
-    // Quit
-    screen.key(['q', 'C-c'], () => {
+    // Quit: q closes modal if open, Ctrl+C always exits
+    screen.key(['q'], () => {
+        if (ctx.hasActiveModal()) {
+            actions.closeActiveModal();
+            return;
+        }
+        actions.exit();
+    });
+    screen.key(['C-c'], () => {
         actions.exit();
     });
     // Navigation (skip if modal is open)
@@ -35,11 +40,16 @@ export function setupKeyBindings(screen, actions, ctx) {
             ctx.uiState.setTab(tab);
         });
     }
-    // Pane toggle (skip if modal is open)
+    // Focus zone cycling (skip if modal or commit input is active)
     screen.key(['tab'], () => {
-        if (ctx.hasActiveModal())
+        if (ctx.hasActiveModal() || ctx.isCommitInputFocused())
             return;
-        ctx.uiState.togglePane();
+        ctx.uiState.advanceFocus();
+    });
+    screen.key(['S-tab'], () => {
+        if (ctx.hasActiveModal() || ctx.isCommitInputFocused())
+            return;
+        ctx.uiState.retreatFocus();
     });
     // Staging operations (skip if modal is open)
     // Context-aware: hunk staging when diff pane is focused on diff tab
@@ -72,6 +82,17 @@ export function setupKeyBindings(screen, actions, ctx) {
     screen.key(['enter', 'space'], () => {
         if (ctx.hasActiveModal())
             return;
+        const zone = ctx.getFocusedZone();
+        // Zone-aware dispatch for commit panel elements
+        if (zone === 'commitMessage' && !ctx.isCommitInputFocused()) {
+            actions.focusCommitInput();
+            return;
+        }
+        if (zone === 'commitAmend') {
+            ctx.commitFlowState.toggleAmend();
+            actions.render();
+            return;
+        }
         if (ctx.getBottomTab() === 'explorer' && ctx.getCurrentPane() === 'explorer') {
             actions.enterExplorerDirectory();
         }
@@ -122,6 +143,8 @@ export function setupKeyBindings(screen, actions, ctx) {
         }
     });
     screen.key(['a'], () => {
+        if (ctx.hasActiveModal())
+            return;
         if (ctx.getBottomTab() === 'commit' && !ctx.isCommitInputFocused()) {
             ctx.commitFlowState.toggleAmend();
             actions.render();
@@ -137,23 +160,12 @@ export function setupKeyBindings(screen, actions, ctx) {
             actions.render();
         }
     });
-    // Remote operations (global, any tab)
-    screen.key(['S-p'], () => {
-        if (ctx.hasActiveModal() || ctx.isCommitInputFocused() || ctx.isRemoteInProgress())
-            return;
-        actions.push();
-    });
-    screen.key(['S-f'], () => {
-        if (ctx.hasActiveModal() || ctx.isCommitInputFocused() || ctx.isRemoteInProgress())
-            return;
-        actions.fetchRemote();
-    });
-    screen.key(['S-r'], () => {
-        if (ctx.hasActiveModal() || ctx.isCommitInputFocused() || ctx.isRemoteInProgress())
-            return;
-        actions.pullRebase();
-    });
+    // Escape: close modal first, then commit-tab escape logic
     screen.key(['escape'], () => {
+        if (ctx.hasActiveModal()) {
+            actions.closeActiveModal();
+            return;
+        }
         if (ctx.getBottomTab() === 'commit') {
             if (ctx.isCommitInputFocused()) {
                 actions.unfocusCommitInput();
@@ -163,12 +175,32 @@ export function setupKeyBindings(screen, actions, ctx) {
             }
         }
     });
-    // Refresh
-    screen.key(['r'], () => actions.refresh());
-    // Display toggles
-    screen.key(['w'], () => ctx.uiState.toggleWrapMode());
-    screen.key(['m'], () => actions.toggleMouseMode());
-    screen.key(['S-t'], () => ctx.uiState.toggleAutoTab());
+    // Repo picker (toggle)
+    screen.key(['r'], () => {
+        if (ctx.getActiveModalType() === 'repoPicker') {
+            actions.closeActiveModal();
+            return;
+        }
+        if (ctx.hasActiveModal())
+            return;
+        actions.openRepoPicker();
+    });
+    // Display toggles (guarded)
+    screen.key(['w'], () => {
+        if (ctx.hasActiveModal())
+            return;
+        ctx.uiState.toggleWrapMode();
+    });
+    screen.key(['m'], () => {
+        if (ctx.hasActiveModal())
+            return;
+        actions.toggleMouseMode();
+    });
+    screen.key(['S-t'], () => {
+        if (ctx.hasActiveModal())
+            return;
+        ctx.uiState.toggleAutoTab();
+    });
     // Split ratio adjustments
     screen.key(['-', '_', '['], () => {
         ctx.uiState.adjustSplitRatio(-SPLIT_RATIO_STEP);
@@ -180,21 +212,42 @@ export function setupKeyBindings(screen, actions, ctx) {
         ctx.layout.setSplitRatio(ctx.uiState.state.splitRatio);
         actions.render();
     });
-    // Theme picker
-    screen.key(['t'], () => ctx.uiState.openModal('theme'));
-    // Hotkeys modal
-    screen.key(['?'], () => ctx.uiState.toggleModal('hotkeys'));
-    // Follow toggle
-    screen.key(['f'], () => actions.toggleFollow());
-    // Compare view: base branch picker / Commit tab: branch picker
+    // Theme picker (toggle)
+    screen.key(['t'], () => {
+        if (ctx.getActiveModalType() === 'theme') {
+            actions.closeActiveModal();
+            return;
+        }
+        if (ctx.hasActiveModal())
+            return;
+        actions.openThemePicker();
+    });
+    // Hotkeys modal (toggle)
+    screen.key(['?'], () => {
+        if (ctx.getActiveModalType() === 'hotkeys') {
+            actions.closeActiveModal();
+            return;
+        }
+        if (ctx.hasActiveModal())
+            return;
+        actions.openHotkeysModal();
+    });
+    // Follow toggle (guarded)
+    screen.key(['f'], () => {
+        if (ctx.hasActiveModal())
+            return;
+        actions.toggleFollow();
+    });
+    // Compare view: base branch picker (toggle)
     screen.key(['b'], () => {
-        if (ctx.hasActiveModal() || ctx.isCommitInputFocused())
+        if (ctx.getActiveModalType() === 'baseBranch') {
+            actions.closeActiveModal();
             return;
-        if (ctx.getBottomTab() === 'compare') {
-            ctx.uiState.openModal('baseBranch');
         }
-        else if (ctx.getBottomTab() === 'commit') {
-            actions.openBranchPicker();
+        if (ctx.hasActiveModal())
+            return;
+        if (ctx.getBottomTab() === 'compare') {
+            actions.openBaseBranchPicker();
         }
     });
     // u: toggle uncommitted in compare view
@@ -204,7 +257,7 @@ export function setupKeyBindings(screen, actions, ctx) {
         if (ctx.getBottomTab() === 'compare') {
             ctx.uiState.toggleIncludeUncommitted();
             const includeUncommitted = ctx.uiState.state.includeUncommitted;
-            ctx.getGitManager()?.refreshCompareDiff(includeUncommitted);
+            ctx.getGitManager()?.compare.refreshCompareDiff(includeUncommitted);
         }
     });
     // Toggle flat file view (diff/commit tab only)
@@ -216,25 +269,14 @@ export function setupKeyBindings(screen, actions, ctx) {
             ctx.uiState.toggleFlatViewMode();
         }
     });
-    // Discard changes (with confirmation)
+    // Discard changes (with confirmation, guarded)
     screen.key(['d'], () => {
+        if (ctx.hasActiveModal())
+            return;
         if (ctx.getBottomTab() === 'diff') {
-            if (ctx.uiState.state.flatViewMode) {
-                const flatEntry = getFlatFileAtIndex(ctx.getCachedFlatFiles(), ctx.getSelectedIndex());
-                if (flatEntry?.unstagedEntry) {
-                    const file = flatEntry.unstagedEntry;
-                    if (file.status !== 'untracked') {
-                        actions.showDiscardConfirm(file);
-                    }
-                }
-            }
-            else {
-                const files = ctx.getStatusFiles();
-                const selectedFile = getFileAtIndex(files, ctx.getSelectedIndex());
-                // Only allow discard for unstaged modified files
-                if (selectedFile && !selectedFile.staged && selectedFile.status !== 'untracked') {
-                    actions.showDiscardConfirm(selectedFile);
-                }
+            const file = ctx.resolveFileAtIndex(ctx.getSelectedIndex());
+            if (file && !file.staged && file.status !== 'untracked') {
+                actions.openDiscardConfirm(file);
             }
         }
     });
@@ -253,42 +295,12 @@ export function setupKeyBindings(screen, actions, ctx) {
             actions.navigatePrevHunk();
         }
     });
-    // Stash: save (global)
-    screen.key(['S-s'], () => {
-        if (ctx.hasActiveModal() || ctx.isCommitInputFocused() || ctx.isRemoteInProgress())
-            return;
-        actions.stash();
-    });
-    // Stash: pop (commit tab only)
-    screen.key(['o'], () => {
-        if (ctx.hasActiveModal() || ctx.isCommitInputFocused())
-            return;
-        if (ctx.getBottomTab() === 'commit') {
-            actions.stashPop();
-        }
-    });
-    // Stash: list modal (commit tab only)
-    screen.key(['l'], () => {
-        if (ctx.hasActiveModal() || ctx.isCommitInputFocused())
-            return;
-        if (ctx.getBottomTab() === 'commit') {
-            actions.openStashListModal();
-        }
-    });
-    // Soft reset HEAD~1 (commit tab only)
-    screen.key(['S-x'], () => {
-        if (ctx.hasActiveModal() || ctx.isCommitInputFocused() || ctx.isRemoteInProgress())
-            return;
-        if (ctx.getBottomTab() === 'commit') {
-            actions.showSoftResetConfirm();
-        }
-    });
     // Cherry-pick selected commit (history tab only)
     screen.key(['p'], () => {
         if (ctx.hasActiveModal() || ctx.isCommitInputFocused())
             return;
         if (ctx.getBottomTab() === 'history') {
-            actions.cherryPickSelected();
+            actions.openCherryPickConfirm();
         }
     });
     // Revert selected commit (history tab only)
@@ -296,7 +308,7 @@ export function setupKeyBindings(screen, actions, ctx) {
         if (ctx.hasActiveModal() || ctx.isCommitInputFocused())
             return;
         if (ctx.getBottomTab() === 'history') {
-            actions.revertSelected();
+            actions.openRevertConfirm();
         }
     });
 }

package/dist/ModalController.js

@@ -0,0 +1,166 @@
+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 { CommitActionConfirm } from './ui/modals/CommitActionConfirm.js';
+import { RepoPicker } from './ui/modals/RepoPicker.js';
+import { saveConfig } from './config.js';
+import * as logger from './utils/logger.js';
+/**
+ * Manages all modal dialogs: creation, focus, and dismissal.
+ * Single source of truth for modal state.
+ */
+export class ModalController {
+    ctx;
+    activeModal = null;
+    activeModalType = null;
+    constructor(ctx) {
+        this.ctx = ctx;
+    }
+    hasActiveModal() {
+        return this.activeModal !== null;
+    }
+    getActiveModalType() {
+        return this.activeModalType;
+    }
+    closeActiveModal() {
+        if (this.activeModal) {
+            this.activeModal.destroy();
+            this.activeModal = null;
+            this.activeModalType = null;
+            this.ctx.render();
+        }
+    }
+    clearModal() {
+        this.activeModal = null;
+        this.activeModalType = null;
+    }
+    openThemePicker() {
+        this.activeModalType = 'theme';
+        this.activeModal = new ThemePicker(this.ctx.screen, this.ctx.getCurrentTheme(), (theme) => {
+            this.ctx.setCurrentTheme(theme);
+            saveConfig({ theme });
+            this.clearModal();
+            this.ctx.render();
+        }, () => {
+            this.clearModal();
+        });
+        this.activeModal.focus();
+    }
+    openHotkeysModal() {
+        this.activeModalType = 'hotkeys';
+        this.activeModal = new HotkeysModal(this.ctx.screen, () => {
+            this.clearModal();
+        });
+        this.activeModal.focus();
+    }
+    openBaseBranchPicker() {
+        const gm = this.ctx.getGitManager();
+        if (!gm)
+            return;
+        this.activeModalType = 'baseBranch';
+        gm.compare
+            .getCandidateBaseBranches()
+            .then((branches) => {
+            const currentBranch = gm.compare.compareState.compareBaseBranch ?? null;
+            const modal = new BaseBranchPicker(this.ctx.screen, branches, currentBranch, (branch) => {
+                this.clearModal();
+                const includeUncommitted = this.ctx.uiState.state.includeUncommitted;
+                gm.compare.setCompareBaseBranch(branch, includeUncommitted);
+            }, () => {
+                this.clearModal();
+            });
+            this.activeModal = modal;
+            modal.focus();
+        })
+            .catch((err) => {
+            this.clearModal();
+            logger.error('Failed to load base branches', err);
+        });
+    }
+    openDiscardConfirm(file) {
+        this.activeModalType = 'discard';
+        this.activeModal = new DiscardConfirm(this.ctx.screen, file.path, async () => {
+            this.clearModal();
+            await this.ctx.getGitManager()?.workingTree.discard(file);
+        }, () => {
+            this.clearModal();
+        });
+        this.activeModal.focus();
+    }
+    async openFileFinder() {
+        const explorer = this.ctx.getExplorerManager();
+        let allPaths = explorer?.getCachedFilePaths() ?? [];
+        if (allPaths.length === 0) {
+            await explorer?.loadFilePaths();
+            allPaths = explorer?.getCachedFilePaths() ?? [];
+        }
+        if (allPaths.length === 0)
+            return;
+        this.activeModalType = 'fileFinder';
+        this.activeModal = new FileFinder(this.ctx.screen, allPaths, async (selectedPath) => {
+            this.clearModal();
+            if (this.ctx.uiState.state.bottomTab !== 'explorer') {
+                this.ctx.uiState.setTab('explorer');
+            }
+            const success = await explorer?.navigateToPath(selectedPath);
+            if (success) {
+                const selectedIndex = explorer?.state.selectedIndex ?? 0;
+                this.ctx.uiState.setExplorerSelectedIndex(selectedIndex);
+                this.ctx.uiState.setExplorerFileScrollOffset(0);
+                const visibleHeight = this.ctx.getTopPaneHeight();
+                if (selectedIndex >= visibleHeight) {
+                    this.ctx.uiState.setExplorerScrollOffset(selectedIndex - Math.floor(visibleHeight / 2));
+                }
+                else {
+                    this.ctx.uiState.setExplorerScrollOffset(0);
+                }
+            }
+            this.ctx.render();
+        }, () => {
+            this.clearModal();
+            this.ctx.render();
+        });
+        this.activeModal.focus();
+    }
+    openCherryPickConfirm() {
+        const commit = this.ctx.getGitManager()?.history.historyState.selectedCommit;
+        if (!commit)
+            return;
+        this.activeModalType = 'commitAction';
+        this.activeModal = new CommitActionConfirm(this.ctx.screen, 'Cherry-pick', commit, () => {
+            this.clearModal();
+            this.ctx.getGitManager()?.remote.cherryPick(commit.hash);
+        }, () => {
+            this.clearModal();
+        });
+        this.activeModal.focus();
+    }
+    openRevertConfirm() {
+        const commit = this.ctx.getGitManager()?.history.historyState.selectedCommit;
+        if (!commit)
+            return;
+        this.activeModalType = 'commitAction';
+        this.activeModal = new CommitActionConfirm(this.ctx.screen, 'Revert', commit, () => {
+            this.clearModal();
+            this.ctx.getGitManager()?.remote.revertCommit(commit.hash);
+        }, () => {
+            this.clearModal();
+        });
+        this.activeModal.focus();
+    }
+    openRepoPicker() {
+        const repos = this.ctx.getRecentRepos();
+        const currentRepo = this.ctx.getRepoPath();
+        this.activeModalType = 'repoPicker';
+        this.activeModal = new RepoPicker(this.ctx.screen, repos, currentRepo, (selected) => {
+            this.clearModal();
+            this.ctx.onRepoSwitch(selected);
+        }, () => {
+            this.clearModal();
+            this.ctx.render();
+        });
+        this.activeModal.focus();
+    }
+}

package/dist/MouseHandlers.js

@@ -1,3 +1,4 @@
+import { TAB_ZONES } from './state/UIState.js';
 import { getFileListTotalRows, getFileIndexFromRow } from './ui/widgets/FileList.js';
 import { getFlatFileListTotalRows } from './ui/widgets/FlatFileList.js';
 import { getCompareListTotalRows, getCompareSelectionFromRow, } from './ui/widgets/CompareListView.js';
@@ -22,7 +23,8 @@ export function setupMouseHandlers(layout, actions, ctx) {
     layout.bottomPane.on('wheelup', () => {
         handleBottomPaneScroll(-SCROLL_AMOUNT, layout, ctx);
     });
-    // Click on top pane to select item
+    // Click on top pane to select item (does NOT change focus zone —
+    // preserves diff pane focus so hunk staging with 's' keeps working)
     layout.topPane.on('click', (mouse) => {
         const clickedRow = layout.screenYToTopPaneRow(mouse.y);
         if (clickedRow >= 0) {
@@ -34,15 +36,13 @@ export function setupMouseHandlers(layout, actions, ctx) {
         const clickedRow = layout.screenYToBottomPaneRow(mouse.y);
         if (clickedRow >= 0) {
             if (ctx.uiState.state.bottomTab === 'commit') {
-                // Row 6 (0-indexed) is the amend checkbox row
-                if (clickedRow === 6) {
-                    actions.toggleAmend();
-                }
-                else {
-                    actions.focusCommitInput();
-                }
+                handleCommitPaneClick(clickedRow, actions, ctx);
             }
             else {
+                // Set focus to the bottom-pane zone for this tab
+                const zones = TAB_ZONES[ctx.uiState.state.bottomTab];
+                const bottomZone = zones[zones.length - 1];
+                ctx.uiState.setFocusedZone(bottomZone);
                 actions.selectHunkAtRow(clickedRow);
             }
         }
@@ -54,33 +54,40 @@ export function setupMouseHandlers(layout, actions, ctx) {
 }
 function handleFileListClick(row, x, actions, ctx) {
     const state = ctx.uiState.state;
+    // Row-to-index mapping differs between flat and categorized mode
+    let fileIndex;
     if (state.flatViewMode) {
         // Flat mode: row 0 is header, files start at row 1
         const absoluteRow = row + state.fileListScrollOffset;
-        const fileIndex = absoluteRow - 1; // subtract header row
+        const idx = absoluteRow - 1; // subtract header row
         const flatFiles = ctx.getCachedFlatFiles();
-        if (fileIndex < 0 || fileIndex >= flatFiles.length)
-            return;
-        if (x !== undefined && x >= 2 && x <= 4) {
-            actions.toggleFileByIndex(fileIndex);
-        }
-        else {
-            ctx.uiState.setSelectedIndex(fileIndex);
-            actions.selectFileByIndex(fileIndex);
-        }
+        fileIndex = idx >= 0 && idx < flatFiles.length ? idx : null;
     }
     else {
-        const files = ctx.getStatusFiles();
-        const fileIndex = getFileIndexFromRow(row + state.fileListScrollOffset, files);
-        if (fileIndex === null || fileIndex < 0)
-            return;
-        if (x !== undefined && x >= 2 && x <= 4) {
-            actions.toggleFileByIndex(fileIndex);
-        }
-        else {
-            ctx.uiState.setSelectedIndex(fileIndex);
-            actions.selectFileByIndex(fileIndex);
-        }
+        fileIndex = getFileIndexFromRow(row + state.fileListScrollOffset, ctx.getStatusFiles());
+    }
+    if (fileIndex === null || fileIndex < 0)
+        return;
+    if (x !== undefined && x >= 2 && x <= 4) {
+        actions.toggleFileByIndex(fileIndex);
+    }
+    else {
+        ctx.uiState.setSelectedIndex(fileIndex);
+        actions.selectFileByIndex(fileIndex);
+    }
+}
+function handleCommitPaneClick(row, actions, ctx) {
+    // Commit panel layout: rows 0-4 = title + message box, row 5 = blank, row 6 = amend
+    const absoluteRow = row + ctx.uiState.state.diffScrollOffset;
+    if (absoluteRow === 6) {
+        ctx.uiState.setFocusedZone('commitAmend');
+    }
+    else if (absoluteRow >= 2 && absoluteRow <= 4) {
+        ctx.uiState.setFocusedZone('commitMessage');
+        actions.focusCommitInput();
+    }
+    else {
+        ctx.uiState.setFocusedZone('commitMessage');
     }
 }
 function handleTopPaneClick(row, x, actions, ctx) {
@@ -151,7 +158,7 @@ function handleFooterClick(x, actions, ctx) {
         ctx.getExplorerManager()?.toggleShowOnlyChanges();
     }
     else if (x === 0) {
-        ctx.uiState.openModal('hotkeys');
+        actions.openHotkeysModal();
     }
 }
 function handleTopPaneScroll(delta, layout, ctx) {