@office-ai/aioncli-core 0.26.0 → 0.30.1

package/dist/src/utils/filesearch/fileSearch.test.js

@@ -6,6 +6,9 @@
 import { describe, it, expect, afterEach, vi } from 'vitest';
 import { FileSearchFactory, AbortError, filter } from './fileSearch.js';
 import { createTmpDir, cleanupTmpDir } from '@google/gemini-cli-test-utils';
+import * as crawler from './crawler.js';
+import { GEMINI_IGNORE_FILE_NAME } from '../../config/constants.js';
+import { FileDiscoveryService } from '../../services/fileDiscoveryService.js';
 describe('FileSearch', () => {
     let tmpDir;
     afterEach(async () => {
@@ -16,47 +19,56 @@ describe('FileSearch', () => {
     });
     it('should use .geminiignore rules', async () => {
         tmpDir = await createTmpDir({
-            '.geminiignore': 'dist/',
+            [GEMINI_IGNORE_FILE_NAME]: 'dist/',
             dist: ['ignored.js'],
             src: ['not-ignored.js'],
         });
         const fileSearch = FileSearchFactory.create({
             projectRoot: tmpDir,
-            useGitignore: false,
-            useGeminiignore: true,
+            fileDiscoveryService: new FileDiscoveryService(tmpDir, {
+                respectGitIgnore: false,
+                respectGeminiIgnore: true,
+            }),
             ignoreDirs: [],
             cache: false,
             cacheTtl: 0,
             enableRecursiveFileSearch: true,
-            disableFuzzySearch: false,
+            enableFuzzySearch: true,
         });
         await fileSearch.initialize();
         const results = await fileSearch.search('');
-        expect(results).toEqual(['src/', '.geminiignore', 'src/not-ignored.js']);
+        expect(results).toEqual([
+            'src/',
+            GEMINI_IGNORE_FILE_NAME,
+            'src/not-ignored.js',
+        ]);
     });
     it('should combine .gitignore and .geminiignore rules', async () => {
         tmpDir = await createTmpDir({
+            '.git': {},
             '.gitignore': 'dist/',
-            '.geminiignore': 'build/',
+            [GEMINI_IGNORE_FILE_NAME]: 'build/',
             dist: ['ignored-by-git.js'],
             build: ['ignored-by-gemini.js'],
             src: ['not-ignored.js'],
         });
         const fileSearch = FileSearchFactory.create({
             projectRoot: tmpDir,
-            useGitignore: true,
-            useGeminiignore: true,
+            fileDiscoveryService: new FileDiscoveryService(tmpDir, {
+                respectGitIgnore: true,
+                respectGeminiIgnore: true,
+            }),
             ignoreDirs: [],
             cache: false,
             cacheTtl: 0,
             enableRecursiveFileSearch: true,
-            disableFuzzySearch: false,
+            enableFuzzySearch: true,
         });
         await fileSearch.initialize();
         const results = await fileSearch.search('');
         expect(results).toEqual([
             'src/',
-            '.geminiignore',
+            GEMINI_IGNORE_FILE_NAME,
             '.gitignore',
             'src/not-ignored.js',
         ]);
@@ -68,13 +80,15 @@ describe('FileSearch', () => {
         });
         const fileSearch = FileSearchFactory.create({
             projectRoot: tmpDir,
-            useGitignore: false,
-            useGeminiignore: false,
+            fileDiscoveryService: new FileDiscoveryService(tmpDir, {
+                respectGitIgnore: false,
+                respectGeminiIgnore: false,
+            }),
             ignoreDirs: ['logs'],
             cache: false,
             cacheTtl: 0,
             enableRecursiveFileSearch: true,
-            disableFuzzySearch: false,
+            enableFuzzySearch: true,
         });
         await fileSearch.initialize();
         const results = await fileSearch.search('');
@@ -82,6 +96,7 @@ describe('FileSearch', () => {
     });
     it('should handle negated directories', async () => {
         tmpDir = await createTmpDir({
+            '.git': {},
             '.gitignore': ['build/**', '!build/public', '!build/public/**'].join('\n'),
             build: {
                 'private.js': '',
@@ -91,13 +106,15 @@ describe('FileSearch', () => {
         });
         const fileSearch = FileSearchFactory.create({
             projectRoot: tmpDir,
-            useGitignore: true,
-            useGeminiignore: false,
+            fileDiscoveryService: new FileDiscoveryService(tmpDir, {
+                respectGitIgnore: true,
+                respectGeminiIgnore: false,
+            }),
             ignoreDirs: [],
             cache: false,
             cacheTtl: 0,
             enableRecursiveFileSearch: true,
-            disableFuzzySearch: false,
+            enableFuzzySearch: true,
         });
         await fileSearch.initialize();
         const results = await fileSearch.search('');
@@ -120,13 +137,15 @@ describe('FileSearch', () => {
         });
         const fileSearch = FileSearchFactory.create({
             projectRoot: tmpDir,
-            useGitignore: false,
-            useGeminiignore: false,
+            fileDiscoveryService: new FileDiscoveryService(tmpDir, {
+                respectGitIgnore: false,
+                respectGeminiIgnore: false,
+            }),
             ignoreDirs: [],
             cache: false,
             cacheTtl: 0,
             enableRecursiveFileSearch: true,
-            disableFuzzySearch: false,
+            enableFuzzySearch: true,
         });
         await fileSearch.initialize();
         const results = await fileSearch.search('**/*.js');
@@ -134,19 +153,22 @@ describe('FileSearch', () => {
     });
     it('should handle root-level file negation', async () => {
         tmpDir = await createTmpDir({
+            '.git': {},
             '.gitignore': ['*.mk', '!Foo.mk'].join('\n'),
             'bar.mk': '',
             'Foo.mk': '',
         });
         const fileSearch = FileSearchFactory.create({
             projectRoot: tmpDir,
-            useGitignore: true,
-            useGeminiignore: false,
+            fileDiscoveryService: new FileDiscoveryService(tmpDir, {
+                respectGitIgnore: true,
+                respectGeminiIgnore: false,
+            }),
             ignoreDirs: [],
             cache: false,
             cacheTtl: 0,
             enableRecursiveFileSearch: true,
-            disableFuzzySearch: false,
+            enableFuzzySearch: true,
         });
         await fileSearch.initialize();
         const results = await fileSearch.search('');
@@ -154,6 +176,7 @@ describe('FileSearch', () => {
     });
     it('should handle directory negation with glob', async () => {
         tmpDir = await createTmpDir({
+            '.git': {},
             '.gitignore': [
                 'third_party/**',
                 '!third_party/foo',
@@ -171,13 +194,15 @@ describe('FileSearch', () => {
         });
         const fileSearch = FileSearchFactory.create({
             projectRoot: tmpDir,
-            useGitignore: true,
-            useGeminiignore: false,
+            fileDiscoveryService: new FileDiscoveryService(tmpDir, {
+                respectGitIgnore: true,
+                respectGeminiIgnore: false,
+            }),
             ignoreDirs: [],
             cache: false,
             cacheTtl: 0,
             enableRecursiveFileSearch: true,
-            disableFuzzySearch: false,
+            enableFuzzySearch: true,
         });
         await fileSearch.initialize();
         const results = await fileSearch.search('');
@@ -191,19 +216,22 @@ describe('FileSearch', () => {
     });
     it('should correctly handle negated patterns in .gitignore', async () => {
         tmpDir = await createTmpDir({
+            '.git': {},
             '.gitignore': ['dist/**', '!dist/keep.js'].join('\n'),
             dist: ['ignore.js', 'keep.js'],
             src: ['main.js'],
         });
         const fileSearch = FileSearchFactory.create({
             projectRoot: tmpDir,
-            useGitignore: true,
-            useGeminiignore: false,
+            fileDiscoveryService: new FileDiscoveryService(tmpDir, {
+                respectGitIgnore: true,
+                respectGeminiIgnore: false,
+            }),
             ignoreDirs: [],
             cache: false,
             cacheTtl: 0,
             enableRecursiveFileSearch: true,
-            disableFuzzySearch: false,
+            enableFuzzySearch: true,
         });
         await fileSearch.initialize();
         const results = await fileSearch.search('');
@@ -222,13 +250,15 @@ describe('FileSearch', () => {
         });
         const fileSearch = FileSearchFactory.create({
             projectRoot: tmpDir,
-            useGitignore: true,
-            useGeminiignore: true,
+            fileDiscoveryService: new FileDiscoveryService(tmpDir, {
+                respectGitIgnore: true,
+                respectGeminiIgnore: true,
+            }),
             ignoreDirs: [],
             cache: false,
             cacheTtl: 0,
             enableRecursiveFileSearch: true,
-            disableFuzzySearch: false,
+            enableFuzzySearch: true,
         });
         // Expect no errors to be thrown during initialization
         await expect(fileSearch.initialize()).resolves.toBeUndefined();
@@ -246,13 +276,15 @@ describe('FileSearch', () => {
         });
         const fileSearch = FileSearchFactory.create({
             projectRoot: tmpDir,
-            useGitignore: false,
-            useGeminiignore: false,
+            fileDiscoveryService: new FileDiscoveryService(tmpDir, {
+                respectGitIgnore: false,
+                respectGeminiIgnore: false,
+            }),
             ignoreDirs: [],
             cache: false,
             cacheTtl: 0,
             enableRecursiveFileSearch: true,
-            disableFuzzySearch: false,
+            enableFuzzySearch: true,
         });
         await fileSearch.initialize();
         const results = await fileSearch.search('**/*.js', { maxResults: 2 });
@@ -268,19 +300,21 @@ describe('FileSearch', () => {
         });
         const fileSearch = FileSearchFactory.create({
             projectRoot: tmpDir,
-            useGitignore: false,
-            useGeminiignore: false,
+            fileDiscoveryService: new FileDiscoveryService(tmpDir, {
+                respectGitIgnore: false,
+                respectGeminiIgnore: false,
+            }),
             ignoreDirs: [],
             cache: false,
             cacheTtl: 0,
             enableRecursiveFileSearch: true,
-            disableFuzzySearch: false,
+            enableFuzzySearch: true,
         });
         await fileSearch.initialize();
         const results = await fileSearch.search('sst');
         expect(results).toEqual(['src/style.css']);
     });
-    it('should not use fzf for fuzzy matching when disableFuzzySearch is true', async () => {
+    it('should not use fzf for fuzzy matching when enableFuzzySearch is false', async () => {
         tmpDir = await createTmpDir({
             src: {
                 'file1.js': '',
@@ -290,19 +324,21 @@ describe('FileSearch', () => {
         });
         const fileSearch = FileSearchFactory.create({
             projectRoot: tmpDir,
-            useGitignore: false,
-            useGeminiignore: false,
+            fileDiscoveryService: new FileDiscoveryService(tmpDir, {
+                respectGitIgnore: false,
+                respectGeminiIgnore: false,
+            }),
             ignoreDirs: [],
             cache: false,
             cacheTtl: 0,
             enableRecursiveFileSearch: true,
-            disableFuzzySearch: true,
+            enableFuzzySearch: false,
         });
         await fileSearch.initialize();
         const results = await fileSearch.search('fle');
         expect(results).toEqual(['src/flexible.js']);
     });
-    it('should use fzf for fuzzy matching when disableFuzzySearch is false', async () => {
+    it('should use fzf for fuzzy matching when enableFuzzySearch is true', async () => {
         tmpDir = await createTmpDir({
             src: {
                 'file1.js': '',
@@ -312,13 +348,15 @@ describe('FileSearch', () => {
         });
         const fileSearch = FileSearchFactory.create({
             projectRoot: tmpDir,
-            useGitignore: false,
-            useGeminiignore: false,
+            fileDiscoveryService: new FileDiscoveryService(tmpDir, {
+                respectGitIgnore: false,
+                respectGeminiIgnore: false,
+            }),
             ignoreDirs: [],
             cache: false,
             cacheTtl: 0,
             enableRecursiveFileSearch: true,
-            disableFuzzySearch: false,
+            enableFuzzySearch: true,
         });
         await fileSearch.initialize();
         const results = await fileSearch.search('fle');
@@ -330,13 +368,15 @@ describe('FileSearch', () => {
         });
         const fileSearch = FileSearchFactory.create({
             projectRoot: tmpDir,
-            useGitignore: false,
-            useGeminiignore: false,
+            fileDiscoveryService: new FileDiscoveryService(tmpDir, {
+                respectGitIgnore: false,
+                respectGeminiIgnore: false,
+            }),
             ignoreDirs: [],
             cache: false,
             cacheTtl: 0,
             enableRecursiveFileSearch: true,
-            disableFuzzySearch: false,
+            enableFuzzySearch: true,
         });
         await fileSearch.initialize();
         const results = await fileSearch.search('nonexistent-file.xyz');
@@ -354,30 +394,35 @@ describe('FileSearch', () => {
         tmpDir = await createTmpDir({});
         const fileSearch = FileSearchFactory.create({
             projectRoot: tmpDir,
-            useGitignore: false,
-            useGeminiignore: false,
+            fileDiscoveryService: new FileDiscoveryService(tmpDir, {
+                respectGitIgnore: false,
+                respectGeminiIgnore: false,
+            }),
             ignoreDirs: [],
             cache: false,
             cacheTtl: 0,
             enableRecursiveFileSearch: true,
-            disableFuzzySearch: false,
+            enableFuzzySearch: true,
         });
         await expect(fileSearch.search('')).rejects.toThrow('Engine not initialized. Call initialize() first.');
     });
     it('should handle empty or commented-only ignore files', async () => {
         tmpDir = await createTmpDir({
+            '.git': {},
             '.gitignore': '# This is a comment\n\n   \n',
             src: ['main.js'],
         });
         const fileSearch = FileSearchFactory.create({
             projectRoot: tmpDir,
-            useGitignore: true,
-            useGeminiignore: false,
+            fileDiscoveryService: new FileDiscoveryService(tmpDir, {
+                respectGitIgnore: true,
+                respectGeminiIgnore: false,
+            }),
             ignoreDirs: [],
             cache: false,
             cacheTtl: 0,
             enableRecursiveFileSearch: true,
-            disableFuzzySearch: false,
+            enableFuzzySearch: true,
         });
         await fileSearch.initialize();
         const results = await fileSearch.search('');
@@ -390,18 +435,42 @@ describe('FileSearch', () => {
         });
         const fileSearch = FileSearchFactory.create({
             projectRoot: tmpDir,
-            useGitignore: false, // Explicitly disable .gitignore to isolate this rule
-            useGeminiignore: false,
+            fileDiscoveryService: new FileDiscoveryService(tmpDir, {
+                respectGitIgnore: false, // Explicitly disable .gitignore to isolate this rule
+                respectGeminiIgnore: false,
+            }),
             ignoreDirs: [],
             cache: false,
             cacheTtl: 0,
             enableRecursiveFileSearch: true,
-            disableFuzzySearch: false,
+            enableFuzzySearch: true,
         });
         await fileSearch.initialize();
         const results = await fileSearch.search('');
         expect(results).toEqual(['src/', 'src/main.js']);
     });
+    it('should respect default maxFiles budget of 20000 in RecursiveFileSearch', async () => {
+        const crawlSpy = vi.spyOn(crawler, 'crawl');
+        tmpDir = await createTmpDir({
+            'file1.js': '',
+        });
+        const fileSearch = FileSearchFactory.create({
+            projectRoot: tmpDir,
+            fileDiscoveryService: new FileDiscoveryService(tmpDir, {
+                respectGitIgnore: false,
+                respectGeminiIgnore: false,
+            }),
+            ignoreDirs: [],
+            cache: false,
+            cacheTtl: 0,
+            enableRecursiveFileSearch: true,
+            enableFuzzySearch: true,
+        });
+        await fileSearch.initialize();
+        expect(crawlSpy).toHaveBeenCalledWith(expect.objectContaining({
+            maxFiles: 20000,
+        }));
+    });
     it('should be cancellable via AbortSignal', async () => {
         const largeDir = {};
         for (let i = 0; i < 100; i++) {
@@ -410,13 +479,15 @@ describe('FileSearch', () => {
         tmpDir = await createTmpDir(largeDir);
         const fileSearch = FileSearchFactory.create({
             projectRoot: tmpDir,
-            useGitignore: false,
-            useGeminiignore: false,
+            fileDiscoveryService: new FileDiscoveryService(tmpDir, {
+                respectGitIgnore: false,
+                respectGeminiIgnore: false,
+            }),
             ignoreDirs: [],
             cache: false,
             cacheTtl: 0,
             enableRecursiveFileSearch: true,
-            disableFuzzySearch: false,
+            enableFuzzySearch: true,
         });
         await fileSearch.initialize();
         const controller = new AbortController();
@@ -440,13 +511,15 @@ describe('FileSearch', () => {
         });
         const fileSearch = FileSearchFactory.create({
             projectRoot: tmpDir,
-            useGitignore: false,
-            useGeminiignore: false,
+            fileDiscoveryService: new FileDiscoveryService(tmpDir, {
+                respectGitIgnore: false,
+                respectGeminiIgnore: false,
+            }),
             ignoreDirs: [],
             cache: true, // Enable caching for this test
             cacheTtl: 0,
             enableRecursiveFileSearch: true,
-            disableFuzzySearch: false,
+            enableFuzzySearch: true,
         });
         await fileSearch.initialize();
         // Perform a broad search to prime the cache
@@ -474,13 +547,15 @@ describe('FileSearch', () => {
         });
         const fileSearch = FileSearchFactory.create({
             projectRoot: tmpDir,
-            useGitignore: false,
-            useGeminiignore: false,
+            fileDiscoveryService: new FileDiscoveryService(tmpDir, {
+                respectGitIgnore: false,
+                respectGeminiIgnore: false,
+            }),
             ignoreDirs: [],
             cache: false,
             cacheTtl: 0,
             enableRecursiveFileSearch: true,
-            disableFuzzySearch: false,
+            enableFuzzySearch: true,
         });
         await fileSearch.initialize();
         // Search with a lowercase pattern
@@ -506,13 +581,15 @@ describe('FileSearch', () => {
         });
         const fileSearch = FileSearchFactory.create({
             projectRoot: tmpDir,
-            useGitignore: false,
-            useGeminiignore: false,
+            fileDiscoveryService: new FileDiscoveryService(tmpDir, {
+                respectGitIgnore: false,
+                respectGeminiIgnore: false,
+            }),
             ignoreDirs: [],
             cache: true, // Ensure caching is enabled
             cacheTtl: 10000,
             enableRecursiveFileSearch: true,
-            disableFuzzySearch: false,
+            enableFuzzySearch: true,
         });
         await fileSearch.initialize();
         // 1. Perform a broad search to populate the cache with an exact match.
@@ -538,13 +615,15 @@ describe('FileSearch', () => {
         });
         const fileSearch = FileSearchFactory.create({
             projectRoot: tmpDir,
-            useGitignore: false,
-            useGeminiignore: false,
+            fileDiscoveryService: new FileDiscoveryService(tmpDir, {
+                respectGitIgnore: false,
+                respectGeminiIgnore: false,
+            }),
             ignoreDirs: [],
             cache: false,
             cacheTtl: 0,
             enableRecursiveFileSearch: true,
-            disableFuzzySearch: false,
+            enableFuzzySearch: true,
         });
         await fileSearch.initialize();
         // Search for the file using a pattern that contains special characters.
@@ -561,13 +640,15 @@ describe('FileSearch', () => {
             });
             const fileSearch = FileSearchFactory.create({
                 projectRoot: tmpDir,
-                useGitignore: false,
-                useGeminiignore: false,
+                fileDiscoveryService: new FileDiscoveryService(tmpDir, {
+                    respectGitIgnore: false,
+                    respectGeminiIgnore: false,
+                }),
                 ignoreDirs: [],
                 cache: false,
                 cacheTtl: 0,
                 enableRecursiveFileSearch: false,
-                disableFuzzySearch: false,
+                enableFuzzySearch: true,
             });
             await fileSearch.initialize();
             const results = await fileSearch.search('*.js');
@@ -583,13 +664,15 @@ describe('FileSearch', () => {
             });
             const fileSearch = FileSearchFactory.create({
                 projectRoot: tmpDir,
-                useGitignore: false,
-                useGeminiignore: false,
+                fileDiscoveryService: new FileDiscoveryService(tmpDir, {
+                    respectGitIgnore: false,
+                    respectGeminiIgnore: false,
+                }),
                 ignoreDirs: [],
                 cache: false,
                 cacheTtl: 0,
                 enableRecursiveFileSearch: false,
-                disableFuzzySearch: false,
+                enableFuzzySearch: true,
             });
             await fileSearch.initialize();
             const results = await fileSearch.search('src/*.js');
@@ -605,13 +688,15 @@ describe('FileSearch', () => {
             });
             const fileSearch = FileSearchFactory.create({
                 projectRoot: tmpDir,
-                useGitignore: false,
-                useGeminiignore: false,
+                fileDiscoveryService: new FileDiscoveryService(tmpDir, {
+                    respectGitIgnore: false,
+                    respectGeminiIgnore: false,
+                }),
                 ignoreDirs: [],
                 cache: false,
                 cacheTtl: 0,
                 enableRecursiveFileSearch: false,
-                disableFuzzySearch: false,
+                enableFuzzySearch: true,
             });
             await fileSearch.initialize();
             const results = await fileSearch.search('src/');
@@ -619,19 +704,22 @@ describe('FileSearch', () => {
         });
         it('should respect ignore rules', async () => {
             tmpDir = await createTmpDir({
+                '.git': {},
                 '.gitignore': '*.js',
                 'file1.js': '',
                 'file2.ts': '',
             });
             const fileSearch = FileSearchFactory.create({
                 projectRoot: tmpDir,
-                useGitignore: true,
-                useGeminiignore: false,
+                fileDiscoveryService: new FileDiscoveryService(tmpDir, {
+                    respectGitIgnore: true,
+                    respectGeminiIgnore: false,
+                }),
                 ignoreDirs: [],
                 cache: false,
                 cacheTtl: 0,
                 enableRecursiveFileSearch: false,
-                disableFuzzySearch: false,
+                enableFuzzySearch: true,
             });
             await fileSearch.initialize();
             const results = await fileSearch.search('*');