diffstalker 0.2.2 → 0.2.3

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 = '\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/Header.js

@@ -38,7 +38,7 @@ function computeBranchVisibleLength(branch) {
 /**
  * Format header content as blessed-compatible tagged string.
  */
-export function formatHeader(repoPath, branch, isLoading, error, width) {
+export function formatHeader(repoPath, branch, isLoading, error, width, remoteState) {
     if (!repoPath) {
         return '{gray-fg}Waiting for target path...{/gray-fg}';
     }
@@ -55,6 +55,39 @@ export function formatHeader(repoPath, branch, isLoading, error, width) {
     else if (error) {
         leftContent += ` {red-fg}(${error}){/red-fg}`;
     }
+    // Remote operation status (shown after left content)
+    let remoteStatus = '';
+    let remoteStatusLen = 0;
+    if (remoteState) {
+        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...',
+            };
+            const label = labels[remoteState.operation] ?? '';
+            remoteStatus = ` {yellow-fg}${label}{/yellow-fg}`;
+            remoteStatusLen = 1 + label.length;
+        }
+        else if (remoteState.error) {
+            const brief = remoteState.error.length > 40
+                ? remoteState.error.slice(0, 40) + '\u2026'
+                : remoteState.error;
+            remoteStatus = ` {red-fg}${brief}{/red-fg}`;
+            remoteStatusLen = 1 + brief.length;
+        }
+        else if (remoteState.lastResult) {
+            remoteStatus = ` {green-fg}${remoteState.lastResult}{/green-fg}`;
+            remoteStatusLen = 1 + remoteState.lastResult.length;
+        }
+    }
     // Build right side content (branch info)
     const rightContent = branch ? formatBranch(branch) : '';
     if (rightContent) {
@@ -68,9 +101,10 @@ export function formatHeader(repoPath, branch, isLoading, error, width) {
         else if (error) {
             leftLen += error.length + 3; // " (error)"
         }
+        leftLen += remoteStatusLen;
         const rightLen = branch ? computeBranchVisibleLength(branch) : 0;
         const padding = Math.max(1, width - leftLen - rightLen - 2);
-        return leftContent + ' '.repeat(padding) + rightContent;
+        return leftContent + remoteStatus + ' '.repeat(padding) + rightContent;
     }
-    return leftContent;
+    return leftContent + remoteStatus;
 }

package/metrics/v0.2.3.json

@@ -0,0 +1,243 @@
+{
+  "timestamp": "2026-02-06T18:38:55.083Z",
+  "gitRef": "v0.2.3",
+  "gitSha": "11ba9fc",
+  "summary": {
+    "files": 82,
+    "lines": 16165,
+    "functions": 1146,
+    "avgCyclomaticComplexity": 5.1,
+    "maxCyclomaticComplexity": {
+      "value": 42,
+      "function": "buildDiffDisplayRows",
+      "file": "src/utils/displayRows.ts:112"
+    },
+    "avgCognitiveComplexity": 6.5,
+    "maxCognitiveComplexity": {
+      "value": 68,
+      "function": "buildDiffDisplayRows",
+      "file": "src/utils/displayRows.ts:112"
+    },
+    "smells": 0
+  },
+  "hotspots": [
+    {
+      "file": "src/utils/displayRows.ts",
+      "lines": 567,
+      "cyclomaticMax": 42,
+      "cognitiveMax": 68,
+      "smells": 0
+    },
+    {
+      "file": "src/ui/widgets/CommitPanel.ts",
+      "lines": 217,
+      "cyclomaticMax": 34,
+      "cognitiveMax": 42,
+      "smells": 0
+    },
+    {
+      "file": "src/App.ts",
+      "lines": 1548,
+      "cyclomaticMax": 31,
+      "cognitiveMax": 13,
+      "smells": 0
+    },
+    {
+      "file": "src/utils/flatFileList.ts",
+      "lines": 100,
+      "cyclomaticMax": 29,
+      "cognitiveMax": 14,
+      "smells": 0
+    },
+    {
+      "file": "src/git/diff.ts",
+      "lines": 656,
+      "cyclomaticMax": 26,
+      "cognitiveMax": 41,
+      "smells": 0
+    },
+    {
+      "file": "src/git/status.ts",
+      "lines": 392,
+      "cyclomaticMax": 22,
+      "cognitiveMax": 25,
+      "smells": 0
+    },
+    {
+      "file": "src/ui/PaneRenderers.ts",
+      "lines": 249,
+      "cyclomaticMax": 20,
+      "cognitiveMax": 8,
+      "smells": 0
+    },
+    {
+      "file": "src/ui/widgets/ExplorerContent.ts",
+      "lines": 130,
+      "cyclomaticMax": 20,
+      "cognitiveMax": 24,
+      "smells": 0
+    },
+    {
+      "file": "src/ui/widgets/Header.ts",
+      "lines": 134,
+      "cyclomaticMax": 18,
+      "cognitiveMax": 22,
+      "smells": 0
+    },
+    {
+      "file": "src/MouseHandlers.ts",
+      "lines": 268,
+      "cyclomaticMax": 17,
+      "cognitiveMax": 15,
+      "smells": 0
+    },
+    {
+      "file": "src/ipc/CommandServer.ts",
+      "lines": 266,
+      "cyclomaticMax": 17,
+      "cognitiveMax": 6,
+      "smells": 0
+    },
+    {
+      "file": "src/index.ts",
+      "lines": 178,
+      "cyclomaticMax": 16,
+      "cognitiveMax": 17,
+      "smells": 0
+    },
+    {
+      "file": "src/ui/widgets/ExplorerView.ts",
+      "lines": 245,
+      "cyclomaticMax": 16,
+      "cognitiveMax": 21,
+      "smells": 0
+    },
+    {
+      "file": "src/utils/ansiTruncate.ts",
+      "lines": 123,
+      "cyclomaticMax": 16,
+      "cognitiveMax": 24,
+      "smells": 0
+    },
+    {
+      "file": "src/ui/widgets/DiffView.ts",
+      "lines": 511,
+      "cyclomaticMax": 15,
+      "cognitiveMax": 12,
+      "smells": 0
+    },
+    {
+      "file": "src/ui/widgets/CompareListView.ts",
+      "lines": 383,
+      "cyclomaticMax": 14,
+      "cognitiveMax": 16,
+      "smells": 0
+    },
+    {
+      "file": "src/utils/diffRowCalculations.ts",
+      "lines": 136,
+      "cyclomaticMax": 13,
+      "cognitiveMax": 24,
+      "smells": 0
+    },
+    {
+      "file": "src/core/ExplorerStateManager.ts",
+      "lines": 727,
+      "cyclomaticMax": 12,
+      "cognitiveMax": 15,
+      "smells": 0
+    },
+    {
+      "file": "src/ui/widgets/FileList.ts",
+      "lines": 215,
+      "cyclomaticMax": 12,
+      "cognitiveMax": 12,
+      "smells": 0
+    },
+    {
+      "file": "src/utils/lineBreaking.ts",
+      "lines": 114,
+      "cyclomaticMax": 12,
+      "cognitiveMax": 17,
+      "smells": 0
+    },
+    {
+      "file": "src/ui/modals/BranchPicker.ts",
+      "lines": 185,
+      "cyclomaticMax": 11,
+      "cognitiveMax": 17,
+      "smells": 0
+    },
+    {
+      "file": "src/config.ts",
+      "lines": 107,
+      "cyclomaticMax": 10,
+      "cognitiveMax": 13,
+      "smells": 0
+    },
+    {
+      "file": "src/state/UIState.ts",
+      "lines": 307,
+      "cyclomaticMax": 10,
+      "cognitiveMax": 12,
+      "smells": 0
+    },
+    {
+      "file": "src/KeyBindings.ts",
+      "lines": 373,
+      "cyclomaticMax": 9,
+      "cognitiveMax": 15,
+      "smells": 0
+    },
+    {
+      "file": "src/core/GitStateManager.ts",
+      "lines": 989,
+      "cyclomaticMax": 9,
+      "cognitiveMax": 12,
+      "smells": 0
+    },
+    {
+      "file": "src/ui/widgets/HistoryView.ts",
+      "lines": 97,
+      "cyclomaticMax": 9,
+      "cognitiveMax": 12,
+      "smells": 0
+    },
+    {
+      "file": "src/utils/formatPath.ts",
+      "lines": 72,
+      "cyclomaticMax": 9,
+      "cognitiveMax": 11,
+      "smells": 0
+    },
+    {
+      "file": "src/utils/explorerDisplayRows.ts",
+      "lines": 206,
+      "cyclomaticMax": 8,
+      "cognitiveMax": 15,
+      "smells": 0
+    },
+    {
+      "file": "src/ui/modals/FileFinder.ts",
+      "lines": 238,
+      "cyclomaticMax": 7,
+      "cognitiveMax": 13,
+      "smells": 0
+    },
+    {
+      "file": "src/ui/modals/BaseBranchPicker.ts",
+      "lines": 134,
+      "cyclomaticMax": 6,
+      "cognitiveMax": 13,
+      "smells": 0
+    },
+    {
+      "file": "src/ui/modals/StashListModal.ts",
+      "lines": 122,
+      "cyclomaticMax": 5,
+      "cognitiveMax": 11,
+      "smells": 0
+    }
+  ],
+  "smellsByRule": {}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "diffstalker",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "Terminal application that displays git diff/status for directories",
   "author": "yogh-io",
   "license": "MIT",
@@ -35,7 +35,10 @@
     "deps": "depcruise src/ --config .dependency-cruiser.cjs",
     "metrics": "bun scripts/collect-metrics.ts",
     "metrics:snapshot": "bun scripts/collect-metrics.ts --save",
-    "prepublishOnly": "bun run build:prod"
+    "prepublishOnly": "bun run build:prod",
+    "release": "scripts/release.sh",
+    "release:minor": "scripts/release.sh minor",
+    "release:major": "scripts/release.sh major"
   },
   "keywords": [
     "git",