diffstalker 0.2.2 → 0.2.3

package/dist/types/remote.js

@@ -0,0 +1,5 @@
+/**
+ * Shared type for remote operation state (push/fetch/pull).
+ * Lives in types/ so both ui/ and core/ can import it.
+ */
+export {};

package/dist/ui/PaneRenderers.js

@@ -4,7 +4,7 @@ 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 { formatCommitPanel, getCommitPanelTotalRows } from './widgets/CommitPanel.js';
 import { formatExplorerContent } from './widgets/ExplorerContent.js';
 /**
  * Render the top pane content for the current tab.
@@ -31,10 +31,20 @@ export function renderTopPane(state, files, historyCommits, compareDiff, compare
 /**
  * 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) {
+export function renderBottomPane(state, diff, historyState, compareSelectionState, explorerSelectedFile, commitFlowState, stagedCount, currentTheme, width, bottomPaneHeight, selectedHunkIndex, isFileStaged, combinedFileDiffs, branch, remoteState, stashList, headCommit) {
     if (state.bottomTab === 'commit') {
-        const content = formatCommitPanel(commitFlowState, stagedCount, width);
-        return { content, totalRows: 0, hunkCount: 0, hunkBoundaries: [] };
+        const panelOpts = {
+            state: commitFlowState,
+            stagedCount,
+            width,
+            branch,
+            remoteState,
+            stashList,
+            headCommit,
+        };
+        const totalRows = getCommitPanelTotalRows(panelOpts);
+        const content = formatCommitPanel(commitFlowState, stagedCount, width, branch, remoteState, stashList, headCommit, state.diffScrollOffset, bottomPaneHeight);
+        return { content, totalRows, hunkCount: 0, hunkBoundaries: [] };
     }
     if (state.bottomTab === 'history') {
         const selectedCommit = historyState?.selectedCommit ?? null;

package/dist/ui/modals/BranchPicker.js

@@ -0,0 +1,157 @@
+import blessed from 'neo-blessed';
+/**
+ * BranchPicker modal for switching or creating branches.
+ * Text input at top for filtering; branch list below.
+ * If typed name matches no existing branch, shows "Create: <name>" as first option.
+ */
+export class BranchPicker {
+    box;
+    textbox;
+    screen;
+    branches;
+    filteredBranches = [];
+    selectedIndex = 0;
+    query = '';
+    showCreate = false;
+    onSwitch;
+    onCreate;
+    onCancel;
+    constructor(screen, branches, onSwitch, onCreate, onCancel) {
+        this.screen = screen;
+        this.branches = branches;
+        this.onSwitch = onSwitch;
+        this.onCreate = onCreate;
+        this.onCancel = onCancel;
+        this.filteredBranches = branches;
+        const width = Math.min(60, screen.width - 6);
+        const maxVisible = Math.min(branches.length + 1, 15);
+        const height = maxVisible + 7;
+        this.box = blessed.box({
+            parent: screen,
+            top: 'center',
+            left: 'center',
+            width,
+            height,
+            border: {
+                type: 'line',
+            },
+            style: {
+                border: {
+                    fg: 'cyan',
+                },
+            },
+            tags: true,
+            keys: false,
+        });
+        this.textbox = blessed.textarea({
+            parent: this.box,
+            top: 1,
+            left: 1,
+            width: width - 4,
+            height: 1,
+            inputOnFocus: true,
+            style: {
+                fg: 'white',
+                bg: 'default',
+            },
+        });
+        this.setupKeyHandlers();
+        this.render();
+    }
+    setupKeyHandlers() {
+        this.textbox.key(['escape'], () => {
+            this.close();
+            this.onCancel();
+        });
+        this.textbox.key(['enter'], () => {
+            if (this.showCreate && this.selectedIndex === 0) {
+                this.close();
+                this.onCreate(this.query.trim());
+            }
+            else {
+                const adjustedIndex = this.showCreate ? this.selectedIndex - 1 : this.selectedIndex;
+                const branch = this.filteredBranches[adjustedIndex];
+                if (branch && !branch.current) {
+                    this.close();
+                    this.onSwitch(branch.name);
+                }
+            }
+        });
+        this.textbox.key(['C-j', 'down'], () => {
+            const maxIndex = this.filteredBranches.length + (this.showCreate ? 1 : 0) - 1;
+            this.selectedIndex = Math.min(maxIndex, this.selectedIndex + 1);
+            this.render();
+        });
+        this.textbox.key(['C-k', 'up'], () => {
+            this.selectedIndex = Math.max(0, this.selectedIndex - 1);
+            this.render();
+        });
+        this.textbox.on('keypress', () => {
+            setImmediate(() => {
+                const newQuery = this.textbox.getValue() || '';
+                if (newQuery !== this.query) {
+                    this.query = newQuery;
+                    this.selectedIndex = 0;
+                    this.updateFilter();
+                    this.render();
+                }
+            });
+        });
+    }
+    updateFilter() {
+        const q = this.query.trim().toLowerCase();
+        if (!q) {
+            this.filteredBranches = this.branches;
+            this.showCreate = false;
+        }
+        else {
+            this.filteredBranches = this.branches.filter((b) => b.name.toLowerCase().includes(q));
+            // Show create option if no exact match
+            this.showCreate = !this.branches.some((b) => b.name === q);
+        }
+    }
+    render() {
+        const lines = [];
+        lines.push('{bold}{cyan-fg}Switch / Create Branch{/cyan-fg}{/bold}');
+        lines.push(''); // Space for input
+        lines.push('');
+        if (this.showCreate) {
+            const isSelected = this.selectedIndex === 0;
+            if (isSelected) {
+                lines.push(`{green-fg}{bold}> Create: ${this.query.trim()}{/bold}{/green-fg}`);
+            }
+            else {
+                lines.push(`  {green-fg}Create: ${this.query.trim()}{/green-fg}`);
+            }
+        }
+        for (let i = 0; i < this.filteredBranches.length; i++) {
+            const branch = this.filteredBranches[i];
+            const listIndex = this.showCreate ? i + 1 : i;
+            const isSelected = listIndex === this.selectedIndex;
+            let line = isSelected ? '{cyan-fg}{bold}> ' : '  ';
+            if (branch.current) {
+                line += '* ';
+            }
+            line += branch.name;
+            if (isSelected)
+                line += '{/bold}{/cyan-fg}';
+            if (branch.current)
+                line += ' {gray-fg}(current){/gray-fg}';
+            lines.push(line);
+        }
+        if (this.filteredBranches.length === 0 && !this.showCreate) {
+            lines.push('{gray-fg}No matching branches{/gray-fg}');
+        }
+        lines.push('');
+        lines.push('{gray-fg}Enter: select | Esc: cancel | Ctrl+j/k: navigate{/gray-fg}');
+        this.box.setContent(lines.join('\n'));
+        this.screen.render();
+    }
+    close() {
+        this.textbox.destroy();
+        this.box.destroy();
+    }
+    focus() {
+        this.textbox.focus();
+    }
+}

