difit 2.0.2 → 2.0.3

package/dist/cli/index.js

@@ -16,7 +16,7 @@ program
     .argument('[commit-ish]', 'Git commit, tag, branch, HEAD~n reference, or "working"/"staged"/"."', 'HEAD')
     .argument('[compare-with]', 'Optional: Compare with this commit/branch (shows diff between commit-ish and compare-with)')
     .option('--port <port>', 'preferred port (auto-assigned if occupied)', parseInt)
-    .option('--host <host>', 'host address to bind', '127.0.0.1')
+    .option('--host <host>', 'host address to bind', '')
     .option('--no-open', 'do not automatically open browser')
     .option('--mode <mode>', 'diff mode (side-by-side or inline)', 'side-by-side')
     .option('--tui', 'use terminal UI instead of web interface')

package/dist/cli/index.test.js

@@ -107,7 +107,7 @@ describe('CLI index.ts', () => {
                 .argument('[commit-ish]', 'commit-ish', 'HEAD')
                 .argument('[compare-with]', 'compare-with')
                 .option('--port <port>', 'port', parseInt)
-                .option('--host <host>', 'host', '127.0.0.1')
+                .option('--host <host>', 'host', '')
                 .option('--no-open', 'no-open')
                 .option('--mode <mode>', 'mode', 'side-by-side')
                 .option('--tui', 'tui')
@@ -149,7 +149,7 @@ describe('CLI index.ts', () => {
                 targetCommitish: expectedTarget,
                 baseCommitish: expectedBase,
                 preferredPort: undefined,
-                host: '127.0.0.1',
+                host: '',
                 openBrowser: true,
                 mode: 'side-by-side',
             });
@@ -184,7 +184,7 @@ describe('CLI index.ts', () => {
                 .argument('[commit-ish]', 'commit-ish', 'HEAD')
                 .argument('[compare-with]', 'compare-with')
                 .option('--port <port>', 'port', parseInt)
-                .option('--host <host>', 'host', '127.0.0.1')
+                .option('--host <host>', 'host', '')
                 .option('--no-open', 'no-open')
                 .option('--mode <mode>', 'mode', 'side-by-side')
                 .option('--tui', 'tui')
@@ -206,7 +206,7 @@ describe('CLI index.ts', () => {
                 targetCommitish: 'HEAD',
                 baseCommitish: 'HEAD^',
                 preferredPort: expectedOptions.port,
-                host: expectedOptions.host || '127.0.0.1',
+                host: expectedOptions.host || '',
                 openBrowser: expectedOptions.open !== false,
                 mode: expectedOptions.mode || 'side-by-side',
             };
@@ -224,7 +224,7 @@ describe('CLI index.ts', () => {
                 .argument('[commit-ish]', 'commit-ish', 'HEAD')
                 .argument('[compare-with]', 'compare-with')
                 .option('--port <port>', 'port', parseInt)
-                .option('--host <host>', 'host', '127.0.0.1')
+                .option('--host <host>', 'host', '')
                 .option('--no-open', 'no-open')
                 .option('--mode <mode>', 'mode', 'side-by-side')
                 .option('--tui', 'tui')
@@ -255,7 +255,7 @@ describe('CLI index.ts', () => {
                 .argument('[commit-ish]', 'commit-ish', 'HEAD')
                 .argument('[compare-with]', 'compare-with')
                 .option('--port <port>', 'port', parseInt)
-                .option('--host <host>', 'host', '127.0.0.1')
+                .option('--host <host>', 'host', '')
                 .option('--no-open', 'no-open')
                 .option('--mode <mode>', 'mode', 'side-by-side')
                 .option('--tui', 'tui')
@@ -291,7 +291,7 @@ describe('CLI index.ts', () => {
                 .argument('[commit-ish]', 'commit-ish', 'HEAD')
                 .argument('[compare-with]', 'compare-with')
                 .option('--port <port>', 'port', parseInt)
-                .option('--host <host>', 'host', '127.0.0.1')
+                .option('--host <host>', 'host', '')
                 .option('--no-open', 'no-open')
                 .option('--mode <mode>', 'mode', 'side-by-side')
                 .option('--tui', 'tui')
@@ -326,7 +326,7 @@ describe('CLI index.ts', () => {
                 targetCommitish: 'abc123',
                 baseCommitish: 'def456',
                 preferredPort: undefined,
-                host: '127.0.0.1',
+                host: '',
                 openBrowser: true,
                 mode: 'side-by-side',
             });
@@ -337,7 +337,7 @@ describe('CLI index.ts', () => {
                 .argument('[commit-ish]', 'commit-ish', 'HEAD')
                 .argument('[compare-with]', 'compare-with')
                 .option('--port <port>', 'port', parseInt)
-                .option('--host <host>', 'host', '127.0.0.1')
+                .option('--host <host>', 'host', '')
                 .option('--no-open', 'no-open')
                 .option('--mode <mode>', 'mode', 'side-by-side')
                 .option('--tui', 'tui')
@@ -370,7 +370,7 @@ describe('CLI index.ts', () => {
                 .argument('[commit-ish]', 'commit-ish', 'HEAD')
                 .argument('[compare-with]', 'compare-with')
                 .option('--port <port>', 'port', parseInt)
-                .option('--host <host>', 'host', '127.0.0.1')
+                .option('--host <host>', 'host', '')
                 .option('--no-open', 'no-open')
                 .option('--mode <mode>', 'mode', 'side-by-side')
                 .option('--tui', 'tui')
@@ -413,7 +413,7 @@ describe('CLI index.ts', () => {
                 .argument('[commit-ish]', 'commit-ish', 'HEAD')
                 .argument('[compare-with]', 'compare-with')
                 .option('--port <port>', 'port', parseInt)
-                .option('--host <host>', 'host', '127.0.0.1')
+                .option('--host <host>', 'host', '')
                 .option('--no-open', 'no-open')
                 .option('--mode <mode>', 'mode', 'side-by-side')
                 .option('--tui', 'tui')
@@ -447,7 +447,7 @@ describe('CLI index.ts', () => {
                 .argument('[commit-ish]', 'commit-ish', 'HEAD')
                 .argument('[compare-with]', 'compare-with')
                 .option('--port <port>', 'port', parseInt)
-                .option('--host <host>', 'host', '127.0.0.1')
+                .option('--host <host>', 'host', '')
                 .option('--no-open', 'no-open')
                 .option('--mode <mode>', 'mode', 'side-by-side')
                 .option('--tui', 'tui')
@@ -474,7 +474,7 @@ describe('CLI index.ts', () => {
                 .argument('[commit-ish]', 'commit-ish', 'HEAD')
                 .argument('[compare-with]', 'compare-with')
                 .option('--port <port>', 'port', parseInt)
-                .option('--host <host>', 'host', '127.0.0.1')
+                .option('--host <host>', 'host', '')
                 .option('--no-open', 'no-open')
                 .option('--mode <mode>', 'mode', 'side-by-side')
                 .option('--tui', 'tui')
@@ -528,7 +528,7 @@ describe('CLI index.ts', () => {
                 .argument('[commit-ish]', 'commit-ish', 'HEAD')
                 .argument('[compare-with]', 'compare-with')
                 .option('--port <port>', 'port', parseInt)
-                .option('--host <host>', 'host', '127.0.0.1')
+                .option('--host <host>', 'host', '')
                 .option('--no-open', 'no-open')
                 .option('--mode <mode>', 'mode', 'side-by-side')
                 .option('--tui', 'tui')
@@ -566,7 +566,7 @@ describe('CLI index.ts', () => {
                 .argument('[commit-ish]', 'commit-ish', 'HEAD')
                 .argument('[compare-with]', 'compare-with')
                 .option('--port <port>', 'port', parseInt)
-                .option('--host <host>', 'host', '127.0.0.1')
+                .option('--host <host>', 'host', '')
                 .option('--no-open', 'no-open')
                 .option('--mode <mode>', 'mode', 'side-by-side')
                 .option('--tui', 'tui')
@@ -604,7 +604,7 @@ describe('CLI index.ts', () => {
                 .argument('[commit-ish]', 'commit-ish', 'HEAD')
                 .argument('[compare-with]', 'compare-with')
                 .option('--port <port>', 'port', parseInt)
-                .option('--host <host>', 'host', '127.0.0.1')
+                .option('--host <host>', 'host', '')
                 .option('--no-open', 'no-open')
                 .option('--mode <mode>', 'mode', 'side-by-side')
                 .option('--tui', 'tui')
@@ -653,7 +653,7 @@ describe('CLI index.ts', () => {
                 .argument('[commit-ish]', 'commit-ish', 'HEAD')
                 .argument('[compare-with]', 'compare-with')
                 .option('--port <port>', 'port', parseInt)
-                .option('--host <host>', 'host', '127.0.0.1')
+                .option('--host <host>', 'host', '')
                 .option('--no-open', 'no-open')
                 .option('--mode <mode>', 'mode', 'side-by-side')
                 .option('--tui', 'tui')

package/dist/cli/utils.js

@@ -21,9 +21,47 @@ export function validateCommitish(commitish) {
         /^[a-f0-9]{4,40}\^+$/i, // SHA hashes with ^ suffix (parent references)
         /^[a-f0-9]{4,40}~\d+$/i, // SHA hashes with ~N suffix (ancestor references)
         /^HEAD(~\d+|\^\d*)*$/, // HEAD, HEAD~1, HEAD^, HEAD^2, etc.
-        /^[a-zA-Z][a-zA-Z0-9_\-/.@]*$/, // branch names, tags (must start with letter, no ^ or ~ in middle)
     ];
-    return validPatterns.some((pattern) => pattern.test(trimmed));
+    // Check if it matches any specific patterns first
+    if (validPatterns.some((pattern) => pattern.test(trimmed))) {
+        return true;
+    }
+    // For branch names, use git's rules
+    return isValidBranchName(trimmed);
+}
+function isValidBranchName(name) {
+    // Git branch name rules
+    if (name.startsWith('-'))
+        return false; // Cannot start with dash
+    if (name.endsWith('.'))
+        return false; // Cannot end with dot
+    if (name === '@')
+        return false; // Cannot be just @
+    if (name.includes('..'))
+        return false; // No consecutive dots
+    if (name.includes('@{'))
+        return false; // No @{ sequence
+    if (name.includes('//'))
+        return false; // No consecutive slashes
+    if (name.startsWith('/') || name.endsWith('/'))
+        return false; // No leading/trailing slashes
+    if (name.endsWith('.lock'))
+        return false; // Cannot end with .lock
+    // Check for forbidden characters
+    const forbiddenChars = /[~^:?*[\\\x00-\x20\x7F]/;
+    if (forbiddenChars.test(name))
+        return false;
+    // Check path components
+    const components = name.split('/');
+    for (const component of components) {
+        if (component === '')
+            return false; // Empty component
+        if (component.startsWith('.'))
+            return false; // Component cannot start with dot
+        if (component.endsWith('.lock'))
+            return false; // Component cannot end with .lock
+    }
+    return true;
 }
 export function shortHash(hash) {
     return hash.substring(0, 7);

package/dist/cli/utils.test.js

@@ -28,9 +28,22 @@ describe('CLI Utils', () => {
             expect(validateCommitish('HEAD~2^1')).toBe(true);
         });
         it('should validate branch names', () => {
+            // Valid branch names according to git rules
             expect(validateCommitish('main')).toBe(true);
             expect(validateCommitish('feature/new-feature')).toBe(true);
             expect(validateCommitish('develop')).toBe(true);
+            expect(validateCommitish('feature-123')).toBe(true); // dash and numbers (not at start)
+            expect(validateCommitish('feature_branch')).toBe(true); // underscore
+            expect(validateCommitish('hotfix@bug')).toBe(true); // @ character (not followed by {)
+            expect(validateCommitish('feature+new')).toBe(true); // plus character
+            expect(validateCommitish('feature=test')).toBe(true); // equals character
+            expect(validateCommitish('feature!important')).toBe(true); // exclamation
+            expect(validateCommitish('feature,list')).toBe(true); // comma
+            expect(validateCommitish('feature;test')).toBe(true); // semicolon
+            expect(validateCommitish('feature"quoted"')).toBe(true); // quotes
+            expect(validateCommitish("feature'quoted'")).toBe(true); // single quotes
+            expect(validateCommitish('release/v2.3.1')).toBe(true); // version numbers
+            expect(validateCommitish('bugfix/login-timeout')).toBe(true); // path with dash
         });
         it('should validate special cases', () => {
             expect(validateCommitish('.')).toBe(true); // working directory diff
@@ -40,6 +53,26 @@ describe('CLI Utils', () => {
             expect(validateCommitish('   ')).toBe(false);
             expect(validateCommitish('HEAD~')).toBe(false);
             expect(validateCommitish('abc')).toBe(true); // short hashes are valid
+            // Invalid branch names according to git rules
+            expect(validateCommitish('-feature')).toBe(false); // cannot start with dash
+            expect(validateCommitish('feature.')).toBe(false); // cannot end with dot
+            expect(validateCommitish('@')).toBe(false); // cannot be just @
+            expect(validateCommitish('feature..test')).toBe(false); // no consecutive dots
+            expect(validateCommitish('feature@{upstream}')).toBe(false); // no @{ sequence
+            expect(validateCommitish('feature//test')).toBe(false); // no consecutive slashes
+            expect(validateCommitish('/feature')).toBe(false); // cannot start with slash
+            expect(validateCommitish('feature/')).toBe(false); // cannot end with slash
+            expect(validateCommitish('feature.lock')).toBe(false); // cannot end with .lock
+            expect(validateCommitish('feature^invalid')).toBe(false); // ^ not allowed
+            expect(validateCommitish('feature~invalid')).toBe(false); // ~ not allowed
+            expect(validateCommitish('feature:invalid')).toBe(false); // : not allowed
+            expect(validateCommitish('feature?invalid')).toBe(false); // ? not allowed
+            expect(validateCommitish('feature*invalid')).toBe(false); // * not allowed
+            expect(validateCommitish('feature[invalid')).toBe(false); // [ not allowed
+            expect(validateCommitish('feature\\invalid')).toBe(false); // \ not allowed
+            expect(validateCommitish('feature invalid')).toBe(false); // space not allowed
+            expect(validateCommitish('feature/.hidden')).toBe(false); // component cannot start with dot
+            expect(validateCommitish('feature/test.lock')).toBe(false); // component cannot end with .lock
         });
         it('should reject non-string input', () => {
             expect(validateCommitish(null)).toBe(false);

package/dist/server/git-diff.js

@@ -99,12 +99,6 @@ export class GitDiffParser {
         else if (oldPath !== newPath) {
             status = 'renamed';
         }
-        else if (summary.insertions && !summary.deletions) {
-            status = 'added';
-        }
-        else if (summary.deletions && !summary.insertions) {
-            status = 'deleted';
-        }
         // For binary files, don't try to parse chunks
         const chunks = summary.binary ? [] : this.parseChunks(lines);
         return {

package/dist/server/git-diff.test.js

@@ -213,7 +213,7 @@ describe('GitDiffParser', () => {
             expect(result).toEqual({
                 path: 'script.js',
                 oldPath: undefined,
-                status: 'added',
+                status: 'modified',
                 additions: 1,
                 deletions: 0,
                 chunks: expect.any(Array), // Should have parsed chunks
@@ -222,6 +222,31 @@ describe('GitDiffParser', () => {
             expect(result.chunks).toHaveLength(1);
             expect(result.chunks[0].header).toBe('@@ -1,3 +1,4 @@');
         });
+        it('treats files with only deletions as modified', () => {
+            const diffLines = [
+                'diff --git a/script.js b/script.js',
+                'index abc123..def456 100644',
+                '--- a/script.js',
+                '+++ b/script.js',
+                '@@ -1,4 +1,3 @@',
+                ' console.log("hello");',
+                '-console.log("world");',
+                ' // end',
+            ];
+            const summary = {
+                insertions: 0,
+                deletions: 1,
+            };
+            const result = parser.parseFileBlock(diffLines.join('\n'), summary);
+            expect(result).toEqual({
+                path: 'script.js',
+                oldPath: undefined,
+                status: 'modified',
+                additions: 0,
+                deletions: 1,
+                chunks: expect.any(Array),
+            });
+        });
         it('detects added files using /dev/null indicator', () => {
             const diffLines = [
                 'diff --git a/new-file.txt b/new-file.txt',

package/dist/server/server.js

@@ -176,7 +176,7 @@ export async function startServer(options) {
       `);
         });
     }
-    const { port, url, server } = await startServerWithFallback(app, options.preferredPort || 3000, options.host || '127.0.0.1');
+    const { port, url, server } = await startServerWithFallback(app, options.preferredPort || 3000, options.host || 'localhost');
     // Security warning for non-localhost binding
     if (options.host && options.host !== '127.0.0.1' && options.host !== 'localhost') {
         console.warn('\n⚠️  WARNING: Server is accessible from external network!');

package/dist/server/server.test.js

@@ -60,7 +60,7 @@ describe('Server Integration Tests', () => {
             });
             servers.push(result.server); // Track for cleanup
             expect(result.port).toBeGreaterThanOrEqual(preferredPort);
-            expect(result.url).toContain('http://127.0.0.1:');
+            expect(result.url).toContain('http://localhost:');
             expect(result.isEmpty).toBe(false);
         });
         it('falls back to next port when preferred is occupied', async () => {
@@ -82,7 +82,7 @@ describe('Server Integration Tests', () => {
             servers.push(secondServer.server);
             expect(firstServer.port).toBeGreaterThanOrEqual(preferredPort);
             expect(secondServer.port).toBe(firstServer.port + 1);
-            expect(secondServer.url).toBe(`http://127.0.0.1:${secondServer.port}`);
+            expect(secondServer.url).toBe(`http://localhost:${secondServer.port}`);
         });
         it('binds to specified host', async () => {
             const result = await startServer({
@@ -261,7 +261,7 @@ describe('Server Integration Tests', () => {
             });
             servers.push(result.server);
             expect(result.port).toBeGreaterThanOrEqual(3000);
-            expect(result.url).toContain('http://127.0.0.1:');
+            expect(result.url).toContain('http://localhost:');
         });
         it('accepts different mode values', async () => {
             const inlineResult = await startServer({

package/dist/tui/App.js

@@ -1,8 +1,8 @@
-import React, { useState, useEffect } from 'react';
 import { Box, Text, useApp, useInput } from 'ink';
+import React, { useState, useEffect } from 'react';
 import { loadGitDiff } from '../server/git-diff-tui.js';
-import FileList from './components/FileList.js';
 import DiffViewer from './components/DiffViewer.js';
+import FileList from './components/FileList.js';
 import SideBySideDiffViewer from './components/SideBySideDiffViewer.js';
 import StatusBar from './components/StatusBar.js';
 const App = ({ targetCommitish, baseCommitish, mode }) => {
@@ -26,7 +26,7 @@ const App = ({ targetCommitish, baseCommitish, mode }) => {
         }
     };
     useEffect(() => {
-        loadDiff();
+        void loadDiff();
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [targetCommitish, baseCommitish]);
     useInput((input, key) => {
@@ -35,7 +35,7 @@ const App = ({ targetCommitish, baseCommitish, mode }) => {
         }
         // Reload on 'r' key
         if (input === 'r') {
-            loadDiff();
+            void loadDiff();
             return;
         }
         if (viewMode === 'list') {

package/dist/tui/components/DiffViewer.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { FileDiff } from '../../types/diff.js';
+import { type FileDiff } from '../../types/diff.js';
 interface DiffViewerProps {
     files: FileDiff[];
     initialFileIndex: number;

package/dist/tui/components/DiffViewer.js

@@ -1,5 +1,5 @@
-import React, { useState } from 'react';
 import { Box, Text, useInput, useApp } from 'ink';
+import React, { useState } from 'react';
 const DiffViewer = ({ files, initialFileIndex }) => {
     const [currentFileIndex, setCurrentFileIndex] = useState(initialFileIndex);
     const [scrollOffset, setScrollOffset] = useState(0);

package/dist/tui/components/FileList.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { FileDiff } from '../../types/diff.js';
+import { type FileDiff } from '../../types/diff.js';
 interface FileListProps {
     files: FileDiff[];
     selectedIndex: number;

package/dist/tui/components/FileList.js

@@ -1,5 +1,5 @@
-import React from 'react';
 import { Box, Text } from 'ink';
+import React from 'react';
 const FileList = ({ files, selectedIndex }) => {
     const getStatusColor = (status) => {
         switch (status) {

package/dist/tui/components/SideBySideDiffViewer.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { FileDiff } from '../../types/diff.js';
+import { type FileDiff } from '../../types/diff.js';
 interface SideBySideDiffViewerProps {
     files: FileDiff[];
     initialFileIndex: number;

package/dist/tui/components/SideBySideDiffViewer.js

@@ -1,10 +1,48 @@
-import React, { useState } from 'react';
 import { Box, Text, useInput, useApp } from 'ink';
+import React, { useState } from 'react';
 import { parseDiff } from '../utils/parseDiff.js';
 const SideBySideDiffViewer = ({ files, initialFileIndex, onBack, }) => {
     const [currentFileIndex, setCurrentFileIndex] = useState(initialFileIndex);
     const [scrollOffset, setScrollOffset] = useState(0);
+    const { exit } = useApp();
+    const viewportHeight = Math.max(10, (process.stdout.rows || 24) - 10);
     const currentFile = files[currentFileIndex];
+    useInput((input, key) => {
+        if (input === 'q' || (key.ctrl && input === 'c')) {
+            exit();
+            return;
+        }
+        if (key.escape || input === 'b') {
+            onBack();
+            return;
+        }
+        if (!currentFile)
+            return;
+        // Scroll within file
+        if (key.upArrow || input === 'k') {
+            setScrollOffset((prev) => Math.max(0, prev - 1));
+        }
+        if (key.downArrow || input === 'j') {
+            setScrollOffset((prev) => prev + 1);
+        }
+        if (key.pageUp) {
+            setScrollOffset((prev) => Math.max(0, prev - viewportHeight));
+        }
+        if (key.pageDown) {
+            setScrollOffset((prev) => prev + viewportHeight);
+        }
+        // Navigate between files
+        if (key.tab && !key.shift) {
+            // Next file (loop to first when at end)
+            setCurrentFileIndex((currentFileIndex + 1) % files.length);
+            setScrollOffset(0);
+        }
+        if (key.tab && key.shift) {
+            // Previous file (loop to last when at start)
+            setCurrentFileIndex((currentFileIndex - 1 + files.length) % files.length);
+            setScrollOffset(0);
+        }
+    }, { isActive: true });
     if (!currentFile || files.length === 0) {
         return (React.createElement(Box, { flexDirection: "column", flexGrow: 1 },
             React.createElement(Text, { color: "yellow" }, "No files to display"),
@@ -74,44 +112,9 @@ const SideBySideDiffViewer = ({ files, initialFileIndex, onBack, }) => {
             }
         }
     });
-    const viewportHeight = Math.max(10, (process.stdout.rows || 24) - 10); // StatusBar(3) + file nav(3) + footer(3) + margin(1)
-    const maxScroll = Math.max(0, allLines.length - viewportHeight);
-    const { exit } = useApp();
-    useInput((input, key) => {
-        if (input === 'q' || (key.ctrl && input === 'c')) {
-            exit();
-            return;
-        }
-        if (key.escape || input === 'b') {
-            onBack();
-            return;
-        }
-        // Scroll within file
-        if (key.upArrow || input === 'k') {
-            setScrollOffset((prev) => Math.max(0, prev - 1));
-        }
-        if (key.downArrow || input === 'j') {
-            setScrollOffset((prev) => Math.min(maxScroll, prev + 1));
-        }
-        if (key.pageUp) {
-            setScrollOffset((prev) => Math.max(0, prev - viewportHeight));
-        }
-        if (key.pageDown) {
-            setScrollOffset((prev) => Math.min(maxScroll, prev + viewportHeight));
-        }
-        // Navigate between files
-        if (key.tab && !key.shift) {
-            // Next file (loop to first when at end)
-            setCurrentFileIndex((currentFileIndex + 1) % files.length);
-            setScrollOffset(0);
-        }
-        if (key.tab && key.shift) {
-            // Previous file (loop to last when at start)
-            setCurrentFileIndex((currentFileIndex - 1 + files.length) % files.length);
-            setScrollOffset(0);
-        }
-    }, { isActive: true });
-    const visibleLines = allLines.slice(scrollOffset, scrollOffset + viewportHeight);
+    const actualMaxScroll = Math.max(0, allLines.length - viewportHeight);
+    const clampedScrollOffset = Math.max(0, Math.min(actualMaxScroll, scrollOffset));
+    const visibleLines = allLines.slice(clampedScrollOffset, clampedScrollOffset + viewportHeight);
     const terminalWidth = process.stdout.columns || 80;
     const columnWidth = Math.floor((terminalWidth - 6) / 2); // 6 for borders and separators
     const getLineColor = (type) => {

package/dist/tui/components/StatusBar.js

@@ -1,5 +1,5 @@
-import React from 'react';
 import { Box, Text } from 'ink';
+import React from 'react';
 const StatusBar = ({ commitish, totalFiles, currentMode }) => {
     return (React.createElement(Box, { borderStyle: "round", paddingX: 1, marginBottom: 1 },
         React.createElement(Box, { flexGrow: 1 },

package/dist/tui/utils/parseDiff.d.ts

@@ -1,2 +1,2 @@
-import { ParsedDiff } from '../../types/diff.js';
+import { type ParsedDiff } from '../../types/diff.js';
 export declare function parseDiff(diffText: string): ParsedDiff;

package/dist/utils/gitUtils.d.ts

@@ -0,0 +1,4 @@
+import type { SimpleGit } from 'simple-git';
+export declare function shortHash(hash: string): string;
+export declare function createCommitRangeString(baseHash: string, targetHash: string): string;
+export declare function resolveCommitDisplayString(baseCommitish: string, targetCommitish: string, git: SimpleGit): Promise<string>;

package/dist/utils/gitUtils.js

@@ -0,0 +1,29 @@
+export function shortHash(hash) {
+    return hash.substring(0, 7);
+}
+export function createCommitRangeString(baseHash, targetHash) {
+    return `${baseHash}...${targetHash}`;
+}
+export async function resolveCommitDisplayString(baseCommitish, targetCommitish, git) {
+    // Handle target special chars (base is always a regular commit)
+    if (targetCommitish === 'working') {
+        // Show unstaged changes (working vs staged)
+        return 'Working Directory (unstaged changes)';
+    }
+    else if (targetCommitish === 'staged') {
+        // Show staged changes against base commit
+        const baseHash = await git.revparse([baseCommitish]);
+        return `${shortHash(baseHash)} vs Staging Area (staged changes)`;
+    }
+    else if (targetCommitish === '.') {
+        // Show all uncommitted changes against base commit
+        const baseHash = await git.revparse([baseCommitish]);
+        return `${shortHash(baseHash)} vs Working Directory (all uncommitted changes)`;
+    }
+    else {
+        // Both are regular commits: standard commit-to-commit comparison
+        const targetHash = await git.revparse([targetCommitish]);
+        const baseHash = await git.revparse([baseCommitish]);
+        return createCommitRangeString(shortHash(baseHash), shortHash(targetHash));
+    }
+}

package/dist/utils/gitUtils.test.d.ts

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

package/dist/utils/gitUtils.test.js

@@ -0,0 +1,63 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { shortHash, createCommitRangeString, resolveCommitDisplayString } from './gitUtils';
+describe('Git Utils', () => {
+    describe('shortHash', () => {
+        it('should return first 7 characters of hash', () => {
+            expect(shortHash('a1b2c3d4e5f6789012345678901234567890abcd')).toBe('a1b2c3d');
+            expect(shortHash('1234567890abcdef')).toBe('1234567');
+            expect(shortHash('abc123')).toBe('abc123');
+        });
+        it('should handle short hashes', () => {
+            expect(shortHash('abc')).toBe('abc');
+            expect(shortHash('')).toBe('');
+            expect(shortHash('a')).toBe('a');
+        });
+    });
+    describe('createCommitRangeString', () => {
+        it('should create commit range string with triple dots', () => {
+            expect(createCommitRangeString('abc1234', 'def5678')).toBe('abc1234...def5678');
+            expect(createCommitRangeString('a1b2c3d', '4e5f6g7')).toBe('a1b2c3d...4e5f6g7');
+        });
+        it('should handle empty strings', () => {
+            expect(createCommitRangeString('', '')).toBe('...');
+            expect(createCommitRangeString('abc123', '')).toBe('abc123...');
+            expect(createCommitRangeString('', 'def456')).toBe('...def456');
+        });
+    });
+    describe('resolveCommitDisplayString', () => {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const mockGit = {
+            revparse: vi.fn(),
+        };
+        beforeEach(() => {
+            vi.clearAllMocks();
+        });
+        it('should handle working directory target', async () => {
+            const result = await resolveCommitDisplayString('main', 'working', mockGit);
+            expect(result).toBe('Working Directory (unstaged changes)');
+            expect(mockGit.revparse).not.toHaveBeenCalled();
+        });
+        it('should handle staged target', async () => {
+            mockGit.revparse.mockResolvedValue('a1b2c3d4e5f6789012345678901234567890abcd');
+            const result = await resolveCommitDisplayString('main', 'staged', mockGit);
+            expect(result).toBe('a1b2c3d vs Staging Area (staged changes)');
+            expect(mockGit.revparse).toHaveBeenCalledWith(['main']);
+        });
+        it('should handle dot (.) target', async () => {
+            mockGit.revparse.mockResolvedValue('a1b2c3d4e5f6789012345678901234567890abcd');
+            const result = await resolveCommitDisplayString('main', '.', mockGit);
+            expect(result).toBe('a1b2c3d vs Working Directory (all uncommitted changes)');
+            expect(mockGit.revparse).toHaveBeenCalledWith(['main']);
+        });
+        it('should handle regular commit to commit comparison', async () => {
+            mockGit.revparse
+                .mockResolvedValueOnce('def4567890abcdef1234567890abcdef12345678') // target (called first)
+                .mockResolvedValueOnce('a1b2c3d4e5f6789012345678901234567890abcd'); // base (called second)
+            const result = await resolveCommitDisplayString('main', 'develop', mockGit);
+            expect(result).toBe('a1b2c3d...def4567');
+            expect(mockGit.revparse).toHaveBeenCalledWith(['develop']);
+            expect(mockGit.revparse).toHaveBeenCalledWith(['main']);
+            expect(mockGit.revparse).toHaveBeenCalledTimes(2);
+        });
+    });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "difit",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "A lightweight command-line tool that spins up a local web server to display Git commit diffs in a GitHub-like Files changed view",
   "type": "module",
   "engines": {
@@ -51,6 +51,7 @@
   },
   "devDependencies": {
     "@eslint/eslintrc": "^3.3.1",
+    "@eslint/js": "^9.30.1",
     "@prettier/plugin-oxc": "^0.0.4",
     "@tailwindcss/forms": "^0.5.10",
     "@tailwindcss/postcss": "^4.1.11",
@@ -74,6 +75,7 @@
     "eslint-plugin-react": "^7.37.5",
     "eslint-plugin-react-hooks": "^5.2.0",
     "eslint-plugin-unused-imports": "^4.1.4",
+    "globals": "^16.3.0",
     "happy-dom": "^18.0.1",
     "lefthook": "^1.11.14",
     "postcss": "^8.5.6",