diffstalker 0.2.1 → 0.2.3

package/dist/KeyBindings.js

@@ -1,5 +1,6 @@
 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.
  */
@@ -41,10 +42,16 @@ export function setupKeyBindings(screen, actions, ctx) {
         ctx.uiState.togglePane();
     });
     // Staging operations (skip if modal is open)
+    // Context-aware: hunk staging when diff pane is focused on diff tab
     screen.key(['s'], () => {
         if (ctx.hasActiveModal())
             return;
-        actions.stageSelected();
+        if (ctx.getBottomTab() === 'diff' && ctx.getCurrentPane() === 'diff') {
+            actions.toggleCurrentHunk();
+        }
+        else {
+            actions.stageSelected();
+        }
     });
     screen.key(['S-u'], () => {
         if (ctx.hasActiveModal())
@@ -85,7 +92,7 @@ export function setupKeyBindings(screen, actions, ctx) {
         if (ctx.hasActiveModal())
             return;
         if (ctx.getBottomTab() === 'explorer') {
-            ctx.explorerManager?.toggleShowOnlyChanges();
+            ctx.getExplorerManager()?.toggleShowOnlyChanges();
         }
     });
     // Explorer: open file finder
@@ -96,6 +103,12 @@ export function setupKeyBindings(screen, actions, ctx) {
             actions.openFileFinder();
         }
     });
+    // Ctrl+P: open file finder from any tab
+    screen.key(['C-p'], () => {
+        if (ctx.hasActiveModal())
+            return;
+        actions.openFileFinder();
+    });
     // Commit (skip if modal is open)
     screen.key(['c'], () => {
         if (ctx.hasActiveModal())
@@ -117,6 +130,29 @@ export function setupKeyBindings(screen, actions, ctx) {
             ctx.uiState.toggleAutoTab();
         }
     });
+    // Ctrl+a: toggle amend on commit tab (works even when input is focused)
+    screen.key(['C-a'], () => {
+        if (ctx.getBottomTab() === 'commit') {
+            ctx.commitFlowState.toggleAmend();
+            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();
+    });
     screen.key(['escape'], () => {
         if (ctx.getBottomTab() === 'commit') {
             if (ctx.isCommitInputFocused()) {
@@ -150,29 +186,117 @@ export function setupKeyBindings(screen, actions, ctx) {
     screen.key(['?'], () => ctx.uiState.toggleModal('hotkeys'));
     // Follow toggle
     screen.key(['f'], () => actions.toggleFollow());
-    // Compare view: base branch picker
+    // Compare view: base branch picker / Commit tab: branch picker
     screen.key(['b'], () => {
+        if (ctx.hasActiveModal() || ctx.isCommitInputFocused())
+            return;
         if (ctx.getBottomTab() === 'compare') {
             ctx.uiState.openModal('baseBranch');
         }
+        else if (ctx.getBottomTab() === 'commit') {
+            actions.openBranchPicker();
+        }
     });
-    // Compare view: toggle uncommitted
+    // u: toggle uncommitted in compare view
     screen.key(['u'], () => {
+        if (ctx.hasActiveModal())
+            return;
         if (ctx.getBottomTab() === 'compare') {
             ctx.uiState.toggleIncludeUncommitted();
             const includeUncommitted = ctx.uiState.state.includeUncommitted;
-            ctx.gitManager?.refreshCompareDiff(includeUncommitted);
+            ctx.getGitManager()?.refreshCompareDiff(includeUncommitted);
+        }
+    });
+    // Toggle flat file view (diff/commit tab only)
+    screen.key(['h'], () => {
+        if (ctx.hasActiveModal())
+            return;
+        const tab = ctx.getBottomTab();
+        if (tab === 'diff' || tab === 'commit') {
+            ctx.uiState.toggleFlatViewMode();
         }
     });
     // Discard changes (with confirmation)
     screen.key(['d'], () => {
         if (ctx.getBottomTab() === 'diff') {
-            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);
+            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);
+                }
+            }
+        }
+    });
+    // Hunk navigation (only when diff pane focused on diff tab)
+    screen.key(['n'], () => {
+        if (ctx.hasActiveModal())
+            return;
+        if (ctx.getBottomTab() === 'diff' && ctx.getCurrentPane() === 'diff') {
+            actions.navigateNextHunk();
+        }
+    });
+    screen.key(['S-n'], () => {
+        if (ctx.hasActiveModal())
+            return;
+        if (ctx.getBottomTab() === 'diff' && ctx.getCurrentPane() === 'diff') {
+            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();
+        }
+    });
+    // Revert selected commit (history tab only)
+    screen.key(['v'], () => {
+        if (ctx.hasActiveModal() || ctx.isCommitInputFocused())
+            return;
+        if (ctx.getBottomTab() === 'history') {
+            actions.revertSelected();
         }
     });
 }

package/dist/MouseHandlers.js

@@ -1,4 +1,5 @@
 import { getFileListTotalRows, getFileIndexFromRow } from './ui/widgets/FileList.js';
+import { getFlatFileListTotalRows } from './ui/widgets/FlatFileList.js';
 import { getCompareListTotalRows, getCompareSelectionFromRow, } from './ui/widgets/CompareListView.js';
 import { getExplorerTotalRows } from './ui/widgets/ExplorerView.js';
 import { getExplorerContentTotalRows } from './ui/widgets/ExplorerContent.js';
@@ -28,11 +29,60 @@ export function setupMouseHandlers(layout, actions, ctx) {
             handleTopPaneClick(clickedRow, mouse.x, actions, ctx);
         }
     });
