diffstalker 0.2.1 → 0.2.2

package/dist/ipc/CommandClient.js

@@ -17,15 +17,14 @@ export class CommandClient {
         return new Promise((resolve, reject) => {
             const socket = net.createConnection(this.socketPath);
             let buffer = '';
-            let timeoutId;
-            const cleanup = () => {
-                clearTimeout(timeoutId);
-                socket.destroy();
-            };
-            timeoutId = setTimeout(() => {
+            const timeoutId = setTimeout(() => {
                 cleanup();
                 reject(new Error(`Command timed out after ${this.timeout}ms`));
             }, this.timeout);
+            function cleanup() {
+                clearTimeout(timeoutId);
+                socket.destroy();
+            }
             socket.on('connect', () => {
                 socket.write(JSON.stringify(command) + '\n');
             });
@@ -38,7 +37,7 @@ export class CommandClient {
                     try {
                         resolve(JSON.parse(json));
                     }
-                    catch (err) {
+                    catch {
                         reject(new Error(`Invalid JSON response: ${json}`));
                     }
                 }

package/dist/state/UIState.js

@@ -13,11 +13,13 @@ const DEFAULT_STATE = {
     compareSelectedIndex: 0,
     includeUncommitted: false,
     explorerSelectedIndex: 0,
+    selectedHunkIndex: 0,
     wrapMode: false,
     autoTabEnabled: false,
     mouseEnabled: true,
     hideHiddenFiles: true,
     hideGitignored: true,
+    flatViewMode: false,
     splitRatio: 0.4,
     activeModal: null,
     pendingDiscard: null,
@@ -110,6 +112,22 @@ export class UIState extends EventEmitter {
     setExplorerSelectedIndex(index) {
         this.update({ explorerSelectedIndex: Math.max(0, index) });
     }
+    // Hunk selection
+    setSelectedHunkIndex(index) {
+        this.update({ selectedHunkIndex: Math.max(0, index) });
+    }
+    /**
+     * Silently clamp selectedHunkIndex to valid range without emitting events.
+     * Called during render to sync state with actual hunk count.
+     */
+    clampSelectedHunkIndex(hunkCount) {
+        if (hunkCount <= 0) {
+            this._state.selectedHunkIndex = 0;
+        }
+        else if (this._state.selectedHunkIndex >= hunkCount) {
+            this._state.selectedHunkIndex = hunkCount - 1;
+        }
+    }
     // Display toggles
     toggleWrapMode() {
         this.update({ wrapMode: !this._state.wrapMode, diffScrollOffset: 0 });
@@ -126,6 +144,9 @@ export class UIState extends EventEmitter {
     toggleHideGitignored() {
         this.update({ hideGitignored: !this._state.hideGitignored });
     }
+    toggleFlatViewMode() {
+        this.update({ flatViewMode: !this._state.flatViewMode, fileListScrollOffset: 0 });
+    }
     // Split ratio
     adjustSplitRatio(delta) {
         const newRatio = Math.min(0.85, Math.max(0.15, this._state.splitRatio + delta));
@@ -189,6 +210,7 @@ export class UIState extends EventEmitter {
             explorerSelectedIndex: 0,
             explorerScrollOffset: 0,
             explorerFileScrollOffset: 0,
+            selectedHunkIndex: 0,
         };
         this.emit('change', this._state);
     }

package/dist/ui/PaneRenderers.js

@@ -1,14 +1,15 @@
 import { formatFileList } from './widgets/FileList.js';
+import { formatFlatFileList } from './widgets/FlatFileList.js';
 import { formatHistoryView } from './widgets/HistoryView.js';
 import { formatCompareListView } from './widgets/CompareListView.js';
 import { formatExplorerView } from './widgets/ExplorerView.js';
-import { formatDiff, formatHistoryDiff } from './widgets/DiffView.js';
+import { formatDiff, formatCombinedDiff, formatHistoryDiff } from './widgets/DiffView.js';
 import { formatCommitPanel } from './widgets/CommitPanel.js';
 import { formatExplorerContent } from './widgets/ExplorerContent.js';
 /**
  * Render the top pane content for the current tab.
  */
-export function renderTopPane(state, files, historyCommits, compareDiff, compareSelection, explorerState, width, topPaneHeight) {
+export function renderTopPane(state, files, historyCommits, compareDiff, compareSelection, explorerState, width, topPaneHeight, hunkCounts, flatFiles) {
     if (state.bottomTab === 'history') {
         return formatHistoryView(historyCommits, state.historySelectedIndex, state.currentPane === 'history', width, state.historyScrollOffset, topPaneHeight);
     }
@@ -21,36 +22,55 @@ export function renderTopPane(state, files, historyCommits, compareDiff, compare
         const displayRows = explorerState?.displayRows ?? [];
         return formatExplorerView(displayRows, state.explorerSelectedIndex, state.currentPane === 'explorer', width, state.explorerScrollOffset, topPaneHeight, explorerState?.isLoading ?? false, explorerState?.error ?? null);
     }
-    // Default: diff tab file list
-    return formatFileList(files, state.selectedIndex, state.currentPane === 'files', width, state.fileListScrollOffset, topPaneHeight);
+    // Default: diff/commit tab file list
+    if (state.flatViewMode && flatFiles) {
+        return formatFlatFileList(flatFiles, state.selectedIndex, state.currentPane === 'files', width, state.fileListScrollOffset, topPaneHeight);
+    }
+    return formatFileList(files, state.selectedIndex, state.currentPane === 'files', width, state.fileListScrollOffset, topPaneHeight, hunkCounts);
 }
 /**
  * Render the bottom pane content for the current tab.
  */
-export function renderBottomPane(state, diff, historyState, compareSelectionState, explorerSelectedFile, commitFlowState, stagedCount, currentTheme, width, bottomPaneHeight) {
+export function renderBottomPane(state, diff, historyState, compareSelectionState, explorerSelectedFile, commitFlowState, stagedCount, currentTheme, width, bottomPaneHeight, selectedHunkIndex, isFileStaged, combinedFileDiffs) {
     if (state.bottomTab === 'commit') {
         const content = formatCommitPanel(commitFlowState, stagedCount, width);
-        return { content, totalRows: 0 };
+        return { content, totalRows: 0, hunkCount: 0, hunkBoundaries: [] };
     }
     if (state.bottomTab === 'history') {
         const selectedCommit = historyState?.selectedCommit ?? null;
         const commitDiff = historyState?.commitDiff ?? null;
         const { content, totalRows } = formatHistoryDiff(selectedCommit, commitDiff, width, state.diffScrollOffset, bottomPaneHeight, currentTheme, state.wrapMode);
-        return { content, totalRows };
+        return { content, totalRows, hunkCount: 0, hunkBoundaries: [] };
     }
     if (state.bottomTab === 'compare') {
         const compareDiff = compareSelectionState?.diff ?? null;
         if (compareDiff) {
             const { content, totalRows } = formatDiff(compareDiff, width, state.diffScrollOffset, bottomPaneHeight, currentTheme, state.wrapMode);
-            return { content, totalRows };
+            return { content, totalRows, hunkCount: 0, hunkBoundaries: [] };
         }
-        return { content: '{gray-fg}Select a commit or file to view diff{/gray-fg}', totalRows: 0 };
+        return {
+            content: '{gray-fg}Select a commit or file to view diff{/gray-fg}',
+            totalRows: 0,
+            hunkCount: 0,
+            hunkBoundaries: [],
+        };
     }
     if (state.bottomTab === 'explorer') {
         const content = formatExplorerContent(explorerSelectedFile?.path ?? null, explorerSelectedFile?.content ?? null, width, state.explorerFileScrollOffset, bottomPaneHeight, explorerSelectedFile?.truncated ?? false, state.wrapMode);
-        return { content, totalRows: 0 };
+        return { content, totalRows: 0, hunkCount: 0, hunkBoundaries: [] };
+    }
+    // Flat mode: show combined unstaged+staged diff with section headers
+    if (state.flatViewMode && combinedFileDiffs) {
+        const result = formatCombinedDiff(combinedFileDiffs.unstaged, combinedFileDiffs.staged, width, state.diffScrollOffset, bottomPaneHeight, currentTheme, state.wrapMode, selectedHunkIndex);
+        return {
+            content: result.content,
+            totalRows: result.totalRows,
+            hunkCount: result.hunkCount,
+            hunkBoundaries: result.hunkBoundaries,
+            hunkMapping: result.hunkMapping,
+        };
     }
-    // Default: diff tab
-    const { content, totalRows } = formatDiff(diff, width, state.diffScrollOffset, bottomPaneHeight, currentTheme, state.wrapMode);
-    return { content, totalRows };
+    // Default: diff tab — pass selectedHunkIndex for hunk gutter
+    const { content, totalRows, hunkCount, hunkBoundaries } = formatDiff(diff, width, state.diffScrollOffset, bottomPaneHeight, currentTheme, state.wrapMode, selectedHunkIndex, isFileStaged);
+    return { content, totalRows, hunkCount, hunkBoundaries };
 }

package/dist/ui/modals/FileFinder.js

@@ -1,56 +1,19 @@
 import blessed from 'neo-blessed';
+import { Fzf } from 'fzf';
 const MAX_RESULTS = 15;
 /**
- * Simple fuzzy match scoring.
- * Returns -1 if no match, otherwise a score (higher is better).
+ * Highlight matched characters in a display path using fzf position data.
+ * The positions set refers to indices in the original full path,
+ * so we need an offset when the display path is truncated.
  */
-function fuzzyScore(query, target) {
-    const lowerQuery = query.toLowerCase();
-    const lowerTarget = target.toLowerCase();
-    // Must contain all query characters in order
-    let queryIndex = 0;
-    let score = 0;
-    let lastMatchIndex = -1;
-    for (let i = 0; i < lowerTarget.length && queryIndex < lowerQuery.length; i++) {
-        if (lowerTarget[i] === lowerQuery[queryIndex]) {
-            // Bonus for consecutive matches
-            if (lastMatchIndex === i - 1) {
-                score += 10;
-            }
-            // Bonus for matching at start of word
-            if (i === 0 || lowerTarget[i - 1] === '/' || lowerTarget[i - 1] === '.') {
-                score += 5;
-            }
-            score += 1;
-            lastMatchIndex = i;
-            queryIndex++;
-        }
-    }
-    // All query characters must match
-    if (queryIndex < lowerQuery.length) {
-        return -1;
-    }
-    // Bonus for shorter paths (more specific)
-    score += Math.max(0, 50 - target.length);
-    return score;
-}
-/**
- * Highlight matched characters in path.
- */
-function highlightMatch(query, path) {
-    if (!query)
-        return path;
-    const lowerQuery = query.toLowerCase();
-    const lowerPath = path.toLowerCase();
+function highlightMatch(displayPath, positions, offset) {
     let result = '';
-    let queryIndex = 0;
-    for (let i = 0; i < path.length; i++) {
-        if (queryIndex < lowerQuery.length && lowerPath[i] === lowerQuery[queryIndex]) {
-            result += `{yellow-fg}${path[i]}{/yellow-fg}`;
-            queryIndex++;
+    for (let i = 0; i < displayPath.length; i++) {
+        if (positions.has(i + offset)) {
+            result += `{yellow-fg}${displayPath[i]}{/yellow-fg}`;
         }
         else {
-            result += path[i];
+            result += displayPath[i];
         }
     }
     return result;
@@ -62,6 +25,7 @@ export class FileFinder {
     box;
     textbox;
     screen;
+    fzf;
     allPaths;
     results = [];
     selectedIndex = 0;
@@ -71,6 +35,7 @@ export class FileFinder {
     constructor(screen, allPaths, onSelect, onCancel) {
         this.screen = screen;
         this.allPaths = allPaths;
+        this.fzf = new Fzf(allPaths, { limit: MAX_RESULTS, forward: false });
         this.onSelect = onSelect;
         this.onCancel = onCancel;
         // Create modal box
@@ -123,7 +88,7 @@ export class FileFinder {
             if (this.results.length > 0) {
                 const selected = this.results[this.selectedIndex];
                 this.close();
-                this.onSelect(selected.path);
+                this.onSelect(selected.item);
             }
         });
         // Handle up/down for navigation (Ctrl+j/k since j/k are for typing)
@@ -162,22 +127,13 @@ export class FileFinder {
     }
     updateResults() {
         if (!this.query) {
-            // Show first N files when no query
-            this.results = this.allPaths.slice(0, MAX_RESULTS).map((path) => ({ path, score: 0 }));
+            // fzf returns nothing for empty query, show first N files
+            this.results = this.allPaths
+                .slice(0, MAX_RESULTS)
+                .map((item) => ({ item, positions: new Set(), start: 0, end: 0, score: 0 }));
             return;
         }
-        // Fuzzy match all paths
-        const scored = [];
-        for (const path of this.allPaths) {
-            const score = fuzzyScore(this.query, path);
-            if (score >= 0) {
-                scored.push({ path, score });
-            }
-        }
-        // Sort by score (descending)
-        scored.sort((a, b) => b.score - a.score);
-        // Take top results
-        this.results = scored.slice(0, MAX_RESULTS);
+        this.results = this.fzf.find(this.query);
     }
     render() {
         const lines = [];
@@ -195,13 +151,18 @@ export class FileFinder {
                 const result = this.results[i];
                 const isSelected = i === this.selectedIndex;
                 // Truncate path if needed
-                let displayPath = result.path;
+                const fullPath = result.item;
                 const maxLen = width - 4;
+                let displayPath = fullPath;
+                let offset = 0;
                 if (displayPath.length > maxLen) {
-                    displayPath = '…' + displayPath.slice(-(maxLen - 1));
+                    offset = displayPath.length - (maxLen - 1);
+                    displayPath = '…' + displayPath.slice(offset);
+                    // Account for the '…' prefix: display index 0 is '…', actual content starts at 1
+                    offset = offset - 1;
                 }
-                // Highlight matched characters
-                const highlighted = highlightMatch(this.query, displayPath);
+                // Highlight matched characters using fzf positions
+                const highlighted = highlightMatch(displayPath, result.positions, offset);
                 if (isSelected) {
                     lines.push(`{cyan-fg}{bold}> ${highlighted}{/bold}{/cyan-fg}`);
                 }

package/dist/ui/modals/HotkeysModal.js

@@ -45,6 +45,7 @@ const hotkeyGroups = [
     {
         title: 'Toggles',
         entries: [
+            { key: 'h', description: 'Flat file view' },
             { key: 'm', description: 'Mouse mode' },
             { key: 'w', description: 'Wrap mode' },
             { key: 'f', description: 'Follow mode' },
@@ -57,6 +58,9 @@ const hotkeyGroups = [
         entries: [
             { key: 'Enter', description: 'Enter directory' },
             { key: 'Backspace', description: 'Go up' },
+            { key: '/', description: 'Find file' },
+            { key: 'Ctrl+P', description: 'Find file (any tab)' },
+            { key: 'g', description: 'Show changes only' },
         ],
     },
     {
@@ -67,8 +71,13 @@ const hotkeyGroups = [
         ],
     },
     {
-        title: 'Diff',
-        entries: [{ key: 'd', description: 'Discard changes' }],
+        title: 'Diff (pane focus)',
+        entries: [
+            { key: 'n', description: 'Next hunk' },
+            { key: 'N', description: 'Previous hunk' },
+            { key: 's', description: 'Toggle hunk staged/unstaged' },
+            { key: 'd', description: 'Discard changes' },
+        ],
     },
 ];
 /**
@@ -186,7 +195,7 @@ export class HotkeysModal {
         this.box.setContent(lines.join('\n'));
         this.screen.render();
     }
-    renderGroups(groups, colWidth) {
+    renderGroups(groups, _colWidth) {
         const lines = [];
         for (const group of groups) {
             lines.push(`{bold}{gray-fg}${group.title}{/gray-fg}{/bold}`);

package/dist/ui/modals/ThemePicker.js

@@ -1,5 +1,5 @@
 import blessed from 'neo-blessed';
-import { themes, themeOrder, getTheme } from '../../themes.js';
+import { themes, themeOrder } from '../../themes.js';
 /**
  * ThemePicker modal for selecting diff themes.
  */
@@ -85,7 +85,6 @@ export class ThemePicker {
         // Preview section
         lines.push('');
         lines.push('{gray-fg}Preview:{/gray-fg}');
-        const previewTheme = getTheme(themeOrder[this.selectedIndex]);
         // Simple preview - just show add/del colors
         lines.push(`  {green-fg}+ added line{/green-fg}`);
         lines.push(`  {red-fg}- deleted line{/red-fg}`);

package/dist/ui/widgets/CommitPanel.js

@@ -11,7 +11,7 @@ export function formatCommitPanel(state, stagedCount, width) {
     lines.push(title);
     lines.push('');
     // Message input area
-    const borderChar = state.inputFocused ? '\u2502' : '\u2502';
+    const borderChar = '\u2502';
     const borderColor = state.inputFocused ? 'cyan' : 'gray';
     // Top border
     const innerWidth = Math.max(20, width - 6);

package/dist/ui/widgets/CompareListView.js

@@ -135,6 +135,47 @@ function formatFileRow(file, treeRow, isSelected, isFocused, width) {
     }
     return `{escape}${line}{/escape}`;
 }
+/**
+ * Check if a row is currently selected.
+ */
+function isRowSelected(row, selectedItem) {
+    if (!selectedItem)
+        return false;
+    if (row.type === 'commit' && row.commitIndex !== undefined) {
+        return selectedItem.type === 'commit' && selectedItem.index === row.commitIndex;
+    }
+    if (row.type === 'file' && row.fileIndex !== undefined) {
+        return selectedItem.type === 'file' && selectedItem.index === row.fileIndex;
+    }
+    return false;
+}
+/**
+ * Format a section header line (e.g. "▼ Commits (5)").
+ */
+function formatSectionHeader(label, count) {
+    return `{escape}${ANSI_CYAN}${ANSI_BOLD}▼ ${label}${ANSI_RESET} ${ANSI_GRAY}(${count})${ANSI_RESET}{/escape}`;
+}
+/**
+ * Format a single compare list row, returning null for unrenderable rows.
+ */
+function formatCompareRow(row, selectedItem, isFocused, commits, files, width) {
+    if (row.type === 'section-header') {
+        const isCommits = row.sectionType === 'commits';
+        return formatSectionHeader(isCommits ? 'Commits' : 'Files', isCommits ? commits.length : files.length);
+    }
+    if (row.type === 'spacer')
+        return '';
+    if (row.type === 'directory' && row.treeRow)
+        return formatDirectoryRow(row.treeRow, width);
+    const selected = isRowSelected(row, selectedItem);
+    if (row.type === 'commit' && row.commit && row.commitIndex !== undefined) {
+        return formatCommitRow(row.commit, selected, isFocused, width);
+    }
+    if (row.type === 'file' && row.file && row.fileIndex !== undefined && row.treeRow) {
+        return formatFileRow(row.file, row.treeRow, selected, isFocused, width);
+    }
+    return null;
+}
 /**
  * Format the compare list view as blessed-compatible tagged string.
  */
@@ -147,29 +188,9 @@ export function formatCompareListView(commits, files, selectedItem, isFocused, w
     const visibleRows = maxHeight
         ? rows.slice(scrollOffset, scrollOffset + maxHeight)
         : rows.slice(scrollOffset);
-    const lines = [];
-    for (const row of visibleRows) {
-        if (row.type === 'section-header') {
-            const isCommits = row.sectionType === 'commits';
-            const count = isCommits ? commits.length : files.length;
-            const label = isCommits ? 'Commits' : 'Files';
-            lines.push(`{escape}${ANSI_CYAN}${ANSI_BOLD}▼ ${label}${ANSI_RESET} ${ANSI_GRAY}(${count})${ANSI_RESET}{/escape}`);
-        }
-        else if (row.type === 'spacer') {
-            lines.push('');
-        }
-        else if (row.type === 'commit' && row.commit && row.commitIndex !== undefined) {
-            const isSelected = selectedItem?.type === 'commit' && selectedItem.index === row.commitIndex;
-            lines.push(formatCommitRow(row.commit, isSelected, isFocused, width));
-        }
-        else if (row.type === 'directory' && row.treeRow) {
-            lines.push(formatDirectoryRow(row.treeRow, width));
-        }
-        else if (row.type === 'file' && row.file && row.fileIndex !== undefined && row.treeRow) {
-            const isSelected = selectedItem?.type === 'file' && selectedItem.index === row.fileIndex;
-            lines.push(formatFileRow(row.file, row.treeRow, isSelected, isFocused, width));
-        }
-    }
+    const lines = visibleRows
+        .map((row) => formatCompareRow(row, selectedItem, isFocused, commits, files, width))
+        .filter((line) => line !== null);
     return lines.join('\n');
 }
 /**