package/dist/ui/modals/CommitActionConfirm.js

@@ -0,0 +1,66 @@
+import blessed from 'neo-blessed';
+/**
+ * CommitActionConfirm modal for confirming cherry-pick or revert.
+ */
+export class CommitActionConfirm {
+    box;
+    screen;
+    onConfirm;
+    onCancel;
+    constructor(screen, verb, commit, onConfirm, onCancel) {
+        this.screen = screen;
+        this.onConfirm = onConfirm;
+        this.onCancel = onCancel;
+        const width = Math.min(60, screen.width - 6);
+        const height = 8;
+        this.box = blessed.box({
+            parent: screen,
+            top: 'center',
+            left: 'center',
+            width,
+            height,
+            border: {
+                type: 'line',
+            },
+            style: {
+                border: {
+                    fg: 'yellow',
+                },
+            },
+            tags: true,
+            keys: true,
+        });
+        this.setupKeyHandlers();
+        this.renderContent(verb, commit, width);
+    }
+    setupKeyHandlers() {
+        this.box.key(['y', 'Y'], () => {
+            this.close();
+            this.onConfirm();
+        });
+        this.box.key(['n', 'N', 'escape', 'q'], () => {
+            this.close();
+            this.onCancel();
+        });
+    }
+    renderContent(verb, commit, width) {
+        const lines = [];
+        const innerWidth = width - 6;
+        lines.push(`{bold}{yellow-fg}     ${verb} commit?{/yellow-fg}{/bold}`);
+        lines.push('');
+        const msg = commit.message.length > innerWidth
+            ? commit.message.slice(0, innerWidth - 3) + '\u2026'
+            : commit.message;
+        lines.push(`{yellow-fg}${commit.shortHash}{/yellow-fg} ${msg}`);
+        lines.push('');
+        lines.push('{gray-fg}Press {/gray-fg}{green-fg}y{/green-fg}{gray-fg} to confirm, {/gray-fg}{red-fg}n{/red-fg}{gray-fg} or Esc to cancel{/gray-fg}');
+        this.box.setContent(lines.join('\n'));
+        this.screen.render();
+    }
+    close() {
+        this.box.destroy();
+    }
+    focus() {
+        this.box.focus();
+    }
+}

