diffstalker 0.2.3 → 0.2.5

package/dist/state/FocusRing.js

@@ -0,0 +1,40 @@
+/**
+ * Generic ring/cycle data structure for focus zone navigation.
+ * Tab cycles forward, Shift-Tab cycles backward, wrapping at boundaries.
+ */
+export class FocusRing {
+    items;
+    index;
+    constructor(items, initialIndex = 0) {
+        this.items = items;
+        this.index = Math.min(initialIndex, Math.max(0, items.length - 1));
+    }
+    current() {
+        return this.items[this.index];
+    }
+    next() {
+        this.index = (this.index + 1) % this.items.length;
+        return this.items[this.index];
+    }
+    prev() {
+        this.index = (this.index - 1 + this.items.length) % this.items.length;
+        return this.items[this.index];
+    }
+    setCurrent(item) {
+        const idx = this.items.indexOf(item);
+        if (idx === -1)
+            return false;
+        this.index = idx;
+        return true;
+    }
+    setItems(items, defaultItem) {
+        this.items = items;
+        if (defaultItem !== undefined) {
+            const idx = items.indexOf(defaultItem);
+            this.index = idx !== -1 ? idx : 0;
+        }
+        else {
+            this.index = Math.min(this.index, Math.max(0, items.length - 1));
+        }
+    }
+}

package/dist/state/UIState.js

@@ -1,5 +1,36 @@
 import { EventEmitter } from 'node:events';
