difit 3.0.2 → 3.0.3

package/dist/server/file-watcher.d.ts

@@ -9,6 +9,11 @@ export declare class FileWatcherService {
     constructor();
     start(diffMode: DiffMode, watchPath: string, debounceMs?: number, onCacheInvalidate?: () => void): Promise<void>;
     private setupWatchers;
+    /**
+     * Resolve the actual git directory path, handling git worktrees.
+     * Uses git rev-parse --git-dir which correctly handles both normal repos and worktrees.
+     */
+    private resolveGitDir;
     private shouldIgnoreEvent;
     private matchesPattern;
     private isRelevantGitFile;

package/dist/server/file-watcher.js

@@ -1,4 +1,4 @@
-import { join } from 'path';
+import { join, resolve } from 'path';
 import { subscribe } from '@parcel/watcher';
 import { simpleGit } from 'simple-git';
 import { DiffMode } from '../types/watch.js';
@@ -60,7 +60,11 @@ export class FileWatcherService {
     }
     async setupWatchers(modeConfig, basePath) {
         for (const watchPath of modeConfig.watchPaths) {
-            const fullPath = join(basePath, watchPath);
+            let fullPath = join(basePath, watchPath);
+            // Resolve git worktree path for .git directory
+            if (watchPath === '.git') {
+                fullPath = await this.resolveGitDir(basePath);
+            }
             try {
                 const subscription = (await subscribe(fullPath, async (err, events) => {
                     if (err) {
@@ -101,6 +105,21 @@ export class FileWatcherService {
             }
         }
     }
+    /**
+     * Resolve the actual git directory path, handling git worktrees.
+     * Uses git rev-parse --git-dir which correctly handles both normal repos and worktrees.
+     */
+    async resolveGitDir(basePath) {
+        try {
+            const git = simpleGit(basePath);
+            const gitDir = await git.revparse(['--git-dir']);
+            return resolve(basePath, gitDir.trim());
+        }
+        catch {
+            // Fallback to default .git path
+            return join(basePath, '.git');
+        }
+    }
     shouldIgnoreEvent(filePath, ignorePatterns) {
         return ignorePatterns.some((pattern) => {
             // Handle negation patterns (e.g., "!.git/index")

package/dist/server/file-watcher.test.js

@@ -9,6 +9,7 @@ vi.mock('@parcel/watcher', () => ({
 vi.mock('simple-git', () => ({
     simpleGit: vi.fn(() => ({
         checkIgnore: vi.fn(),
+        revparse: vi.fn().mockResolvedValue('.git'),
     })),
 }));
 const { subscribe } = await import('@parcel/watcher');
@@ -202,6 +203,7 @@ describe('FileWatcherService', () => {
             for (const { mode, expectedType } of modes) {
                 const mockGit = {
                     checkIgnore: vi.fn().mockRejectedValue(new Error('No ignored files')),
+                    revparse: vi.fn().mockResolvedValue('.git'),
                 };
                 vi.mocked(simpleGit).mockReturnValue(mockGit);
                 await fileWatcher.start(mode, '/test/path', 300);
@@ -222,4 +224,54 @@ describe('FileWatcherService', () => {
             }
         });
     });
+    describe('git worktree support', () => {
+        it('should use resolved git directory for normal repository', async () => {
+            const mockGit = {
+                checkIgnore: vi.fn(),
+                revparse: vi.fn().mockResolvedValue('.git'),
+            };
+            vi.mocked(simpleGit).mockReturnValue(mockGit);
+            await fileWatcher.start(DiffMode.DEFAULT, '/test/path', 300);
+            expect(mockGit.revparse).toHaveBeenCalledWith(['--git-dir']);
+            expect(subscribe).toHaveBeenCalledWith('/test/path/.git', expect.any(Function), {
+                ignore: ['.git/objects/**', '.git/refs/**', 'node_modules/**'],
+            });
+        });
+        it('should resolve worktree git directory path', async () => {
+            const mockGit = {
+                checkIgnore: vi.fn(),
+                revparse: vi.fn().mockResolvedValue('/main/repo/.git/worktrees/feature'),
+            };
+            vi.mocked(simpleGit).mockReturnValue(mockGit);
+            await fileWatcher.start(DiffMode.DEFAULT, '/worktree/path', 300);
+            expect(mockGit.revparse).toHaveBeenCalledWith(['--git-dir']);
+            expect(subscribe).toHaveBeenCalledWith('/main/repo/.git/worktrees/feature', expect.any(Function), {
+                ignore: ['.git/objects/**', '.git/refs/**', 'node_modules/**'],
+            });
+        });
+        it('should resolve relative git directory path', async () => {
+            const mockGit = {
+                checkIgnore: vi.fn(),
+                revparse: vi.fn().mockResolvedValue('../.git/worktrees/feature'),
+            };
+            vi.mocked(simpleGit).mockReturnValue(mockGit);
+            await fileWatcher.start(DiffMode.DEFAULT, '/repos/worktree', 300);
+            expect(mockGit.revparse).toHaveBeenCalledWith(['--git-dir']);
+            // path.resolve('/repos/worktree', '../.git/worktrees/feature') = '/repos/.git/worktrees/feature'
+            expect(subscribe).toHaveBeenCalledWith('/repos/.git/worktrees/feature', expect.any(Function), {
+                ignore: ['.git/objects/**', '.git/refs/**', 'node_modules/**'],
+            });
+        });
+        it('should fallback to default .git path on error', async () => {
+            const mockGit = {
+                checkIgnore: vi.fn(),
+                revparse: vi.fn().mockRejectedValue(new Error('Not a git repository')),
+            };
+            vi.mocked(simpleGit).mockReturnValue(mockGit);
+            await fileWatcher.start(DiffMode.DEFAULT, '/test/path', 300);
+            expect(subscribe).toHaveBeenCalledWith('/test/path/.git', expect.any(Function), {
+                ignore: ['.git/objects/**', '.git/refs/**', 'node_modules/**'],
+            });
+        });
+    });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "difit",
-  "version": "3.0.2",
+  "version": "3.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": {