package/dist/ui/modals/FileFinder.js

@@ -1,8 +1,9 @@
 import blessed from 'neo-blessed';
 import { Fzf } from 'fzf';
 const MAX_RESULTS = 15;
+const DEBOUNCE_MS = 15;
 /**
- * Highlight matched characters in a display path using fzf position data.
+ * Highlight matched characters in a display path.
  * The positions set refers to indices in the original full path,
  * so we need an offset when the display path is truncated.
  */
@@ -25,19 +26,20 @@ export class FileFinder {
     box;
     textbox;
     screen;
-    fzf;
     allPaths;
     results = [];
     selectedIndex = 0;
     query = '';
     onSelect;
     onCancel;
+    debounceTimer = null;
+    fzf;
     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;
+        this.fzf = new Fzf(allPaths, { limit: MAX_RESULTS, casing: 'smart-case' });
         // Create modal box
         const width = Math.min(80, screen.width - 10);
         const height = MAX_RESULTS + 6; // results + input + header + borders + padding
@@ -73,9 +75,9 @@ export class FileFinder {
         });
         // Setup key handlers
         this.setupKeyHandlers();
-        // Initial render with all files
+        // Initial render with first N files
         this.updateResults();
-        this.render();
+        this.renderContent();
     }
     setupKeyHandlers() {
         // Handle escape to cancel
@@ -88,54 +90,59 @@ export class FileFinder {
             if (this.results.length > 0) {
                 const selected = this.results[this.selectedIndex];
                 this.close();
-                this.onSelect(selected.item);
+                this.onSelect(selected.path);
             }
         });
         // 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.renderContent();
         });
         this.textbox.key(['C-k', 'up'], () => {
             this.selectedIndex = Math.max(0, this.selectedIndex - 1);
-            this.render();
+            this.renderContent();
         });
         // Handle tab for next result
         this.textbox.key(['tab'], () => {
             this.selectedIndex = (this.selectedIndex + 1) % Math.max(1, this.results.length);
-            this.render();
+            this.renderContent();
         });
         // 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();
+            this.renderContent();
         });
-        // Update results on keypress
+        // Update results on keypress with debounce
         this.textbox.on('keypress', () => {
-            // Defer to next tick to get updated value
-            setImmediate(() => {
+            if (this.debounceTimer)
+                clearTimeout(this.debounceTimer);
+            this.debounceTimer = setTimeout(() => {
                 const newQuery = this.textbox.getValue() || '';
                 if (newQuery !== this.query) {
                     this.query = newQuery;
                     this.selectedIndex = 0;
                     this.updateResults();
-                    this.render();
+                    this.renderContent();
                 }
-            });
+            }, DEBOUNCE_MS);
         });
     }
     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 }));
+                .map((p) => ({ path: p, positions: new Set(), score: 0 }));
             return;
         }
