difit 3.1.9 → 3.1.11

package/dist/cli/index.test.js

@@ -3,6 +3,7 @@ import React from 'react';
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 import { DiffMode } from '../types/watch.js';
 import { DEFAULT_DIFF_VIEW_MODE, normalizeDiffViewMode } from '../utils/diffMode.js';
+import pkg from '../../package.json' with { type: 'json' };
 // Mock all external dependencies
 vi.mock('simple-git');
 vi.mock('../server/server.js');
@@ -13,19 +14,19 @@ vi.mock('./utils.js', async () => {
         promptUser: vi.fn(),
         findUntrackedFiles: vi.fn(),
         markFilesIntentToAdd: vi.fn(),
-        resolvePrCommits: vi.fn(),
+        getPrPatch: vi.fn(),
     };
 });
 const { simpleGit } = await import('simple-git');
 const { startServer } = await import('../server/server.js');
-const { promptUser, findUntrackedFiles, markFilesIntentToAdd, resolvePrCommits } = await import('./utils.js');
+const { promptUser, findUntrackedFiles, markFilesIntentToAdd, getPrPatch } = await import('./utils.js');
 describe('CLI index.ts', () => {
     let mockGit;
     let mockStartServer;
     let mockPromptUser;
     let mockFindUntrackedFiles;
     let mockMarkFilesIntentToAdd;
-    let mockResolvePrCommits;
+    let mockGetPrPatch;
     // Store original console methods
     let originalConsoleLog;
     let originalConsoleError;
@@ -46,7 +47,7 @@ describe('CLI index.ts', () => {
         mockPromptUser = vi.mocked(promptUser);
         mockFindUntrackedFiles = vi.mocked(findUntrackedFiles);
         mockMarkFilesIntentToAdd = vi.mocked(markFilesIntentToAdd);
-        mockResolvePrCommits = vi.mocked(resolvePrCommits);
+        mockGetPrPatch = vi.mocked(getPrPatch);
         // Mock console and process.exit
         originalConsoleLog = console.log;
         originalConsoleError = console.error;
@@ -194,6 +195,11 @@ describe('CLI index.ts', () => {
                 args: ['--clean'],
                 expectedOptions: { clean: true },
             },
+            {
+                name: '--keep-alive option',
+                args: ['--keep-alive'],
+                expectedOptions: { keepAlive: true },
+            },
         ])('$name', async ({ args, expectedOptions }) => {
             mockFindUntrackedFiles.mockResolvedValue([]);
             const program = new Command();
@@ -207,6 +213,7 @@ describe('CLI index.ts', () => {
                 .option('--tui', 'tui')
                 .option('--pr <url>', 'pr')
                 .option('--clean', 'start with a clean slate by clearing all existing comments')
+                .option('--keep-alive', 'keep server running even after browser disconnects')
                 .action(async (commitish, _compareWith, options) => {
                 let targetCommitish = commitish;
                 let baseCommitish = commitish + '^';
@@ -218,6 +225,7 @@ describe('CLI index.ts', () => {
                     openBrowser: options.open,
                     mode: options.mode,
                     clearComments: options.clean,
+                    keepAlive: options.keepAlive,
                 });
             });
             await program.parseAsync([...args], { from: 'user' });
@@ -229,10 +237,39 @@ describe('CLI index.ts', () => {
                 openBrowser: expectedOptions.open !== false,
                 mode: expectedOptions.mode || 'split',
                 clearComments: expectedOptions.clean,
+                keepAlive: expectedOptions.keepAlive,
             };
             expect(mockStartServer).toHaveBeenCalledWith(expectedCall);
         });
     });
+    describe('Version option', () => {
+        it('supports --version flag', async () => {
+            const program = new Command();
+            const stdoutWrite = vi.spyOn(process.stdout, 'write').mockImplementation(() => true);
+            program.version(pkg.version, '-v, --version', 'output the version number').exitOverride();
+            try {
+                await program.parseAsync(['--version'], { from: 'user' });
+            }
+            catch {
+                // commander exits after printing version
+            }
+            expect(stdoutWrite).toHaveBeenCalledWith(`${pkg.version}\n`);
+            stdoutWrite.mockRestore();
+        });
+        it('supports -v flag', async () => {
+            const program = new Command();
+            const stdoutWrite = vi.spyOn(process.stdout, 'write').mockImplementation(() => true);
+            program.version(pkg.version, '-v, --version', 'output the version number').exitOverride();
+            try {
+                await program.parseAsync(['-v'], { from: 'user' });
+            }
+            catch {
+                // commander exits after printing version
+            }
+            expect(stdoutWrite).toHaveBeenCalledWith(`${pkg.version}\n`);
+            stdoutWrite.mockRestore();
+        });
+    });
     describe('Git operations', () => {
         it('handles untracked files for working directory', async () => {
             const untrackedFiles = ['file1.js', 'file2.js'];
@@ -372,13 +409,10 @@ describe('CLI index.ts', () => {
         });
     });
     describe('GitHub PR integration', () => {
-        it('resolves PR commits correctly', async () => {
+        it('loads PR patch with gh and starts server with stdin diff', async () => {
             const prUrl = 'https://github.com/owner/repo/pull/123';
-            const prCommits = {
-                targetCommitish: 'abc123',
-                baseCommitish: 'def456',
-            };
-            mockResolvePrCommits.mockResolvedValue(prCommits);
+            const prPatch = 'diff --git a/file.ts b/file.ts\nindex 1111111..2222222 100644\n';
+            mockGetPrPatch.mockReturnValue(prPatch);
             const program = new Command();
             program
                 .argument('[commit-ish]', 'commit-ish', 'HEAD')
@@ -390,23 +424,14 @@ describe('CLI index.ts', () => {
                 .option('--tui', 'tui')
                 .option('--pr <url>', 'pr')
                 .action(async (commitish, _compareWith, options) => {
-                let targetCommitish = commitish;
-                let baseCommitish;
                 if (options.pr) {
                     if (commitish !== 'HEAD' || _compareWith) {
                         console.error('Error: --pr option cannot be used with positional arguments');
                         process.exit(1);
                     }
-                    const prCommits = await resolvePrCommits(options.pr);
-                    targetCommitish = prCommits.targetCommitish;
-                    baseCommitish = prCommits.baseCommitish;
-                }
-                else {
-                    baseCommitish = commitish + '^';
                 }
                 await startServer({
-                    targetCommitish,
-                    baseCommitish,
+                    stdinDiff: getPrPatch(options.pr),
                     preferredPort: options.port,
                     host: options.host,
                     openBrowser: options.open,
@@ -414,10 +439,9 @@ describe('CLI index.ts', () => {
                 });
             });
             await program.parseAsync(['--pr', prUrl], { from: 'user' });
-            expect(mockResolvePrCommits).toHaveBeenCalledWith(prUrl);
+            expect(mockGetPrPatch).toHaveBeenCalledWith(prUrl);
             expect(mockStartServer).toHaveBeenCalledWith({
-                targetCommitish: 'abc123',
-                baseCommitish: 'def456',
+                stdinDiff: prPatch,
                 preferredPort: undefined,
                 host: '',
                 openBrowser: true,
@@ -449,13 +473,8 @@ describe('CLI index.ts', () => {
             expect(console.error).toHaveBeenCalledWith('Error: --pr option cannot be used with positional arguments');
             expect(process.exit).toHaveBeenCalledWith(1);
         });
-        it('resolves GitHub Enterprise PR commits correctly', async () => {
-            const prUrl = 'https://github.enterprise.com/owner/repo/pull/456';
-            const prCommits = {
-                targetCommitish: 'xyz789',
-                baseCommitish: 'uvw012',
-            };
-            mockResolvePrCommits.mockResolvedValue(prCommits);
+        it('rejects PR option with --tui', async () => {
+            const prUrl = 'https://github.com/owner/repo/pull/123';
             const program = new Command();
             program
                 .argument('[commit-ish]', 'commit-ish', 'HEAD')
@@ -467,39 +486,21 @@ describe('CLI index.ts', () => {
                 .option('--tui', 'tui')
                 .option('--pr <url>', 'pr')
                 .action(async (commitish, _compareWith, options) => {
-                let targetCommitish = commitish;
-                let baseCommitish;
                 if (options.pr) {
                     if (commitish !== 'HEAD' || _compareWith) {
                         console.error('Error: --pr option cannot be used with positional arguments');
                         process.exit(1);
                     }
-                    const prCommits = await resolvePrCommits(options.pr);
-                    targetCommitish = prCommits.targetCommitish;
-                    baseCommitish = prCommits.baseCommitish;
-                }
-                else {
-                    baseCommitish = commitish + '^';
+                    if (options.tui) {
+                        console.error('Error: --pr option cannot be used with --tui');
+                        process.exit(1);
+                    }
                 }
-                await startServer({
-                    targetCommitish,
-                    baseCommitish,
-                    preferredPort: options.port,
-                    host: options.host,
-                    openBrowser: options.open,
-                    mode: options.mode,
-                });
-            });
-            await program.parseAsync(['--pr', prUrl], { from: 'user' });
-            expect(mockResolvePrCommits).toHaveBeenCalledWith(prUrl);
-            expect(mockStartServer).toHaveBeenCalledWith({
-                targetCommitish: 'xyz789',
-                baseCommitish: 'uvw012',
-                preferredPort: undefined,
-                host: '',
-                openBrowser: true,
-                mode: 'split',
             });
+            await program.parseAsync(['--pr', prUrl, '--tui'], { from: 'user' });
+            expect(console.error).toHaveBeenCalledWith('Error: --pr option cannot be used with --tui');
+            expect(process.exit).toHaveBeenCalledWith(1);
+            expect(mockStartServer).not.toHaveBeenCalled();
         });
     });
     describe('Clean flag functionality', () => {
@@ -584,6 +585,92 @@ describe('CLI index.ts', () => {
             expect(console.log).not.toHaveBeenCalledWith('🧹 Starting with a clean slate - all existing comments will be cleared');
         });
     });
+    describe('Keep-alive flag functionality', () => {
+        it('displays keep-alive message when flag is used', async () => {
+            mockFindUntrackedFiles.mockResolvedValue([]);
+            mockStartServer.mockResolvedValue({
+                port: 4966,
+                url: 'http://localhost:4966',
+                isEmpty: false,
+            });
+            const program = new Command();
+            program
+                .argument('[commit-ish]', 'commit-ish', 'HEAD')
+                .argument('[compare-with]', 'compare-with')
+                .option('--port <port>', 'port', parseInt)
+                .option('--host <host>', 'host', '')
+                .option('--no-open', 'no-open')
+                .option('--mode <mode>', 'mode', normalizeDiffViewMode, DEFAULT_DIFF_VIEW_MODE)
+                .option('--tui', 'tui')
+                .option('--pr <url>', 'pr')
+                .option('--clean', 'start with a clean slate by clearing all existing comments')
+                .option('--keep-alive', 'keep server running even after browser disconnects')
+                .action(async (commitish, _compareWith, options) => {
+                const { url } = await startServer({
+                    targetCommitish: commitish,
+                    baseCommitish: commitish + '^',
+                    preferredPort: options.port,
+                    host: options.host,
+                    openBrowser: options.open,
+                    mode: options.mode,
+                    clearComments: options.clean,
+                    keepAlive: options.keepAlive,
+                });
+                console.log(`\n🚀 difit server started on ${url}`);
+                console.log(`📋 Reviewing: ${commitish}`);
+                if (options.keepAlive) {
+                    console.log('🔒 Keep-alive mode: server will stay running after browser disconnects');
+                }
+            });
+            await program.parseAsync(['--keep-alive'], { from: 'user' });
+            expect(mockStartServer).toHaveBeenCalledWith(expect.objectContaining({
+                keepAlive: true,
+            }));
+            expect(console.log).toHaveBeenCalledWith('🔒 Keep-alive mode: server will stay running after browser disconnects');
+        });
+        it('does not display keep-alive message when flag is not used', async () => {
+            mockFindUntrackedFiles.mockResolvedValue([]);
+            mockStartServer.mockResolvedValue({
+                port: 4966,
+                url: 'http://localhost:4966',
+                isEmpty: false,
+            });
+            const program = new Command();
+            program
+                .argument('[commit-ish]', 'commit-ish', 'HEAD')
+                .argument('[compare-with]', 'compare-with')
+                .option('--port <port>', 'port', parseInt)
+                .option('--host <host>', 'host', '')
+                .option('--no-open', 'no-open')
+                .option('--mode <mode>', 'mode', normalizeDiffViewMode, DEFAULT_DIFF_VIEW_MODE)
+                .option('--tui', 'tui')
+                .option('--pr <url>', 'pr')
+                .option('--clean', 'start with a clean slate by clearing all existing comments')
+                .option('--keep-alive', 'keep server running even after browser disconnects')
+                .action(async (commitish, _compareWith, options) => {
+                const { url } = await startServer({
+                    targetCommitish: commitish,
+                    baseCommitish: commitish + '^',
+                    preferredPort: options.port,
+                    host: options.host,
+                    openBrowser: options.open,
+                    mode: options.mode,
+                    clearComments: options.clean,
+                    keepAlive: options.keepAlive,
+                });
+                console.log(`\n🚀 difit server started on ${url}`);
+                console.log(`📋 Reviewing: ${commitish}`);
+                if (options.keepAlive) {
+                    console.log('🔒 Keep-alive mode: server will stay running after browser disconnects');
+                }
+            });
+            await program.parseAsync([], { from: 'user' });
+            expect(mockStartServer).toHaveBeenCalledWith(expect.objectContaining({
+                keepAlive: undefined,
+            }));
+            expect(console.log).not.toHaveBeenCalledWith('🔒 Keep-alive mode: server will stay running after browser disconnects');
+        });
+    });
     describe('Console output', () => {
         it('displays server startup message with correct URL', async () => {
             mockFindUntrackedFiles.mockResolvedValue([]);

package/dist/cli/utils.d.ts

@@ -1,9 +1,9 @@
 import { type Stats } from 'node:fs';
 import type { SimpleGit } from 'simple-git';
 type StdinStat = Pick<Stats, 'isFIFO' | 'isFile' | 'isSocket'>;
-export type StdinSource = 'pipe' | 'file' | 'socket' | 'tty';
+type StdinSource = 'pipe' | 'file' | 'socket' | 'tty';
 export declare function detectStdinSource(stdinStat?: StdinStat): StdinSource;
-export interface ShouldReadStdinOptions {
+interface ShouldReadStdinOptions {
     commitish: string;
     hasPositionalArgs: boolean;
     hasPrOption: boolean;
@@ -15,17 +15,14 @@ export declare function getGitRoot(): string;
 export declare function validateCommitish(commitish: string): boolean;
 export declare function shortHash(hash: string): string;
 export declare function createCommitRangeString(baseHash: string, targetHash: string): string;
-export interface PullRequestInfo {
+interface PullRequestInfo {
     owner: string;
     repo: string;
     pullNumber: number;
     hostname: string;
 }
 export declare function parseGitHubPrUrl(url: string): PullRequestInfo | null;
-export declare function resolvePrCommits(prUrl: string): Promise<{
-    targetCommitish: string;
-    baseCommitish: string;
-}>;
+export declare function getPrPatch(prArg: string): string;
 export declare function validateDiffArguments(targetCommitish: string, baseCommitish?: string): {
     valid: boolean;
     error?: string;

package/dist/cli/utils.js

@@ -1,7 +1,6 @@
-import { execSync } from 'child_process';
+import { execFileSync, execSync } from 'child_process';
 import { fstatSync } from 'node:fs';
 import { createInterface } from 'readline/promises';
-import { Octokit } from '@octokit/rest';
 export function detectStdinSource(stdinStat = fstatSync(0)) {
     if (stdinStat.isFIFO()) {
         return 'pipe';
@@ -122,107 +121,27 @@ export function parseGitHubPrUrl(url) {
         return null;
     }
 }
-function getGitHubToken() {
-    // Try to get token from environment variable first
-    if (process.env.GITHUB_TOKEN) {
-        return process.env.GITHUB_TOKEN;
-    }
-    // Try to get token from GitHub CLI
+export function getPrPatch(prArg) {
     try {
-        const result = execSync('gh auth token', { encoding: 'utf8', stdio: 'pipe' });
-        return result.trim();
-    }
-    catch {
-        // GitHub CLI not available or not authenticated
-        return undefined;
-    }
-}
-async function fetchPrDetails(prInfo) {
-    const token = getGitHubToken();
-    const octokitOptions = {
-        auth: token,
-    };
-    // For GitHub Enterprise, set the base URL
-    if (prInfo.hostname !== 'github.com') {
-        octokitOptions.baseUrl = `https://${prInfo.hostname}/api/v3`;
-    }
-    const octokit = new Octokit(octokitOptions);
-    try {
-        const { data: pr } = await octokit.rest.pulls.get({
-            owner: prInfo.owner,
-            repo: prInfo.repo,
-            pull_number: prInfo.pullNumber,
+        const patch = execFileSync('gh', ['pr', 'diff', prArg, '--patch'], {
+            encoding: 'utf8',
+            stdio: ['ignore', 'pipe', 'pipe'],
         });
-        return {
-            baseSha: pr.base.sha,
-            headSha: pr.head.sha,
-            baseRef: pr.base.ref,
-            headRef: pr.head.ref,
-        };
-    }
-    catch (error) {
-        if (error instanceof Error) {
-            let authHint = '';
-            // Provide more specific error messages for authentication issues
-            if (error.message.includes('Bad credentials')) {
-                if (prInfo.hostname !== 'github.com') {
-                    authHint = `\n\nFor GitHub Enterprise Server (${prInfo.hostname}):
-1. Generate a token on YOUR Enterprise Server: https://${prInfo.hostname}/settings/tokens
-2. Set it as GITHUB_TOKEN environment variable
-3. Tokens from github.com will NOT work on Enterprise servers`;
-                }
-                else {
-                    authHint = '\n\nTry: gh auth login or set GITHUB_TOKEN environment variable';
-                }
-            }
-            else if (!token) {
-                authHint = ' (Try: gh auth login or set GITHUB_TOKEN environment variable)';
-            }
-            throw new Error(`Failed to fetch PR details: ${error.message}${authHint}`);
-        }
-        throw new Error('Failed to fetch PR details: Unknown error');
-    }
-}
-function resolveCommitInLocalRepo(sha, context) {
-    try {
-        // Verify if the commit exists locally
-        execSync(`git cat-file -e ${sha}`, { stdio: 'ignore' });
-        return sha;
-    }
-    catch {
-        // If commit doesn't exist, try to fetch from remote
-        try {
-            execSync('git fetch origin', { stdio: 'ignore' });
-            execSync(`git cat-file -e ${sha}`, { stdio: 'ignore' });
-            return sha;
-        }
-        catch {
-            const errorMessage = [
-                `Commit ${sha} not found in local repository.`,
-                '',
-                'Common causes:',
-                '  • Are you running this command in the correct repository directory?',
-                context ? `    • Expected repository: ${context.owner}/${context.repo}` : '',
-                '  • Is this PR from a fork?',
-                '    • Try: git remote add upstream <original-repo-url> && git fetch upstream',
-                '    • Try: git fetch --all to fetch from all remotes',
-            ]
-                .filter(Boolean)
-                .join('\n');
-            throw new Error(errorMessage);
+        if (!patch.trim()) {
+            throw new Error('No patch content returned from gh pr diff --patch');
         }
+        return patch;
     }
-}
-export async function resolvePrCommits(prUrl) {
-    const prInfo = parseGitHubPrUrl(prUrl);
-    if (!prInfo) {
-        throw new Error('Invalid GitHub PR URL format. Expected: https://github.com/owner/repo/pull/123 or https://github.enterprise.com/owner/repo/pull/123');
+    catch (error) {
+        const stderr = error.stderr;
+        const stderrText = typeof stderr === 'string'
+            ? stderr.trim()
+            : Buffer.isBuffer(stderr)
+                ? stderr.toString('utf8').trim()
+                : '';
+        const message = stderrText || (error instanceof Error ? error.message : 'Unknown error while running gh');
+        throw new Error(`${message}\nTry: gh auth login`);
     }
-    const prDetails = await fetchPrDetails(prInfo);
-    const context = { owner: prInfo.owner, repo: prInfo.repo };
-    const targetCommitish = resolveCommitInLocalRepo(prDetails.headSha, context);
-    const baseCommitish = resolveCommitInLocalRepo(prDetails.baseSha, context);
-    return { targetCommitish, baseCommitish };
 }
 export function validateDiffArguments(targetCommitish, baseCommitish) {
     // Validate target commitish format