diffstalker 0.2.1 → 0.2.2

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())
@@ -156,23 +169,60 @@ export function setupKeyBindings(screen, actions, ctx) {
             ctx.uiState.openModal('baseBranch');
         }
     });
-    // 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();
+        }
+    });
 }

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,49 @@ export function setupMouseHandlers(layout, actions, ctx) {
             handleTopPaneClick(clickedRow, mouse.x, actions, ctx);
         }
     });
+    // Click on bottom pane to select hunk (diff tab)
+    layout.bottomPane.on('click', (mouse) => {
+        const clickedRow = layout.screenYToBottomPaneRow(mouse.y);
+        if (clickedRow >= 0) {
+            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 +89,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 +137,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 +159,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 +178,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

@@ -123,7 +123,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 +153,7 @@ export class ExplorerStateManager extends EventEmitter {
             }
             return node;
         }
-        catch (err) {
+        catch {
             return null;
         }
     }
@@ -211,7 +211,7 @@ export class ExplorerStateManager extends EventEmitter {
             this.collapseNode(node, children);
             node.childrenLoaded = true;
         }
-        catch (err) {
+        catch {
             node.childrenLoaded = true;
             node.children = [];
         }
@@ -262,43 +262,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 +284,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;
     }
     /**
@@ -592,7 +571,7 @@ export class ExplorerStateManager extends EventEmitter {
                     }
                 }
             }
-            catch (err) {
+            catch {
                 // Ignore errors for individual directories
             }
         };

package/dist/core/GitStateManager.js

@@ -5,8 +5,8 @@ import { watch } from 'chokidar';
 import { EventEmitter } from 'node:events';
 import ignore from 'ignore';
 import { getQueueForRepo, removeQueueForRepo } from './GitOperationQueue.js';
-import { getStatus, stageFile, unstageFile, stageAll as gitStageAll, unstageAll as gitUnstageAll, discardChanges as gitDiscardChanges, commit as gitCommit, getHeadMessage, getCommitHistory, } from '../git/status.js';
-import { getDiff, getDiffForUntracked, getStagedDiff, getDefaultBaseBranch, getCandidateBaseBranches, getDiffBetweenRefs, getCompareDiffWithUncommitted, getCommitDiff, } from '../git/diff.js';
+import { getStatus, stageFile, unstageFile, stageAll as gitStageAll, unstageAll as gitUnstageAll, discardChanges as gitDiscardChanges, commit as gitCommit, getHeadMessage, getCommitHistory, stageHunk as gitStageHunk, unstageHunk as gitUnstageHunk, } from '../git/status.js';
+import { getDiff, getDiffForUntracked, getStagedDiff, getDefaultBaseBranch, getCandidateBaseBranches, getDiffBetweenRefs, getCompareDiffWithUncommitted, getCommitDiff, countHunksPerFile, } from '../git/diff.js';
 import { getCachedBaseBranch, setCachedBaseBranch } from '../utils/baseBranchCache.js';
 /**
  * GitStateManager manages git state independent of React.
@@ -23,9 +23,11 @@ export class GitStateManager extends EventEmitter {
     _state = {
         status: null,
         diff: null,
+        combinedFileDiffs: null,
         selectedFile: null,
         isLoading: false,
         error: null,
+        hunkCounts: null,
     };
     _compareState = {
         compareDiff: null,
@@ -256,34 +258,24 @@ export class GitStateManager extends EventEmitter {
                 });
                 return;
             }
-            // Emit status immediately so the file list updates after a single git spawn
-            this.updateState({ status: newStatus });
-            // Fetch unstaged diff (updates diff view once complete)
-            const allUnstagedDiff = await getDiff(this.repoPath, undefined, false);
+            // Fetch unstaged and staged diffs in parallel
+            const [allUnstagedDiff, allStagedDiff] = await Promise.all([
+                getDiff(this.repoPath, undefined, false),
+                getDiff(this.repoPath, undefined, true),
+            ]);
+            // Count hunks per file for the file list display
+            const hunkCounts = {
+                unstaged: countHunksPerFile(allUnstagedDiff.raw),
+                staged: countHunksPerFile(allStagedDiff.raw),
+            };
             // Determine display diff based on selected file
-            let displayDiff;
-            const currentSelectedFile = this._state.selectedFile;
-            if (currentSelectedFile) {
-                const currentFile = newStatus.files.find((f) => f.path === currentSelectedFile.path && f.staged === currentSelectedFile.staged);
-                if (currentFile) {
-                    if (currentFile.status === 'untracked') {
-                        displayDiff = await getDiffForUntracked(this.repoPath, currentFile.path);
-                    }
-                    else {
-                        displayDiff = await getDiff(this.repoPath, currentFile.path, currentFile.staged);
-                    }
-                }
-                else {
-                    // File no longer exists - clear selection, show unstaged diff
-                    displayDiff = allUnstagedDiff;
-                    this.updateState({ selectedFile: null });
-                }
-            }
-            else {
-                displayDiff = allUnstagedDiff;
-            }
+            const { displayDiff, combinedFileDiffs } = await this.resolveFileDiffs(newStatus, allUnstagedDiff);
+            // Batch status + diffs into a single update to avoid flicker
             this.updateState({
+                status: newStatus,
                 diff: displayDiff,
+                combinedFileDiffs,
+                hunkCounts,
                 isLoading: false,
             });
         }
@@ -294,6 +286,37 @@ export class GitStateManager extends EventEmitter {
             });
         }
     }
+    /**
+     * Resolve display diff and combined diffs for the currently selected file.
+     */
+    async resolveFileDiffs(newStatus, fallbackDiff) {
+        const currentSelectedFile = this._state.selectedFile;
+        if (!currentSelectedFile) {
+            return { displayDiff: fallbackDiff, combinedFileDiffs: null };
+        }
+        // Match by path + staged, falling back to path-only (handles staging state changes)
+        const currentFile = newStatus.files.find((f) => f.path === currentSelectedFile.path && f.staged === currentSelectedFile.staged) ?? newStatus.files.find((f) => f.path === currentSelectedFile.path);
+        if (!currentFile) {
+            this.updateState({ selectedFile: null });
+            return { displayDiff: fallbackDiff, combinedFileDiffs: null };
+        }
+        if (currentFile.status === 'untracked') {
+            const displayDiff = await getDiffForUntracked(this.repoPath, currentFile.path);
+            return {
+                displayDiff,
+                combinedFileDiffs: { unstaged: displayDiff, staged: { raw: '', lines: [] } },
+            };
+        }
+        const [unstagedFileDiff, stagedFileDiff] = await Promise.all([
+            getDiff(this.repoPath, currentFile.path, false),
+            getDiff(this.repoPath, currentFile.path, true),
+        ]);
+        const displayDiff = currentFile.staged ? stagedFileDiff : unstagedFileDiff;
+        return {
+            displayDiff,
+            combinedFileDiffs: { unstaged: unstagedFileDiff, staged: stagedFileDiff },
+        };
+    }
     /**
      * Select a file and update the diff display.
      * The selection highlight updates immediately; the diff fetch is debounced
@@ -323,27 +346,9 @@ export class GitStateManager extends EventEmitter {
         const file = this._state.selectedFile;
         this.queue
             .enqueue(async () => {
-            // Selection changed while queued — skip stale fetch
             if (file !== this._state.selectedFile)
                 return;
-            if (file) {
-                let fileDiff;
-                if (file.status === 'untracked') {
-                    fileDiff = await getDiffForUntracked(this.repoPath, file.path);
-                }
-                else {
-                    fileDiff = await getDiff(this.repoPath, file.path, file.staged);
-                }
-                if (file === this._state.selectedFile) {
-                    this.updateState({ diff: fileDiff });
-                }
-            }
-            else {
-                const allDiff = await getStagedDiff(this.repoPath);
-                if (this._state.selectedFile === null) {
-                    this.updateState({ diff: allDiff });
-                }
-            }
+            await this.doFetchDiffForFile(file);
         })
             .catch((err) => {
             this.updateState({
@@ -351,6 +356,36 @@ export class GitStateManager extends EventEmitter {
             });
         });
     }
+    async doFetchDiffForFile(file) {
+        if (!file) {
+            const allDiff = await getStagedDiff(this.repoPath);
+            if (this._state.selectedFile === null) {
+                this.updateState({ diff: allDiff, combinedFileDiffs: null });
+            }
+            return;
+        }
+        if (file.status === 'untracked') {
+            const fileDiff = await getDiffForUntracked(this.repoPath, file.path);
+            if (file === this._state.selectedFile) {
+                this.updateState({
+                    diff: fileDiff,
+                    combinedFileDiffs: { unstaged: fileDiff, staged: { raw: '', lines: [] } },
+                });
+            }
+            return;
+        }
+        const [unstagedDiff, stagedDiff] = await Promise.all([
+            getDiff(this.repoPath, file.path, false),
+            getDiff(this.repoPath, file.path, true),
+        ]);
+        if (file === this._state.selectedFile) {
+            const displayDiff = file.staged ? stagedDiff : unstagedDiff;
+            this.updateState({
+                diff: displayDiff,
+                combinedFileDiffs: { unstaged: unstagedDiff, staged: stagedDiff },
+            });
+        }
+    }
     /**
      * Stage a file.
      */
@@ -381,6 +416,36 @@ export class GitStateManager extends EventEmitter {
             });
         }
     }
+    /**
+     * Stage a single hunk via patch.
+     */
+    async stageHunk(patch) {
+        try {
+            await this.queue.enqueueMutation(async () => gitStageHunk(this.repoPath, patch));
+            this.scheduleRefresh();
+        }
+        catch (err) {
+            await this.refresh();
+            this.updateState({
+                error: `Failed to stage hunk: ${err instanceof Error ? err.message : String(err)}`,
+            });
+        }
+    }
+    /**
+     * Unstage a single hunk via patch.
+     */
+    async unstageHunk(patch) {
+        try {
+            await this.queue.enqueueMutation(async () => gitUnstageHunk(this.repoPath, patch));
+            this.scheduleRefresh();
+        }
+        catch (err) {
+            await this.refresh();
+            this.updateState({
+                error: `Failed to unstage hunk: ${err instanceof Error ? err.message : String(err)}`,
+            });
+        }
+    }
     /**
      * Discard changes to a file.
      */