diffstalker 0.2.0 → 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,12 +13,13 @@ const DEFAULT_STATE = {
     compareSelectedIndex: 0,
     includeUncommitted: false,
     explorerSelectedIndex: 0,
+    selectedHunkIndex: 0,
     wrapMode: false,
     autoTabEnabled: false,
     mouseEnabled: true,
-    showMiddleDots: false,
     hideHiddenFiles: true,
     hideGitignored: true,
+    flatViewMode: false,
     splitRatio: 0.4,
     activeModal: null,
     pendingDiscard: null,
@@ -111,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 });
@@ -121,15 +138,15 @@ export class UIState extends EventEmitter {
     toggleMouse() {
         this.update({ mouseEnabled: !this._state.mouseEnabled });
     }
-    toggleMiddleDots() {
-        this.update({ showMiddleDots: !this._state.showMiddleDots });
-    }
     toggleHideHiddenFiles() {
         this.update({ hideHiddenFiles: !this._state.hideHiddenFiles });
     }
     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));
@@ -179,4 +196,22 @@ export class UIState extends EventEmitter {
             this.setPane(currentPane === 'explorer' ? 'diff' : 'explorer');
         }
     }
+    // Reset repo-specific state when switching repositories
+    resetForNewRepo() {
+        this._state = {
+            ...this._state,
+            selectedIndex: 0,
+            fileListScrollOffset: 0,
+            diffScrollOffset: 0,
+            historySelectedIndex: 0,
+            historyScrollOffset: 0,
+            compareSelectedIndex: 0,
+            compareScrollOffset: 0,
+            explorerSelectedIndex: 0,
+            explorerScrollOffset: 0,
+            explorerFileScrollOffset: 0,
+            selectedHunkIndex: 0,
+        };
+        this.emit('change', this._state);
+    }
 }

package/dist/ui/PaneRenderers.js

@@ -0,0 +1,76 @@
+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, 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, hunkCounts, flatFiles) {
+    if (state.bottomTab === 'history') {
+        return formatHistoryView(historyCommits, state.historySelectedIndex, state.currentPane === 'history', width, state.historyScrollOffset, topPaneHeight);
+    }
+    if (state.bottomTab === 'compare') {
+        const commits = compareDiff?.commits ?? [];
+        const compareFiles = compareDiff?.files ?? [];
+        return formatCompareListView(commits, compareFiles, compareSelection, state.currentPane === 'compare', width, state.compareScrollOffset, topPaneHeight);
+    }
+    if (state.bottomTab === 'explorer') {
+        const displayRows = explorerState?.displayRows ?? [];
+        return formatExplorerView(displayRows, state.explorerSelectedIndex, state.currentPane === 'explorer', width, state.explorerScrollOffset, topPaneHeight, explorerState?.isLoading ?? false, explorerState?.error ?? null);
+    }
+    // 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, selectedHunkIndex, isFileStaged, combinedFileDiffs) {
+    if (state.bottomTab === 'commit') {
+        const content = formatCommitPanel(commitFlowState, stagedCount, width);
+        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, 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, hunkCount: 0, hunkBoundaries: [] };
+        }
+        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, 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 — 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