+    // Click on bottom pane
+    layout.bottomPane.on('click', (mouse) => {
+        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();
+                }
+            }
+            else {
+                actions.selectHunkAtRow(clickedRow);
+            }
+        }
+    });
     // Click on footer for tabs and toggles
     layout.footerBox.on('click', (mouse) => {
         handleFooterClick(mouse.x, actions, ctx);
     });
 }
+function handleFileListClick(row, x, actions, ctx) {
+    const state = ctx.uiState.state;
+    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 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);
+        }
+    }
+    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);
+        }
+    }
+}
 function handleTopPaneClick(row, x, actions, ctx) {
     const state = ctx.uiState.state;
     if (state.bottomTab === 'history') {
@@ -50,23 +100,19 @@ function handleTopPaneClick(row, x, actions, ctx) {
     }
     else if (state.bottomTab === 'explorer') {
         const index = state.explorerScrollOffset + row;
-        ctx.explorerManager?.selectIndex(index);
-        ctx.uiState.setExplorerSelectedIndex(index);
+        const explorerManager = ctx.getExplorerManager();
+        const isAlreadySelected = explorerManager?.state.selectedIndex === index;
+        const displayRow = explorerManager?.state.displayRows[index];
+        if (isAlreadySelected && displayRow?.node.isDirectory) {
+            actions.enterExplorerDirectory();
+        }
+        else {
+            explorerManager?.selectIndex(index);
+            ctx.uiState.setExplorerSelectedIndex(index);
+        }
     }
     else {
-        // Diff tab - select file
-        const files = ctx.getStatusFiles();
-        const fileIndex = getFileIndexFromRow(row + state.fileListScrollOffset, files);
-        if (fileIndex !== null && fileIndex >= 0) {
-            // Check if click is on the action button [+] or [-] (columns 2-4)
-            if (x !== undefined && x >= 2 && x <= 4) {
-                actions.toggleFileByIndex(fileIndex);
-            }
-            else {
-                ctx.uiState.setSelectedIndex(fileIndex);
-                actions.selectFileByIndex(fileIndex);
-            }
-        }
+        handleFileListClick(row, x, actions, ctx);
     }
 }
 function handleFooterClick(x, actions, ctx) {
@@ -102,7 +148,7 @@ function handleFooterClick(x, actions, ctx) {
         actions.toggleFollow();
     }
     else if (x >= 34 && x <= 43 && ctx.uiState.state.bottomTab === 'explorer') {
-        ctx.explorerManager?.toggleShowOnlyChanges();
+        ctx.getExplorerManager()?.toggleShowOnlyChanges();
     }
     else if (x === 0) {
         ctx.uiState.openModal('hotkeys');
@@ -124,14 +170,15 @@ function handleTopPaneScroll(delta, layout, ctx) {
         ctx.uiState.setCompareScrollOffset(newOffset);
     }
     else if (state.bottomTab === 'explorer') {
-        const totalRows = getExplorerTotalRows(ctx.explorerManager?.state.displayRows ?? []);
+        const totalRows = getExplorerTotalRows(ctx.getExplorerManager()?.state.displayRows ?? []);
         const maxOffset = Math.max(0, totalRows - visibleHeight);
         const newOffset = Math.min(maxOffset, Math.max(0, state.explorerScrollOffset + delta));
         ctx.uiState.setExplorerScrollOffset(newOffset);
     }
     else {
-        const files = ctx.getStatusFiles();
-        const totalRows = getFileListTotalRows(files);
+        const totalRows = state.flatViewMode
+            ? getFlatFileListTotalRows(ctx.getCachedFlatFiles())
+            : getFileListTotalRows(ctx.getStatusFiles());
         const maxOffset = Math.max(0, totalRows - visibleHeight);
         const newOffset = Math.min(maxOffset, Math.max(0, state.fileListScrollOffset + delta));
         ctx.uiState.setFileListScrollOffset(newOffset);
@@ -142,7 +189,7 @@ function handleBottomPaneScroll(delta, layout, ctx) {
     const visibleHeight = layout.dimensions.bottomPaneHeight;
     const width = ctx.getScreenWidth();
     if (state.bottomTab === 'explorer') {
-        const selectedFile = ctx.explorerManager?.state.selectedFile;
+        const selectedFile = ctx.getExplorerManager()?.state.selectedFile;
         const totalRows = getExplorerContentTotalRows(selectedFile?.content ?? null, selectedFile?.path ?? null, selectedFile?.truncated ?? false, width, state.wrapMode);
         const maxOffset = Math.max(0, totalRows - visibleHeight);
         const newOffset = Math.min(maxOffset, Math.max(0, state.explorerFileScrollOffset + delta));

package/dist/core/ExplorerStateManager.js

@@ -2,6 +2,7 @@ import * as fs from 'node:fs';
 import * as path from 'node:path';
 import { EventEmitter } from 'node:events';
 import { getIgnoredFiles } from '../git/ignoreUtils.js';
+import { listAllFiles } from '../git/status.js';
 const MAX_FILE_SIZE = 1024 * 1024; // 1MB
 const WARN_FILE_SIZE = 100 * 1024; // 100KB
 /**
@@ -25,6 +26,7 @@ export class ExplorerStateManager extends EventEmitter {
     options;
     expandedPaths = new Set();
     gitStatusMap = { files: new Map(), directories: new Set() };
+    _cachedFilePaths = null;
     _state = {
         currentPath: '',
         tree: null,
@@ -61,9 +63,12 @@ export class ExplorerStateManager extends EventEmitter {
     }
     /**
      * Update git status map and refresh display.
+     * Also invalidates the file path cache so the next file finder open gets fresh data.
      */
     setGitStatus(statusMap) {
         this.gitStatusMap = statusMap;
+        // Invalidate file path cache — reload in background
+        this.loadFilePaths();
         // Refresh display to show updated status
         if (this._state.tree) {
             this.applyGitStatusToTree(this._state.tree);
@@ -123,7 +128,7 @@ export class ExplorerStateManager extends EventEmitter {
     /**
      * Build a tree node for a directory path.
      */
-    async buildTreeNode(relativePath, depth) {
+    async buildTreeNode(relativePath, _depth) {
         try {
             const fullPath = path.join(this.repoPath, relativePath);
             const stats = await fs.promises.stat(fullPath);
@@ -153,7 +158,7 @@ export class ExplorerStateManager extends EventEmitter {
             }
             return node;
         }
-        catch (err) {
+        catch {
             return null;
         }
     }
@@ -211,7 +216,7 @@ export class ExplorerStateManager extends EventEmitter {
             this.collapseNode(node, children);
             node.childrenLoaded = true;
         }
-        catch (err) {
+        catch {
             node.childrenLoaded = true;
             node.children = [];
         }
@@ -262,43 +267,21 @@ export class ExplorerStateManager extends EventEmitter {
     /**
      * Flatten tree into display rows.
      */
+    shouldIncludeNode(node) {
+        if (!this.options.showOnlyChanges)
+            return true;
+        if (node.isDirectory)
+            return !!node.hasChangedChildren;
+        return !!node.gitStatus;
+    }
     flattenTree(root) {
         const rows = [];
-        const traverse = (node, depth, parentIsLast) => {
-            // Skip root node in display (but process its children)
-            if (depth === 0) {
-                for (let i = 0; i < node.children.length; i++) {
-                    const child = node.children[i];
-                    const isLast = i === node.children.length - 1;
-                    // Apply filter if showOnlyChanges is enabled
-                    if (this.options.showOnlyChanges) {
-                        if (child.isDirectory && !child.hasChangedChildren)
-                            continue;
-                        if (!child.isDirectory && !child.gitStatus)
-                            continue;
-                    }
-                    rows.push({
-                        node: child,
-                        depth: 0,
-                        isLast,
-                        parentIsLast: [],
-                    });
-                    if (child.isDirectory && child.expanded) {
-                        traverse(child, 1, [isLast]);
-                    }
-                }
-                return;
-            }
+        const traverseChildren = (node, depth, parentIsLast) => {
             for (let i = 0; i < node.children.length; i++) {
                 const child = node.children[i];
                 const isLast = i === node.children.length - 1;
-                // Apply filter if showOnlyChanges is enabled
-                if (this.options.showOnlyChanges) {
-                    if (child.isDirectory && !child.hasChangedChildren)
-                        continue;
-                    if (!child.isDirectory && !child.gitStatus)
-                        continue;
-                }
+                if (!this.shouldIncludeNode(child))
+                    continue;
                 rows.push({
                     node: child,
                     depth,
@@ -306,11 +289,12 @@ export class ExplorerStateManager extends EventEmitter {
                     parentIsLast: [...parentIsLast],
                 });
                 if (child.isDirectory && child.expanded) {
-                    traverse(child, depth + 1, [...parentIsLast, isLast]);
+                    traverseChildren(child, depth + 1, [...parentIsLast, isLast]);
                 }
             }
         };
-        traverse(root, 0, []);
+        // Start from root's children at depth 0 (root itself is not displayed)
+        traverseChildren(root, 0, []);
         return rows;
     }
     /**
@@ -559,45 +543,23 @@ export class ExplorerStateManager extends EventEmitter {
         return search(this._state.tree);
     }
     /**
-     * Get all file paths in the repo (for file finder).
-     * Scans the filesystem directly to get all files, not just expanded ones.
+     * Load all file paths using git ls-files (fast, single git command).
+     * Stores result in cache for instant access by FileFinder.
      */
-    async getAllFilePaths() {
-        const paths = [];
-        const scanDir = async (dirPath) => {
-            try {
-                const fullPath = path.join(this.repoPath, dirPath);
-                const entries = await fs.promises.readdir(fullPath, { withFileTypes: true });
-                // Build list of paths for gitignore check
-                const pathsToCheck = entries.map((e) => (dirPath ? path.join(dirPath, e.name) : e.name));
-                // Get ignored files
-                const ignoredFiles = this.options.hideGitignored
-                    ? await getIgnoredFiles(this.repoPath, pathsToCheck)
-                    : new Set();
-                for (const entry of entries) {
-                    // Filter dot-prefixed hidden files
-                    if (this.options.hideHidden && entry.name.startsWith('.')) {
-                        continue;
-                    }
-                    const entryPath = dirPath ? path.join(dirPath, entry.name) : entry.name;
-                    // Filter gitignored files
-                    if (this.options.hideGitignored && ignoredFiles.has(entryPath)) {
-                        continue;
-                    }
-                    if (entry.isDirectory()) {
-                        await scanDir(entryPath);
-                    }
-                    else {
-                        paths.push(entryPath);
-                    }
-                }
-            }
-            catch (err) {
-                // Ignore errors for individual directories
-            }
-        };
-        await scanDir('');
-        return paths;
+    async loadFilePaths() {
+        try {
+            this._cachedFilePaths = await listAllFiles(this.repoPath);
+        }
+        catch {
+            this._cachedFilePaths = [];
+        }
+    }
+    /**
+     * Get cached file paths (for file finder).
+     * Returns empty array if not yet loaded.
+     */
+    getCachedFilePaths() {
+        return this._cachedFilePaths ?? [];
     }
     /**
      * Navigate to a specific file path in the tree.