+import { FocusRing } from './FocusRing.js';
+/** Map each focus zone to its derived currentPane value. */
+export const ZONE_TO_PANE = {
+    fileList: 'files',
+    diffView: 'diff',
+    commitMessage: 'commit',
+    commitAmend: 'commit',
+    historyList: 'history',
+    historyDiff: 'diff',
+    compareList: 'compare',
+    compareDiff: 'diff',
+    explorerTree: 'explorer',
+    explorerContent: 'diff',
+};
+/** Ordered list of focus zones per tab (Tab order). */
+export const TAB_ZONES = {
+    diff: ['fileList', 'diffView'],
+    commit: ['fileList', 'commitMessage', 'commitAmend'],
+    history: ['historyList', 'historyDiff'],
+    compare: ['compareList', 'compareDiff'],
+    explorer: ['explorerTree', 'explorerContent'],
+};
+/** Default focus zone when switching to each tab. */
+export const DEFAULT_TAB_ZONE = {
+    diff: 'fileList',
+    commit: 'commitMessage',
+    history: 'historyList',
+    compare: 'compareList',
+    explorer: 'explorerTree',
+};
 const DEFAULT_STATE = {
+    focusedZone: 'fileList',
     currentPane: 'files',
     bottomTab: 'diff',
     selectedIndex: 0,
@@ -21,8 +52,6 @@ const DEFAULT_STATE = {
     hideGitignored: true,
     flatViewMode: false,
     splitRatio: 0.4,
-    activeModal: null,
-    pendingDiscard: null,
     commitInputFocused: false,
 };
 /**
@@ -31,37 +60,54 @@ const DEFAULT_STATE = {
  */
 export class UIState extends EventEmitter {
     _state;
+    focusRing;
     constructor(initialState = {}) {
         super();
         this._state = { ...DEFAULT_STATE, ...initialState };
+        const tab = this._state.bottomTab;
+        const zones = TAB_ZONES[tab];
+        this.focusRing = new FocusRing(zones);
+        if (this._state.focusedZone) {
+            this.focusRing.setCurrent(this._state.focusedZone);
+        }
+        // Ensure currentPane is in sync
+        this._state.currentPane = ZONE_TO_PANE[this._state.focusedZone];
     }
     get state() {
         return this._state;
     }
     update(partial) {
         this._state = { ...this._state, ...partial };
+        // Derive currentPane from focusedZone
+        this._state.currentPane = ZONE_TO_PANE[this._state.focusedZone];
         this.emit('change', this._state);
     }
     // Navigation
     setPane(pane) {
-        if (this._state.currentPane !== pane) {
-            this.update({ currentPane: pane });
-            this.emit('pane-change', pane);
+        // Map pane to the first matching zone for the current tab
+        const zones = TAB_ZONES[this._state.bottomTab];
+        const zone = zones.find((z) => ZONE_TO_PANE[z] === pane);
+        if (zone) {
+            this.setFocusedZone(zone);
+        }
+    }
+    setFocusedZone(zone) {
+        if (this._state.focusedZone !== zone) {
+            this.focusRing.setCurrent(zone);
+            const oldPane = this._state.currentPane;
+            this.update({ focusedZone: zone });
+            if (this._state.currentPane !== oldPane) {
+                this.emit('pane-change', this._state.currentPane);
+            }
         }
     }
     setTab(tab) {
         if (this._state.bottomTab !== tab) {
-            // Map tab to appropriate pane
-            const paneMap = {
-                diff: 'files',
-                commit: 'commit',
-                history: 'history',
-                compare: 'compare',
-                explorer: 'explorer',
-            };
+            const defaultZone = DEFAULT_TAB_ZONE[tab];
+            this.focusRing.setItems(TAB_ZONES[tab], defaultZone);
             this.update({
                 bottomTab: tab,
-                currentPane: paneMap[tab],
+                focusedZone: defaultZone,
             });
             this.emit('tab-change', tab);
         }
@@ -155,51 +201,39 @@ export class UIState extends EventEmitter {
     setSplitRatio(ratio) {
         this.update({ splitRatio: Math.min(0.85, Math.max(0.15, ratio)) });
     }
-    // Modals
-    openModal(modal) {
-        this.update({ activeModal: modal });
-        this.emit('modal-change', modal);
-    }
-    closeModal() {
-        this.update({ activeModal: null });
-        this.emit('modal-change', null);
-    }
-    toggleModal(modal) {
-        if (this._state.activeModal === modal) {
-            this.closeModal();
-        }
-        else {
-            this.openModal(modal);
-        }
-    }
-    // Discard confirmation
-    setPendingDiscard(file) {
-        this.update({ pendingDiscard: file });
-    }
     // Commit input focus
     setCommitInputFocused(focused) {
         this.update({ commitInputFocused: focused });
     }
-    // Helper for toggling between panes
-    togglePane() {
-        const { bottomTab, currentPane } = this._state;
-        if (bottomTab === 'diff' || bottomTab === 'commit') {
-            this.setPane(currentPane === 'files' ? 'diff' : 'files');
-        }
-        else if (bottomTab === 'history') {
-            this.setPane(currentPane === 'history' ? 'diff' : 'history');
+    // Focus zone cycling
+    advanceFocus() {
+        const zone = this.focusRing.next();
+        const oldPane = this._state.currentPane;
+        this.update({ focusedZone: zone });
+        if (this._state.currentPane !== oldPane) {
+            this.emit('pane-change', this._state.currentPane);
         }
-        else if (bottomTab === 'compare') {
-            this.setPane(currentPane === 'compare' ? 'diff' : 'compare');
-        }
-        else if (bottomTab === 'explorer') {
-            this.setPane(currentPane === 'explorer' ? 'diff' : 'explorer');
+    }
+    retreatFocus() {
+        const zone = this.focusRing.prev();
+        const oldPane = this._state.currentPane;
+        this.update({ focusedZone: zone });
+        if (this._state.currentPane !== oldPane) {
+            this.emit('pane-change', this._state.currentPane);
         }
     }
+    /** Backward compat alias for advanceFocus(). */
+    togglePane() {
+        this.advanceFocus();
+    }
     // Reset repo-specific state when switching repositories
     resetForNewRepo() {
+        const defaultZone = DEFAULT_TAB_ZONE[this._state.bottomTab];
+        this.focusRing.setItems(TAB_ZONES[this._state.bottomTab], defaultZone);
         this._state = {
             ...this._state,
+            focusedZone: defaultZone,
+            currentPane: ZONE_TO_PANE[defaultZone],
             selectedIndex: 0,
             fileListScrollOffset: 0,
             diffScrollOffset: 0,

package/dist/ui/PaneRenderers.js

@@ -31,19 +31,16 @@ 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, branch, remoteState, stashList, headCommit) {
+export function renderBottomPane(state, diff, historyState, compareSelectionState, explorerSelectedFile, commitFlowState, stagedCount, currentTheme, width, bottomPaneHeight, selectedHunkIndex, isFileStaged, combinedFileDiffs, focusedZone) {
     if (state.bottomTab === 'commit') {
         const panelOpts = {
             state: commitFlowState,
             stagedCount,
             width,
-            branch,
-            remoteState,
-            stashList,
-            headCommit,
+            focusedZone,
         };
         const totalRows = getCommitPanelTotalRows(panelOpts);
-        const content = formatCommitPanel(commitFlowState, stagedCount, width, branch, remoteState, stashList, headCommit, state.diffScrollOffset, bottomPaneHeight);
+        const content = formatCommitPanel(commitFlowState, stagedCount, width, state.diffScrollOffset, bottomPaneHeight, focusedZone);
         return { content, totalRows, hunkCount: 0, hunkBoundaries: [] };
     }
     if (state.bottomTab === 'history') {

package/dist/ui/modals/BaseBranchPicker.js

@@ -49,14 +49,14 @@ export class BaseBranchPicker {
         this.render();
     }
     setupKeyHandlers() {
-        this.box.key(['escape', 'q'], () => {
-            this.close();
+        this.box.key(['escape'], () => {
+            this.destroy();
             this.onCancel();
         });
         this.box.key(['enter', 'space'], () => {
             const selected = this.branches[this.selectedIndex];
             if (selected) {
-                this.close();
+                this.destroy();
                 this.onSelect(selected);
             }
         });
@@ -98,12 +98,9 @@ export class BaseBranchPicker {
         this.box.setContent(lines.join('\n'));
         this.screen.render();
     }
-    close() {
+    destroy() {
         this.box.destroy();
     }
-    /**
-     * Focus the modal.
-     */
     focus() {
         this.box.focus();
     }

package/dist/ui/modals/CommitActionConfirm.js

@@ -35,11 +35,11 @@ export class CommitActionConfirm {
     }
     setupKeyHandlers() {
         this.box.key(['y', 'Y'], () => {
-            this.close();
+            this.destroy();
             this.onConfirm();
         });
-        this.box.key(['n', 'N', 'escape', 'q'], () => {
-            this.close();
+        this.box.key(['n', 'N', 'escape'], () => {
+            this.destroy();
             this.onCancel();
         });
     }
@@ -57,7 +57,7 @@ export class CommitActionConfirm {
         this.box.setContent(lines.join('\n'));
         this.screen.render();
     }
-    close() {
+    destroy() {
         this.box.destroy();
     }
     focus() {

package/dist/ui/modals/DiscardConfirm.js

@@ -40,11 +40,11 @@ export class DiscardConfirm {
     }
     setupKeyHandlers() {
         this.box.key(['y', 'Y'], () => {
-            this.close();
+            this.destroy();
             this.onConfirm();
         });
-        this.box.key(['n', 'N', 'escape', 'q'], () => {
-            this.close();
+        this.box.key(['n', 'N', 'escape'], () => {
+            this.destroy();
             this.onCancel();
         });
     }
@@ -65,12 +65,9 @@ export class DiscardConfirm {
         this.box.setContent(lines.join('\n'));
         this.screen.render();
     }
-    close() {
+    destroy() {
         this.box.destroy();
     }
-    /**
-     * Focus the modal.
-     */
     focus() {
         this.box.focus();
     }

package/dist/ui/modals/FileFinder.js

@@ -82,14 +82,14 @@ export class FileFinder {
     setupKeyHandlers() {
         // Handle escape to cancel
         this.textbox.key(['escape'], () => {
-            this.close();
+            this.destroy();
             this.onCancel();
         });
         // Handle enter to select
         this.textbox.key(['enter'], () => {
             if (this.results.length > 0) {
                 const selected = this.results[this.selectedIndex];
-                this.close();
+                this.destroy();
                 this.onSelect(selected.path);
             }
         });
@@ -187,15 +187,12 @@ export class FileFinder {
         this.box.setContent(lines.join('\n'));
         this.screen.render();
     }
-    close() {
+    destroy() {
         if (this.debounceTimer)
             clearTimeout(this.debounceTimer);
         this.textbox.destroy();
         this.box.destroy();
     }
-    /**
-     * Focus the modal input.
-     */
     focus() {
         this.textbox.focus();
     }

package/dist/ui/modals/HotkeysModal.js

@@ -1,10 +1,14 @@
+import { createRequire } from 'node:module';
 import blessed from 'neo-blessed';
+const require = createRequire(import.meta.url);
+const { version } = require('../../../package.json');
 const hotkeyGroups = [
     {
         title: 'Navigation',
         entries: [
             { key: 'j/k', description: 'Move up/down' },
-            { key: 'Tab', description: 'Toggle pane focus' },
+            { key: 'Tab', description: 'Next focus zone' },
+            { key: 'Shift+Tab', description: 'Previous focus zone' },
         ],
     },
     {
@@ -21,12 +25,8 @@ const hotkeyGroups = [
         title: 'Actions',
         entries: [
             { key: 'c', description: 'Commit panel' },
-            { key: 'r', description: 'Refresh' },
+            { key: 'r', description: 'Repo picker' },
             { 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)' },
         ],
     },
     {
@@ -73,10 +73,6 @@ const hotkeyGroups = [
             { 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' },
         ],
     },
     {
@@ -110,6 +106,7 @@ export class HotkeysModal {
     box;
     screen;
     onClose;
+    screenClickHandler = null;
     constructor(screen, onClose) {
         this.screen = screen;
         this.onClose = onClose;
@@ -158,15 +155,16 @@ export class HotkeysModal {
         }
     }
     setupKeyHandlers() {
-        this.box.key(['escape', 'enter', '?', 'q'], () => {
-            this.close();
+        this.box.key(['escape', 'enter'], () => {
+            this.destroy();
             this.onClose();
         });
-        // Close on click anywhere
-        this.box.on('click', () => {
-            this.close();
+        // Close on any mouse click (screen-level catches clicks outside the modal too)
+        this.screenClickHandler = () => {
+            this.destroy();
             this.onClose();
-        });
+        };
+        this.screen.on('click', this.screenClickHandler);
     }
     /**
      * Calculate the visible width of a string (excluding blessed tags).
@@ -214,7 +212,11 @@ export class HotkeysModal {
         }
         // Footer
         lines.push('');
-        lines.push('{gray-fg}Press Esc, Enter, or ? to close{/gray-fg}');
+        const closeHint = 'Press Esc, Enter, ?, or click to close';
+        const versionLabel = `v${version}`;
+        const innerWidth = width - 4; // account for border + padding
+        const gap = Math.max(1, innerWidth - closeHint.length - versionLabel.length);
+        lines.push(`{gray-fg}${closeHint}${' '.repeat(gap)}${versionLabel}{/gray-fg}`);
         this.box.setContent(lines.join('\n'));
         this.screen.render();
     }
@@ -229,12 +231,13 @@ export class HotkeysModal {
         }
         return lines;
     }
-    close() {
+    destroy() {
+        if (this.screenClickHandler) {
+            this.screen.removeListener('click', this.screenClickHandler);
+            this.screenClickHandler = null;
+        }
         this.box.destroy();
     }
-    /**
-     * Focus the modal.
-     */
     focus() {
         this.box.focus();
     }

package/dist/ui/modals/Modal.js

@@ -0,0 +1 @@
+export {};

package/dist/ui/modals/RepoPicker.js

@@ -0,0 +1,109 @@
+import blessed from 'neo-blessed';
+import { abbreviateHomePath } from '../../config.js';
+/**
+ * RepoPicker modal for switching between recently-visited repositories.
+ */
+export class RepoPicker {
+    box;
+    screen;
+    repos;
+    selectedIndex;
+    currentRepo;
+    onSelect;
+    onCancel;
+    constructor(screen, repos, currentRepo, onSelect, onCancel) {
+        this.screen = screen;
+        this.repos = repos;
+        this.currentRepo = currentRepo;
+        this.onSelect = onSelect;
+        this.onCancel = onCancel;
+        // Find current repo index
+        this.selectedIndex = repos.indexOf(currentRepo);
+        if (this.selectedIndex < 0)
+            this.selectedIndex = 0;
+        // Create modal box
+        const screenWidth = screen.width;
+        const width = Math.min(70, screenWidth - 4);
+        const maxVisibleRepos = Math.min(repos.length, 15);
+        const height = maxVisibleRepos + 6; // repos + header + footer + borders + padding
+        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,
+        });
+        // Setup key handlers
+        this.setupKeyHandlers();
+        // Initial render
+        this.render();
+    }
+    setupKeyHandlers() {
+        this.box.key(['escape'], () => {
+            this.destroy();
+            this.onCancel();
+        });
+        this.box.key(['enter', 'space'], () => {
+            const selected = this.repos[this.selectedIndex];
+            if (selected) {
+                this.destroy();
+                this.onSelect(selected);
+            }
+        });
+        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.repos.length - 1, this.selectedIndex + 1);
+            this.render();
+        });
+    }
+    render() {
+        const lines = [];
+        // Header
+        lines.push('{bold}{cyan-fg}     Recent Repositories{/cyan-fg}{/bold}');
+        lines.push('');
+        if (this.repos.length === 0) {
+            lines.push('{gray-fg}No recent repositories{/gray-fg}');
+        }
+        else {
+            // Repo list
+            for (let i = 0; i < this.repos.length; i++) {
+                const repo = this.repos[i];
+                const isSelected = i === this.selectedIndex;
+                const isCurrent = repo === this.currentRepo;
+                let line = isSelected ? '{cyan-fg}{bold}> ' : '  ';
+                line += abbreviateHomePath(repo);
+                if (isSelected)
+                    line += '{/bold}{/cyan-fg}';
+                if (isCurrent)
+                    line += ' {gray-fg}(current){/gray-fg}';
+                lines.push(line);
+            }
+        }
+        // Footer
+        lines.push('');
+        lines.push('{gray-fg}j/k: navigate | Enter: select | Esc: cancel{/gray-fg}');
+        this.box.setContent(lines.join('\n'));
+        this.screen.render();
+    }
+    destroy() {
+        this.box.destroy();
+    }
+    focus() {
+        this.box.focus();
+    }
+}

package/dist/ui/modals/ThemePicker.js

@@ -45,13 +45,13 @@ export class ThemePicker {
         this.render();
     }
     setupKeyHandlers() {
-        this.box.key(['escape', 'q'], () => {
-            this.close();
+        this.box.key(['escape'], () => {
+            this.destroy();
             this.onCancel();
         });
         this.box.key(['enter', 'space'], () => {
             const selected = themeOrder[this.selectedIndex];
-            this.close();
+            this.destroy();
             this.onSelect(selected);
         });
         this.box.key(['up', 'k'], () => {
@@ -94,12 +94,9 @@ export class ThemePicker {
         this.box.setContent(lines.join('\n'));
         this.screen.render();
     }
-    close() {
+    destroy() {
         this.box.destroy();
     }
-    /**
-     * Focus the modal.
-     */
     focus() {
         this.box.focus();
     }