diffstalker 0.2.3 → 0.2.5

package/dist/ui/widgets/CommitPanel.js

@@ -2,7 +2,7 @@
  * Build all lines for the commit panel (used for both rendering and totalRows).
  */
 export function buildCommitPanelLines(opts) {
-    const { state, stagedCount, width, branch, remoteState, stashList, headCommit } = opts;
+    const { state, stagedCount, width, focusedZone } = opts;
     const lines = [];
     // Title
     let title = '{bold}Commit Message{/bold}';
@@ -11,8 +11,9 @@ export function buildCommitPanelLines(opts) {
     }
     lines.push(title);
     lines.push('');
-    // Message input area
-    const borderColor = state.inputFocused ? 'cyan' : 'gray';
+    // Message input area - cyan when zone-focused or input-focused
+    const messageFocused = state.inputFocused || focusedZone === 'commitMessage';
+    const borderColor = messageFocused ? 'cyan' : 'gray';
     // Top border
     const innerWidth = Math.max(20, width - 6);
     lines.push(`{${borderColor}-fg}\u250c${'─'.repeat(innerWidth + 2)}\u2510{/${borderColor}-fg}`);
@@ -28,10 +29,16 @@ export function buildCommitPanelLines(opts) {
     // Bottom border
     lines.push(`{${borderColor}-fg}\u2514${'─'.repeat(innerWidth + 2)}\u2518{/${borderColor}-fg}`);
     lines.push('');
-    // Amend checkbox
+    // Amend checkbox - cyan marker when zone-focused
+    const amendFocused = focusedZone === 'commitAmend';
     const checkbox = state.amend ? '[x]' : '[ ]';
-    const checkboxColor = state.amend ? 'green' : 'gray';
-    lines.push(`{${checkboxColor}-fg}${checkbox}{/${checkboxColor}-fg} Amend {gray-fg}(a){/gray-fg}`);
+    let checkboxColor = 'gray';
+    if (amendFocused)
+        checkboxColor = 'cyan';
+    else if (state.amend)
+        checkboxColor = 'green';
+    const amendPrefix = amendFocused ? '{cyan-fg}\u25b8 {/cyan-fg}' : '  ';
+    lines.push(`${amendPrefix}{${checkboxColor}-fg}${checkbox}{/${checkboxColor}-fg} Amend {gray-fg}(a){/gray-fg}`);
     // Error message
     if (state.error) {
         lines.push('');
@@ -43,93 +50,21 @@ export function buildCommitPanelLines(opts) {
         lines.push('{yellow-fg}Committing...{/yellow-fg}');
     }
     lines.push('');
-    // Help text
-    const helpText = state.inputFocused
-        ? '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}`);
-    // 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}`);
-        }
+    // Help text - context-sensitive based on focused zone
+    let helpText;
+    if (state.inputFocused) {
+        helpText = 'Enter: commit | Ctrl+a: amend | Esc: unfocus';
     }
-    else {
-        lines.push('{gray-fg}(empty){/gray-fg}');
+    else if (focusedZone === 'commitMessage') {
+        helpText = 'Tab: next | Space: edit | a: amend';
     }
-    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}');
+    else if (focusedZone === 'commitAmend') {
+        helpText = 'Tab: next | Space: toggle | Esc: back';
     }
-    // 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}');
+    else {
+        helpText = 'i/Enter: edit | a: amend | Esc: back';
     }
+    lines.push(`{gray-fg}Staged: ${stagedCount} file(s) | ${helpText}{/gray-fg}`);
     return lines;
 }
 /**
@@ -141,15 +76,12 @@ export function getCommitPanelTotalRows(opts) {
 /**
  * Format the commit panel as blessed-compatible tagged string.
  */
-export function formatCommitPanel(state, stagedCount, width, branch, remoteState, stashList, headCommit, scrollOffset = 0, visibleHeight) {
+export function formatCommitPanel(state, stagedCount, width, scrollOffset = 0, visibleHeight, focusedZone) {
     const allLines = buildCommitPanelLines({
         state,
         stagedCount,
         width,
-        branch,
-        remoteState,
-        stashList,
-        headCommit,
+        focusedZone,
     });
     if (visibleHeight && allLines.length > visibleHeight) {
         return allLines.slice(scrollOffset, scrollOffset + visibleHeight).join('\n');

package/dist/ui/widgets/CompareListView.js

@@ -1,17 +1,7 @@
 import { formatDate } from '../../utils/formatDate.js';
 import { formatCommitDisplay } from '../../utils/commitFormat.js';
 import { buildFileTree, flattenTree, buildTreePrefix } from '../../utils/fileTree.js';
-// ANSI escape codes for raw terminal output (avoids blessed tag escaping issues)
-const ANSI_RESET = '\x1b[0m';
-const ANSI_BOLD = '\x1b[1m';
-const ANSI_GRAY = '\x1b[90m';
-const ANSI_CYAN = '\x1b[36m';
-const ANSI_YELLOW = '\x1b[33m';
-const ANSI_GREEN = '\x1b[32m';
-const ANSI_RED = '\x1b[31m';
-const ANSI_BLUE = '\x1b[34m';
-const ANSI_MAGENTA = '\x1b[35m';
-const ANSI_INVERSE = '\x1b[7m';
+import { ANSI_RESET, ANSI_BOLD, ANSI_GRAY, ANSI_CYAN, ANSI_YELLOW, ANSI_GREEN, ANSI_RED, ANSI_BLUE, ANSI_MAGENTA, ANSI_INVERSE, } from '../../utils/ansi.js';
 /**
  * Build the list of row items for the compare list view.
  */

package/dist/ui/widgets/DiffView.js

@@ -1,14 +1,7 @@
 import { getTheme } from '../../themes.js';
 import { buildDiffDisplayRows, buildCombinedDiffDisplayRows, buildHistoryDisplayRows, getDisplayRowsLineNumWidth, wrapDisplayRows, getHunkBoundaries, } from '../../utils/displayRows.js';
 import { truncateAnsi } from '../../utils/ansiTruncate.js';
-// ANSI escape codes for raw terminal output (avoids blessed tag escaping issues)
-const ANSI_RESET = '\x1b[0m';
-const ANSI_BOLD = '\x1b[1m';
-const ANSI_GRAY = '\x1b[90m';
-const ANSI_CYAN = '\x1b[36m';
-const ANSI_GREEN = '\x1b[32m';
-const ANSI_YELLOW = '\x1b[33m';
-const ANSI_INVERSE = '\x1b[7m';
+import { ANSI_RESET, ANSI_BOLD, ANSI_GRAY, ANSI_CYAN, ANSI_GREEN, ANSI_YELLOW, ANSI_INVERSE, ansiBg, ansiFg, } from '../../utils/ansi.js';
 /**
  * Truncate string to fit within maxWidth, adding ellipsis if needed.
  */
@@ -33,24 +26,6 @@ function formatLineNum(lineNum, width) {
 function escapeContent(content) {
     return content.replace(/\{/g, '{{').replace(/\}/g, '}}');
 }
-/**
- * Build raw ANSI escape sequence for 24-bit RGB background.
- */
-function ansiBg(hex) {
-    const r = parseInt(hex.slice(1, 3), 16);
-    const g = parseInt(hex.slice(3, 5), 16);
-    const b = parseInt(hex.slice(5, 7), 16);
-    return `\x1b[48;2;${r};${g};${b}m`;
-}
-/**
- * Build raw ANSI escape sequence for 24-bit RGB foreground.
- */
-function ansiFg(hex) {
-    const r = parseInt(hex.slice(1, 3), 16);
-    const g = parseInt(hex.slice(3, 5), 16);
-    const b = parseInt(hex.slice(5, 7), 16);
-    return `\x1b[38;2;${r};${g};${b}m`;
-}
 /**
  * Format a diff file header row (e.g. "── path/to/file ──").
  */
@@ -166,7 +141,7 @@ function formatDisplayRow(row, lineNumWidth, contentWidth, headerWidth, theme, w
             const lineNum = formatLineNum(row.lineNum, lineNumWidth);
             const prefix = `${lineNum} ${symbol}  `;
             const rawContent = row.content || '';
-            const prefixAnsi = `\x1b[90m${prefix}\x1b[0m`;
+            const prefixAnsi = `${ANSI_GRAY}${prefix}${ANSI_RESET}`;
             if (row.highlighted && !isCont) {
                 const content = wrapMode ? row.highlighted : truncateAnsi(row.highlighted, contentWidth);
                 return `{escape}${prefixAnsi}${content}${ANSI_RESET}{/escape}`;

package/dist/ui/widgets/ExplorerContent.js

@@ -1,9 +1,6 @@
 import { buildExplorerContentRows, wrapExplorerContentRows, getExplorerContentRowCount, getExplorerContentLineNumWidth, } from '../../utils/explorerDisplayRows.js';
 import { truncateAnsi } from '../../utils/ansiTruncate.js';
-const ANSI_RESET = '\x1b[0m';
-const ANSI_GRAY = '\x1b[90m';
-const ANSI_CYAN = '\x1b[36m';
-const ANSI_YELLOW = '\x1b[33m';
+import { ANSI_RESET, ANSI_GRAY, ANSI_CYAN, ANSI_YELLOW } from '../../utils/ansi.js';
 /**
  * Format explorer file content as blessed-compatible tagged string.
  */

package/dist/ui/widgets/ExplorerView.js

@@ -1,14 +1,4 @@
-// ANSI escape codes
-const ANSI_RESET = '\x1b[0m';
-const ANSI_BOLD = '\x1b[1m';
-const ANSI_GRAY = '\x1b[90m';
-const ANSI_CYAN = '\x1b[36m';
-const ANSI_YELLOW = '\x1b[33m';
-const ANSI_GREEN = '\x1b[32m';
-const ANSI_RED = '\x1b[31m';
-const ANSI_BLUE = '\x1b[34m';
-const ANSI_MAGENTA = '\x1b[35m';
-const ANSI_INVERSE = '\x1b[7m';
+import { ANSI_RESET, ANSI_BOLD, ANSI_GRAY, ANSI_CYAN, ANSI_YELLOW, ANSI_GREEN, ANSI_RED, ANSI_BLUE, ANSI_MAGENTA, ANSI_INVERSE, } from '../../utils/ansi.js';
 /**
  * Build tree prefix characters (│ ├ └).
  */

package/dist/ui/widgets/FileList.js

@@ -1,4 +1,4 @@
-import { categorizeFiles } from '../../utils/fileCategories.js';
+import { categorizeFiles, getFileAtIndex } from '../../utils/fileCategories.js';
 import { getStatusChar, getStatusColor, formatStats, formatSelectionIndicator, formatFilePath, formatOriginalPath, } from './fileRowFormatters.js';
 /**
  * Build the list of row items for the file list.
@@ -119,13 +119,7 @@ export function formatFileList(files, selectedIndex, isFocused, width, scrollOff
 export function getFileListTotalRows(files) {
     return buildFileListRows(files).length;
 }
-/**
- * Get the file at a specific index (accounting for category ordering).
- */
-export function getFileAtIndex(files, index) {
-    const { ordered } = categorizeFiles(files);
-    return ordered[index] ?? null;
-}
+export { getFileAtIndex };
 /**
  * Get the file index from a visual row (accounting for headers and spacers).
  * Returns null if the row is a header or spacer.

package/dist/ui/widgets/Footer.js

@@ -35,6 +35,7 @@ export function formatFooter(activeTab, mouseEnabled, autoTabEnabled, wrapMode,
     if (activeTab === 'diff' && currentPane === 'diff') {
         leftContent += ' {gray-fg}n/N:hunk s:toggle{/gray-fg}';
     }
+    leftContent += ' {gray-fg}Tab:next{/gray-fg}';
     // Right side: tabs
     const tabs = [
         { key: '1', label: 'Diff', tab: 'diff' },

package/dist/utils/ansi.js

@@ -0,0 +1,38 @@
+/**
+ * Centralized ANSI escape code constants and helpers.
+ *
+ * All terminal color/style codes live here to avoid duplication across widgets.
+ * Terminal mode sequences (mouse mode, cursor visibility) are NOT included —
+ * those are a different concern and remain in index.ts.
+ */
+// --- SGR 3/4-bit color and style constants ---
+export const ANSI_RESET = '\x1b[0m';
+export const ANSI_BOLD = '\x1b[1m';
+export const ANSI_INVERSE = '\x1b[7m';
+export const ANSI_RED = '\x1b[31m';
+export const ANSI_GREEN = '\x1b[32m';
+export const ANSI_YELLOW = '\x1b[33m';
+export const ANSI_BLUE = '\x1b[34m';
+export const ANSI_MAGENTA = '\x1b[35m';
+export const ANSI_CYAN = '\x1b[36m';
+export const ANSI_GRAY = '\x1b[90m';
+/** Reset foreground color only (preserves background). */
+export const ANSI_FG_RESET = '\x1b[39m';
+// --- ANSI escape sequence pattern for parsing/stripping ---
+/** Matches SGR sequences like \x1b[32m, \x1b[0m, \x1b[1;34m, \x1b[48;2;30;30;30m */
+export const ANSI_PATTERN = /\x1b\[[0-9;]*m/g;
+// --- 24-bit RGB helpers ---
+/** Build ANSI escape for 24-bit RGB background from hex color (e.g. '#1e1e2e'). */
+export function ansiBg(hex) {
+    const r = parseInt(hex.slice(1, 3), 16);
+    const g = parseInt(hex.slice(3, 5), 16);
+    const b = parseInt(hex.slice(5, 7), 16);
+    return `\x1b[48;2;${r};${g};${b}m`;
+}
+/** Build ANSI escape for 24-bit RGB foreground from hex color (e.g. '#e0e0e0'). */
+export function ansiFg(hex) {
+    const r = parseInt(hex.slice(1, 3), 16);
+    const g = parseInt(hex.slice(3, 5), 16);
+    const b = parseInt(hex.slice(5, 7), 16);
+    return `\x1b[38;2;${r};${g};${b}m`;
+}

package/dist/utils/ansiTruncate.js

@@ -4,11 +4,7 @@
  * Truncates strings containing ANSI escape codes at a visual character limit
  * while preserving formatting up to the truncation point.
  */
-// ANSI escape sequence pattern: ESC [ ... m
-// Matches sequences like \x1b[32m, \x1b[0m, \x1b[1;34m, etc.
-const ANSI_PATTERN = /\x1b\[[0-9;]*m/g;
-// ANSI reset sequence to clear all formatting
-const ANSI_RESET = '\x1b[0m';
+import { ANSI_PATTERN, ANSI_RESET } from './ansi.js';
 /**
  * Calculate the visual length of a string (excluding ANSI codes).
  */

package/dist/utils/displayRows.js

@@ -5,21 +5,12 @@ import { isDisplayableDiffLine } from './diffFilters.js';
 import { breakLine, getLineRowCount } from './lineBreaking.js';
 import { computeWordDiff, areSimilarEnough } from './wordDiff.js';
 import { getLanguageFromPath, highlightBlockPreserveBg } from './languageDetection.js';
+import { getLineContent as extractLineContent } from './diffRowCalculations.js';
 /**
  * Get the text content from a diff line (strip leading +/-/space and control chars)
  */
 function getLineContent(line) {
-    let content;
-    if (line.type === 'addition' || line.type === 'deletion') {
-        content = line.content.slice(1);
-    }
-    else if (line.type === 'context') {
-        // Context lines start with space
-        content = line.content.startsWith(' ') ? line.content.slice(1) : line.content;
-    }
-    else {
-        content = line.content;
-    }
+    const content = extractLineContent(line);
     // Strip control characters that cause rendering artifacts
     // and convert tabs to spaces for consistent width calculation
     return content.replace(/[\x00-\x08\x0a-\x1f\x7f]/g, '').replace(/\t/g, '    ');
@@ -60,20 +51,38 @@ function extractFilePathFromHeader(content) {
     const match = content.match(/^diff --git a\/.+ b\/(.+)$/);
     return match ? match[1] : null;
 }
+/** Type guard for rows that can receive syntax highlighting. */
+function isHighlightable(row) {
+    return row.type === 'diff-add' || row.type === 'diff-del' || row.type === 'diff-context';
+}
 /**
- * Build display rows from a DiffResult.
- * Filters out non-displayable lines (index, ---, +++ headers).
- * Pairs consecutive deletions/additions within hunks and computes word-level diffs.
- * Applies block-based syntax highlighting to properly handle multi-line constructs.
+ * Pair consecutive deletions with additions and compute word-level diffs.
+ * Returns maps from pair index to word diff segments for each side.
  */
-export function buildDiffDisplayRows(diff) {
-    if (!diff)
-        return [];
-    const filteredLines = diff.lines.filter(isDisplayableDiffLine);
+function pairDeletionsAndAdditions(deletions, additions) {
+    const delSegmentsMap = new Map();
+    const addSegmentsMap = new Map();
+    const pairCount = Math.min(deletions.length, additions.length);
+    for (let j = 0; j < pairCount; j++) {
+        const delContent = getLineContent(deletions[j]);
+        const addContent = getLineContent(additions[j]);
+        if (areSimilarEnough(delContent, addContent)) {
+            const { oldSegments, newSegments } = computeWordDiff(delContent, addContent);
+            delSegmentsMap.set(j, oldSegments);
+            addSegmentsMap.set(j, newSegments);
+        }
+    }
+    return { delSegmentsMap, addSegmentsMap };
+}
+/**
+ * Build display rows from filtered diff lines in a single pass.
+ * Collects content streams per file section for later syntax highlighting.
+ * Pairs consecutive del/add lines for word-level diff computation.
+ */
+function buildRawDiffRows(filteredLines) {
     const rows = [];
     const fileSections = [];
     let currentSection = null;
-    // Phase 1: Build display rows and collect content streams per file section
     let i = 0;
     while (i < filteredLines.length) {
         const line = filteredLines[i];
@@ -134,18 +143,7 @@ export function buildDiffDisplayRows(diff) {
             i++;
         }
         // Pair deletions with additions for word-level diff
-        const delSegmentsMap = new Map();
-        const addSegmentsMap = new Map();
-        const pairCount = Math.min(deletions.length, additions.length);
-        for (let j = 0; j < pairCount; j++) {
-            const delContent = getLineContent(deletions[j]);
-            const addContent = getLineContent(additions[j]);
-            if (areSimilarEnough(delContent, addContent)) {
-                const { oldSegments, newSegments } = computeWordDiff(delContent, addContent);
-                delSegmentsMap.set(j, oldSegments);
-                addSegmentsMap.set(j, newSegments);
-            }
-        }
+        const { delSegmentsMap, addSegmentsMap } = pairDeletionsAndAdditions(deletions, additions);
         for (let j = 0; j < deletions.length; j++) {
             const delLine = deletions[j];
             const delContent = getLineContent(delLine);
@@ -182,37 +180,52 @@ export function buildDiffDisplayRows(diff) {
     if (currentSection) {
         fileSections.push(currentSection);
     }
-    // Phase 2: Apply block highlighting for each file section
+    return { rows, fileSections };
+}
+/**
+ * Highlight a content stream and map results back to display rows.
+ * Only applies highlighting to rows that match the expected types.
+ */
+function applyStreamHighlighting(rows, content, rowIndices, language, allowedTypes) {
+    if (content.length === 0)
+        return;
+    const highlighted = highlightBlockPreserveBg(content, language);
+    for (let j = 0; j < rowIndices.length; j++) {
+        const rowIndex = rowIndices[j];
+        const row = rows[rowIndex];
+        const hl = highlighted[j];
+        if (hl && isHighlightable(row) && allowedTypes.has(row.type) && hl !== row.content) {
+            row.highlighted = hl;
+        }
+    }
+}
+const OLD_STREAM_TYPES = new Set(['diff-del', 'diff-context']);
+const NEW_STREAM_TYPES = new Set(['diff-add', 'diff-context']);
+/**
+ * Apply block-based syntax highlighting to display rows.
+ * Each file section's old and new content streams are highlighted separately,
+ * then mapped back to the corresponding row indices.
+ */
+function applySyntaxHighlighting(rows, fileSections) {
     for (const section of fileSections) {
         if (!section.language)
             continue;
-        if (section.oldContent.length > 0) {
-            const oldHighlighted = highlightBlockPreserveBg(section.oldContent, section.language);
-            for (let j = 0; j < section.oldRowIndices.length; j++) {
-                const rowIndex = section.oldRowIndices[j];
-                const row = rows[rowIndex];
-                const highlighted = oldHighlighted[j];
-                if (highlighted &&
-                    highlighted !== row.content &&
-                    (row.type === 'diff-del' || row.type === 'diff-context')) {
-                    row.highlighted = highlighted;
-                }
-            }
-        }
-        if (section.newContent.length > 0) {
-            const newHighlighted = highlightBlockPreserveBg(section.newContent, section.language);
-            for (let j = 0; j < section.newRowIndices.length; j++) {
-                const rowIndex = section.newRowIndices[j];
-                const row = rows[rowIndex];
-                const highlighted = newHighlighted[j];
-                if (highlighted &&
-                    highlighted !== row.content &&
-                    (row.type === 'diff-add' || row.type === 'diff-context')) {
-                    row.highlighted = highlighted;
-                }
-            }
-        }
+        applyStreamHighlighting(rows, section.oldContent, section.oldRowIndices, section.language, OLD_STREAM_TYPES);
+        applyStreamHighlighting(rows, section.newContent, section.newRowIndices, section.language, NEW_STREAM_TYPES);
     }
+}
+/**
+ * Build display rows from a DiffResult.
+ * Filters out non-displayable lines (index, ---, +++ headers).
+ * Pairs consecutive deletions/additions within hunks and computes word-level diffs.
+ * Applies block-based syntax highlighting to properly handle multi-line constructs.
+ */
+export function buildDiffDisplayRows(diff) {
+    if (!diff)
+        return [];
+    const filteredLines = diff.lines.filter(isDisplayableDiffLine);
+    const { rows, fileSections } = buildRawDiffRows(filteredLines);
+    applySyntaxHighlighting(rows, fileSections);
     return rows;
 }
 /**

package/dist/utils/fileCategories.js

@@ -61,3 +61,10 @@ export function getIndexForCategoryPosition(files, category, categoryIndex) {
     };
     return offsets[category] + clampedIndex;
 }
+/**
+ * Get the file at a specific index (accounting for category ordering).
+ */
+export function getFileAtIndex(files, index) {
+    const { ordered } = categorizeFiles(files);
+    return ordered[index] ?? null;
+}

package/dist/utils/fileResolution.js

@@ -0,0 +1,23 @@
+import { getFileAtIndex } from './fileCategories.js';
+import { getFlatFileAtIndex } from './flatFileList.js';
+/**
+ * Resolve a FileEntry from an index, abstracting over flat vs categorized mode.
+ * In flat mode, returns the unstaged entry (preferred) or staged entry.
+ * In categorized mode, returns the file at the categorized index.
+ */
+export function resolveFileAtIndex(index, flatViewMode, flatFiles, files) {
+    if (flatViewMode) {
+        const flatEntry = getFlatFileAtIndex(flatFiles, index);
+        return flatEntry?.unstagedEntry ?? flatEntry?.stagedEntry ?? null;
+    }
+    return getFileAtIndex(files, index);
+}
+/**
+ * Get the maximum valid file index for the current view mode.
+ */
+export function getFileListMaxIndex(flatViewMode, flatFiles, files) {
+    if (flatViewMode) {
+        return flatFiles.length - 1;
+    }
+    return files.length - 1;
+}

package/dist/utils/languageDetection.js

@@ -4,6 +4,7 @@
  */
 import { createEmphasize } from 'emphasize';
 import { common } from 'lowlight';
+import { ANSI_FG_RESET } from './ansi.js';
 // Create emphasize instance with common languages
 const emphasize = createEmphasize(common);
 // Map file extensions to highlight.js language names
@@ -182,7 +183,7 @@ export function highlightLinePreserveBg(content, language) {
         const result = emphasize.highlight(language, content);
         // Replace full reset (\x1b[0m) with foreground-only reset (\x1b[39m)
         // This preserves any background color set by the caller
-        return result.value.replace(/\x1b\[0m/g, '\x1b[39m');
+        return result.value.replace(/\x1b\[0m/g, ANSI_FG_RESET);
     }
     catch {
         return content;
@@ -217,7 +218,7 @@ export function highlightBlockPreserveBg(lines, language) {
         const block = lines.join('\n');
         const result = emphasize.highlight(language, block);
         // Replace full resets with foreground-only resets
-        const highlighted = result.value.replace(/\x1b\[0m/g, '\x1b[39m');
+        const highlighted = result.value.replace(/\x1b\[0m/g, ANSI_FG_RESET);
         return highlighted.split('\n');
     }
     catch {

package/dist/utils/logger.js

@@ -0,0 +1,32 @@
+/**
+ * Lightweight structured logger writing to stderr.
+ *
+ * - `debug()` is gated by `setDebug(true)` (set from the --debug flag)
+ * - `warn()` and `error()` always write to stderr
+ */
+let debugEnabled = false;
+export function setDebug(enabled) {
+    debugEnabled = enabled;
+}
+function timestamp() {
+    return new Date().toISOString();
+}
+export function debug(message) {
+    if (debugEnabled) {
+        process.stderr.write(`[diffstalker ${timestamp()}] ${message}\n`);
+    }
+}
+export function warn(message) {
+    process.stderr.write(`[diffstalker warn] ${message}\n`);
+}
+function formatError(err) {
+    if (err instanceof Error)
+        return err.message;
+    if (err)
+        return String(err);
+    return '';
+}
+export function error(message, err) {
+    const detail = err ? `: ${formatError(err)}` : '';
+    process.stderr.write(`[diffstalker error] ${message}${detail}\n`);
+}