-        this.results = this.fzf.find(this.query);
+        const entries = this.fzf.find(this.query);
+        this.results = entries.map((entry) => ({
+            path: entry.item,
+            score: entry.score,
+            positions: entry.positions,
+        }));
     }
-    render() {
+    renderContent() {
         const lines = [];
         const width = this.box.width - 4;
         // Header
@@ -151,7 +158,7 @@ export class FileFinder {
                 const result = this.results[i];
                 const isSelected = i === this.selectedIndex;
                 // Truncate path if needed
-                const fullPath = result.item;
+                const fullPath = result.path;
                 const maxLen = width - 4;
                 let displayPath = fullPath;
                 let offset = 0;
@@ -161,7 +168,7 @@ export class FileFinder {
                     // Account for the '…' prefix: display index 0 is '…', actual content starts at 1
                     offset = offset - 1;
                 }
-                // Highlight matched characters using fzf positions
+                // Highlight matched characters
                 const highlighted = highlightMatch(displayPath, result.positions, offset);
                 if (isSelected) {
                     lines.push(`{cyan-fg}{bold}> ${highlighted}{/bold}{/cyan-fg}`);
@@ -181,6 +188,8 @@ export class FileFinder {
         this.screen.render();
     }
     close() {
+        if (this.debounceTimer)
+            clearTimeout(this.debounceTimer);
         this.textbox.destroy();
         this.box.destroy();
     }

package/dist/ui/modals/HotkeysModal.js

@@ -23,6 +23,10 @@ const hotkeyGroups = [
             { key: 'c', description: 'Commit panel' },
             { key: 'r', description: 'Refresh' },
             { key: 'q', description: 'Quit' },
+            { key: 'P', description: 'Push to remote' },
+            { key: 'F', description: 'Fetch from remote' },
+            { key: 'R', description: 'Pull --rebase' },
+            { key: 'S', description: 'Stash save (global)' },
         ],
     },
     {
@@ -63,6 +67,25 @@ const hotkeyGroups = [
             { key: 'g', description: 'Show changes only' },
         ],
     },
+    {
+        title: 'Commit Panel',
+        entries: [
+            { key: 'i/Enter', description: 'Edit message' },
+            { key: 'a', description: 'Toggle amend' },
+            { key: 'Ctrl+a', description: 'Toggle amend (typing)' },
+            { key: 'o', description: 'Pop stash' },
+            { key: 'l', description: 'Stash list modal' },
+            { key: 'b', description: 'Branch picker' },
+            { key: 'X', description: 'Soft reset HEAD~1' },
+        ],
+    },
+    {
+        title: 'History',
+        entries: [
+            { key: 'p', description: 'Cherry-pick commit' },
+            { key: 'v', description: 'Revert commit' },
+        ],
+    },
     {
         title: 'Compare',
         entries: [

package/dist/ui/modals/SoftResetConfirm.js

@@ -0,0 +1,68 @@
+import blessed from 'neo-blessed';
+/**
+ * SoftResetConfirm modal for confirming soft reset HEAD~1.
+ */
+export class SoftResetConfirm {
+    box;
+    screen;
+    onConfirm;
+    onCancel;
+    constructor(screen, headCommit, onConfirm, onCancel) {
+        this.screen = screen;
+        this.onConfirm = onConfirm;
+        this.onCancel = onCancel;
+        const width = Math.min(60, screen.width - 6);
+        const height = 9;
+        this.box = blessed.box({
+            parent: screen,
+            top: 'center',
+            left: 'center',
+            width,
+            height,
+            border: {
+                type: 'line',
+            },
+            style: {
+                border: {
+                    fg: 'yellow',
+                },
+            },
+            tags: true,
+            keys: true,
+        });
+        this.setupKeyHandlers();
+        this.renderContent(headCommit, width);
+    }
+    setupKeyHandlers() {
+        this.box.key(['y', 'Y'], () => {
+            this.close();
+            this.onConfirm();
+        });
+        this.box.key(['n', 'N', 'escape', 'q'], () => {
+            this.close();
+            this.onCancel();
+        });
+    }
+    renderContent(commit, width) {
+        const lines = [];
+        const innerWidth = width - 6;
+        lines.push('{bold}{yellow-fg}     Soft Reset HEAD~1?{/yellow-fg}{/bold}');
+        lines.push('');
+        const msg = commit.message.length > innerWidth
+            ? commit.message.slice(0, innerWidth - 3) + '\u2026'
+            : commit.message;
+        lines.push(`{yellow-fg}${commit.shortHash}{/yellow-fg} ${msg}`);
+        lines.push('');
+        lines.push('{gray-fg}Changes will return to staged state{/gray-fg}');
+        lines.push('');
+        lines.push('{gray-fg}Press {/gray-fg}{green-fg}y{/green-fg}{gray-fg} to confirm, {/gray-fg}{red-fg}n{/red-fg}{gray-fg} or Esc to cancel{/gray-fg}');
+        this.box.setContent(lines.join('\n'));
+        this.screen.render();
+    }
+    close() {
+        this.box.destroy();
+    }
+    focus() {
+        this.box.focus();
+    }
+}

package/dist/ui/modals/StashListModal.js

@@ -0,0 +1,98 @@
+import blessed from 'neo-blessed';
+/**
+ * StashListModal shows stash entries and allows popping one.
+ */
+export class StashListModal {
+    box;
+    screen;
+    entries;
+    selectedIndex = 0;
+    onPop;
+    onCancel;
+    constructor(screen, entries, onPop, onCancel) {
+        this.screen = screen;
+        this.entries = entries;
+        this.onPop = onPop;
+        this.onCancel = onCancel;
+        // Create modal box
+        const width = Math.min(70, screen.width - 6);
+        const maxVisible = Math.min(entries.length, 15);
+        const height = maxVisible + 6;
+        this.box = blessed.box({
+            parent: screen,
+            top: 'center',
+            left: 'center',
+            width,
+            height,
+            border: {
+                type: 'line',
+            },
+            style: {
+                border: {
+                    fg: 'cyan',
+                },
+            },
+            tags: true,
+            keys: true,
+            scrollable: true,
+            alwaysScroll: true,
+        });
+        this.setupKeyHandlers();
+        this.render();
+    }
+    setupKeyHandlers() {
+        this.box.key(['escape', 'q'], () => {
+            this.close();
+            this.onCancel();
+        });
+        this.box.key(['enter'], () => {
+            if (this.entries.length > 0) {
+                const index = this.entries[this.selectedIndex].index;
+                this.close();
+                this.onPop(index);
+            }
+        });
+        this.box.key(['up', 'k'], () => {
+            this.selectedIndex = Math.max(0, this.selectedIndex - 1);
+            this.render();
+        });
+        this.box.key(['down', 'j'], () => {
+            this.selectedIndex = Math.min(this.entries.length - 1, this.selectedIndex + 1);
+            this.render();
+        });
+    }
+    render() {
+        const lines = [];
+        const width = this.box.width - 4;
+        lines.push('{bold}{cyan-fg}     Stash List{/cyan-fg}{/bold}');
+        lines.push('');
+        if (this.entries.length === 0) {
+            lines.push('{gray-fg}No stash entries{/gray-fg}');
+        }
+        else {
+            for (let i = 0; i < this.entries.length; i++) {
+                const entry = this.entries[i];
+                const isSelected = i === this.selectedIndex;
+                const msg = entry.message.length > width - 10
+                    ? entry.message.slice(0, width - 13) + '\u2026'
+                    : entry.message;
+                if (isSelected) {
+                    lines.push(`{cyan-fg}{bold}> {${i}} ${msg}{/bold}{/cyan-fg}`);
+                }
+                else {
+                    lines.push(`  {gray-fg}{${i}}{/gray-fg} ${msg}`);
+                }
+            }
+        }
+        lines.push('');
+        lines.push('{gray-fg}j/k: navigate | Enter: pop | Esc: cancel{/gray-fg}');
+        this.box.setContent(lines.join('\n'));
+        this.screen.render();
+    }
+    close() {
+        this.box.destroy();
+    }
+    focus() {
+        this.box.focus();
+    }
+}