diffstalker 0.2.1 → 0.2.3

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)' },
         ],
     },
     {
@@ -45,6 +49,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 +62,28 @@ 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' },
+        ],
+    },
+    {
+        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' },
         ],
     },
     {
@@ -67,8 +94,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 +218,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/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();
+    }
+}

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

@@ -1,7 +1,8 @@
 /**
- * Format the commit panel as blessed-compatible tagged string.
+ * Build all lines for the commit panel (used for both rendering and totalRows).
  */
-export function formatCommitPanel(state, stagedCount, width) {
+export function buildCommitPanelLines(opts) {
+    const { state, stagedCount, width, branch, remoteState, stashList, headCommit } = opts;
     const lines = [];
     // Title
     let title = '{bold}Commit Message{/bold}';
@@ -11,7 +12,6 @@ export function formatCommitPanel(state, stagedCount, width) {
     lines.push(title);
     lines.push('');
     // Message input area
-    const borderChar = state.inputFocused ? '\u2502' : '\u2502';
     const borderColor = state.inputFocused ? 'cyan' : 'gray';
     // Top border
     const innerWidth = Math.max(20, width - 6);
@@ -24,7 +24,7 @@ export function formatCommitPanel(state, stagedCount, width) {
     const truncatedMessage = displayMessage.length > innerWidth
         ? displayMessage.slice(0, innerWidth - 1) + '\u2026'
         : displayMessage.padEnd(innerWidth);
-    lines.push(`{${borderColor}-fg}${borderChar}{/${borderColor}-fg} ${messageColor}${truncatedMessage}${messageEnd} {${borderColor}-fg}${borderChar}{/${borderColor}-fg}`);
+    lines.push(`{${borderColor}-fg}\u2502{/${borderColor}-fg} ${messageColor}${truncatedMessage}${messageEnd} {${borderColor}-fg}\u2502{/${borderColor}-fg}`);
     // Bottom border
     lines.push(`{${borderColor}-fg}\u2514${'─'.repeat(innerWidth + 2)}\u2518{/${borderColor}-fg}`);
     lines.push('');
@@ -45,10 +45,116 @@ export function formatCommitPanel(state, stagedCount, width) {
     lines.push('');
     // Help text
     const helpText = state.inputFocused
-        ? 'Enter: commit | Esc: unfocus'
-        : 'i/Enter: edit | Esc: cancel | a: toggle amend';
+        ? 'Enter: commit | Ctrl+a: amend | Esc: unfocus'
+        : 'i/Enter: edit | a: amend | Esc: back';
     lines.push(`{gray-fg}Staged: ${stagedCount} file(s) | ${helpText}{/gray-fg}`);
-    return lines.join('\n');
+    // Stash section
+    const stashEntries = stashList ?? [];
+    lines.push('');
+    lines.push(`{gray-fg}${'─'.repeat(3)} Stash (${stashEntries.length}) ${'─'.repeat(3)}{/gray-fg}`);
+    if (stashEntries.length > 0) {
+        const maxShow = 5;
+        for (let i = 0; i < Math.min(stashEntries.length, maxShow); i++) {
+            const entry = stashEntries[i];
+            const msg = entry.message.length > width - 10
+                ? entry.message.slice(0, width - 13) + '\u2026'
+                : entry.message;
+            lines.push(`{gray-fg}{${i}}{/gray-fg}: ${msg}`);
+        }
+        if (stashEntries.length > maxShow) {
+            lines.push(`{gray-fg}... ${stashEntries.length - maxShow} more{/gray-fg}`);
+        }
+    }
+    else {
+        lines.push('{gray-fg}(empty){/gray-fg}');
+    }
+    lines.push('{gray-fg}S: save | o: pop | l: list{/gray-fg}');
+    // Branch section
+    if (branch) {
+        lines.push('');
+        lines.push(`{gray-fg}${'─'.repeat(3)} Branch ${'─'.repeat(3)}{/gray-fg}`);
+        let branchLine = `{bold}* ${branch.current}{/bold}`;
+        if (branch.tracking) {
+            branchLine += ` {gray-fg}\u2192{/gray-fg} ${branch.tracking}`;
+        }
+        lines.push(branchLine);
+        lines.push('{gray-fg}b: switch/create{/gray-fg}');
+    }
+    // Undo section
+    lines.push('');
+    lines.push(`{gray-fg}${'─'.repeat(3)} Undo ${'─'.repeat(3)}{/gray-fg}`);
+    if (headCommit) {
+        lines.push(`{gray-fg}HEAD: {yellow-fg}${headCommit.shortHash}{/yellow-fg} ${headCommit.message}{/gray-fg}`);
+    }
+    lines.push('{gray-fg}X: soft reset HEAD~1{/gray-fg}');
+    // Remote section
+    if (branch) {
+        lines.push('');
+        lines.push(`{gray-fg}${'─'.repeat(3)} Remote ${'─'.repeat(3)}{/gray-fg}`);
+        // Tracking info
+        if (branch.tracking) {
+            let tracking = `${branch.current} {gray-fg}\u2192{/gray-fg} ${branch.tracking}`;
+            if (branch.ahead > 0)
+                tracking += ` {green-fg}\u2191${branch.ahead}{/green-fg}`;
+            if (branch.behind > 0)
+                tracking += ` {red-fg}\u2193${branch.behind}{/red-fg}`;
+            lines.push(tracking);
+        }
+        else {
+            lines.push(`{gray-fg}${branch.current} (no remote tracking){/gray-fg}`);
+        }
+        // Remote status
+        if (remoteState?.inProgress && remoteState.operation) {
+            const labels = {
+                push: 'Pushing...',
+                fetch: 'Fetching...',
+                pull: 'Rebasing...',
+                stash: 'Stashing...',
+                stashPop: 'Popping stash...',
+                branchSwitch: 'Switching branch...',
+                branchCreate: 'Creating branch...',
+                softReset: 'Resetting...',
+                cherryPick: 'Cherry-picking...',
+                revert: 'Reverting...',
+            };
+            lines.push(`{yellow-fg}${labels[remoteState.operation] ?? ''}{/yellow-fg}`);
+        }
+        else if (remoteState?.error) {
+            const brief = remoteState.error.length > 50
+                ? remoteState.error.slice(0, 50) + '\u2026'
+                : remoteState.error;
+            lines.push(`{red-fg}${brief}{/red-fg}`);
+        }
+        else if (remoteState?.lastResult) {
+            lines.push(`{green-fg}${remoteState.lastResult}{/green-fg}`);
+        }
+        lines.push('{gray-fg}P: push | F: fetch | R: pull --rebase{/gray-fg}');
+    }
+    return lines;
+}
+/**
+ * Get total row count for the commit panel (for scroll calculations).
+ */
+export function getCommitPanelTotalRows(opts) {
+    return buildCommitPanelLines(opts).length;
+}
+/**
+ * Format the commit panel as blessed-compatible tagged string.
+ */
+export function formatCommitPanel(state, stagedCount, width, branch, remoteState, stashList, headCommit, scrollOffset = 0, visibleHeight) {
+    const allLines = buildCommitPanelLines({
+        state,
+        stagedCount,
+        width,
+        branch,
+        remoteState,
+        stashList,
+        headCommit,
+    });
+    if (visibleHeight && allLines.length > visibleHeight) {
+        return allLines.slice(scrollOffset, scrollOffset + visibleHeight).join('\n');
+    }
+    return allLines.join('\n');
 }
 /**
  * Format inactive commit panel.

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');
 }
 /**