@@ -0,0 +1,193 @@
+import blessed from 'neo-blessed';
+import { Fzf } from 'fzf';
+const MAX_RESULTS = 15;
+/**
+ * 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 highlightMatch(displayPath, positions, offset) {
+    let result = '';
+    for (let i = 0; i < displayPath.length; i++) {
+        if (positions.has(i + offset)) {
+            result += `{yellow-fg}${displayPath[i]}{/yellow-fg}`;
+        }
+        else {
+            result += displayPath[i];
+        }
+    }
+    return result;
+}
+/**
+ * FileFinder modal for fuzzy file search.
+ */
+export class FileFinder {
+    box;
+    textbox;
+    screen;
+    fzf;
+    allPaths;
+    results = [];
+    selectedIndex = 0;
+    query = '';
+    onSelect;
+    onCancel;
+    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
+        const width = Math.min(80, screen.width - 10);
+        const height = MAX_RESULTS + 6; // results + input + header + borders + padding
+        this.box = blessed.box({
+            parent: screen,
+            top: 'center',
+            left: 'center',
+            width,
+            height,
+            border: {
+                type: 'line',
+            },
+            style: {
+                border: {
+                    fg: 'cyan',
+                },
+            },
+            tags: true,
+            keys: false, // We'll handle keys ourselves
+        });
+        // Create text input
+        this.textbox = blessed.textarea({
+            parent: this.box,
+            top: 1,
+            left: 1,
+            width: width - 4,
+            height: 1,
+            inputOnFocus: true,
+            style: {
+                fg: 'white',
+                bg: 'default',
+            },
+        });
+        // Setup key handlers
+        this.setupKeyHandlers();
+        // Initial render with all files
+        this.updateResults();
+        this.render();
+    }
+    setupKeyHandlers() {
+        // Handle escape to cancel
+        this.textbox.key(['escape'], () => {
+            this.close();
+            this.onCancel();
+        });
+        // Handle enter to select
+        this.textbox.key(['enter'], () => {
+            if (this.results.length > 0) {
+                const selected = this.results[this.selectedIndex];
+                this.close();
+                this.onSelect(selected.item);
+            }
+        });
+        // Handle up/down for navigation (Ctrl+j/k since j/k are for typing)
+        this.textbox.key(['C-j', 'down'], () => {
+            this.selectedIndex = Math.min(this.results.length - 1, this.selectedIndex + 1);
+            this.render();
+        });
+        this.textbox.key(['C-k', 'up'], () => {
+            this.selectedIndex = Math.max(0, this.selectedIndex - 1);
+            this.render();
+        });
+        // Handle tab for next result
+        this.textbox.key(['tab'], () => {
+            this.selectedIndex = (this.selectedIndex + 1) % Math.max(1, this.results.length);
+            this.render();
+        });
+        // Handle shift-tab for previous result
+        this.textbox.key(['S-tab'], () => {
+            this.selectedIndex =
+                (this.selectedIndex - 1 + this.results.length) % Math.max(1, this.results.length);
+            this.render();
+        });
+        // Update results on keypress
+        this.textbox.on('keypress', () => {
+            // Defer to next tick to get updated value
+            setImmediate(() => {
+                const newQuery = this.textbox.getValue() || '';
+                if (newQuery !== this.query) {
+                    this.query = newQuery;
+                    this.selectedIndex = 0;
+                    this.updateResults();
+                    this.render();
+                }
+            });
+        });
+    }
+    updateResults() {
+        if (!this.query) {
+            // 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;
+        }
+        this.results = this.fzf.find(this.query);
+    }
+    render() {
+        const lines = [];
+        const width = this.box.width - 4;
+        // Header
+        lines.push('{bold}{cyan-fg}Find File{/cyan-fg}{/bold}');
+        lines.push(''); // Space for input
+        lines.push('');
+        // Results
+        if (this.results.length === 0 && this.query) {
+            lines.push('{gray-fg}No matches{/gray-fg}');
+        }
+        else {
+            for (let i = 0; i < this.results.length; i++) {
+                const result = this.results[i];
+                const isSelected = i === this.selectedIndex;
+                // Truncate path if needed
+                const fullPath = result.item;
+                const maxLen = width - 4;
+                let displayPath = fullPath;
+                let offset = 0;
+                if (displayPath.length > maxLen) {
+                    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 using fzf positions
+                const highlighted = highlightMatch(displayPath, result.positions, offset);
+                if (isSelected) {
+                    lines.push(`{cyan-fg}{bold}> ${highlighted}{/bold}{/cyan-fg}`);
+                }
+                else {
+                    lines.push(`  ${highlighted}`);
+                }
+            }
+        }
+        // Pad to fill space
+        while (lines.length < MAX_RESULTS + 3) {
+            lines.push('');
+        }
+        // Footer
+        lines.push('{gray-fg}Enter: select | Esc: cancel | Ctrl+j/k or ↑↓: navigate{/gray-fg}');
+        this.box.setContent(lines.join('\n'));
+        this.screen.render();
+    }
+    close() {
+        this.textbox.destroy();
+        this.box.destroy();
+    }
+    /**
+     * Focus the modal input.
+     */
+    focus() {
+        this.textbox.focus();
+    }
+}

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);