diff options
| author | Billy Biggs <[email protected]> | 2025-06-21 18:23:35 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2025-06-22 01:23:35 +0000 |
| commit | 0779697da6caeae09b67a146013612a34f369b74 (patch) | |
| tree | 665d2b22773b28843648b01fd74b5f0dcb392c6f /packages/cli/src | |
| parent | 63f6a497cba61299a1c24aa96795a55479740ac6 (diff) | |
Add setting enableRecursiveFileSearch to control @-file completion (#1290)
Diffstat (limited to 'packages/cli/src')
| -rw-r--r-- | packages/cli/src/config/config.integration.test.ts | 12 | ||||
| -rw-r--r-- | packages/cli/src/config/config.ts | 6 | ||||
| -rw-r--r-- | packages/cli/src/config/settings.ts | 1 | ||||
| -rw-r--r-- | packages/cli/src/ui/hooks/useCompletion.integration.test.ts | 30 | ||||
| -rw-r--r-- | packages/cli/src/ui/hooks/useCompletion.ts | 8 |
5 files changed, 52 insertions, 5 deletions
diff --git a/packages/cli/src/config/config.integration.test.ts b/packages/cli/src/config/config.integration.test.ts index de329384..868538ab 100644 --- a/packages/cli/src/config/config.integration.test.ts +++ b/packages/cli/src/config/config.integration.test.ts @@ -75,7 +75,9 @@ describe('Configuration Integration Tests', () => { sandbox: false, targetDir: tempDir, debugMode: false, - fileFilteringRespectGitIgnore: false, + fileFiltering: { + respectGitIgnore: false, + }, }; const config = new Config(configParams); @@ -109,7 +111,9 @@ describe('Configuration Integration Tests', () => { sandbox: false, targetDir: tempDir, debugMode: false, - fileFilteringRespectGitIgnore: false, + fileFiltering: { + respectGitIgnore: false, + }, }; const config = new Config(configParams); @@ -178,7 +182,9 @@ describe('Configuration Integration Tests', () => { sandbox: false, targetDir: tempDir, debugMode: false, - fileFilteringRespectGitIgnore: false, // CI might need to see all files + fileFiltering: { + respectGitIgnore: false, + }, // CI might need to see all files }; const config = new Config(configParams); diff --git a/packages/cli/src/config/config.ts b/packages/cli/src/config/config.ts index afc63b78..26894bc9 100644 --- a/packages/cli/src/config/config.ts +++ b/packages/cli/src/config/config.ts @@ -228,7 +228,11 @@ export async function loadCliConfig( logPrompts: argv.telemetryLogPrompts ?? settings.telemetry?.logPrompts, }, // Git-aware file filtering settings - fileFilteringRespectGitIgnore: settings.fileFiltering?.respectGitIgnore, + fileFiltering: { + respectGitIgnore: settings.fileFiltering?.respectGitIgnore, + enableRecursiveFileSearch: + settings.fileFiltering?.enableRecursiveFileSearch, + }, checkpointing: argv.checkpointing || settings.checkpointing?.enabled, proxy: process.env.HTTPS_PROXY || diff --git a/packages/cli/src/config/settings.ts b/packages/cli/src/config/settings.ts index b63f5bb6..b149216a 100644 --- a/packages/cli/src/config/settings.ts +++ b/packages/cli/src/config/settings.ts @@ -56,6 +56,7 @@ export interface Settings { // Git-aware file filtering settings fileFiltering?: { respectGitIgnore?: boolean; + enableRecursiveFileSearch?: boolean; }; // UI setting. Does not display the ANSI-controlled terminal title. diff --git a/packages/cli/src/ui/hooks/useCompletion.integration.test.ts b/packages/cli/src/ui/hooks/useCompletion.integration.test.ts index 40af5d4f..237b6aae 100644 --- a/packages/cli/src/ui/hooks/useCompletion.integration.test.ts +++ b/packages/cli/src/ui/hooks/useCompletion.integration.test.ts @@ -47,6 +47,7 @@ describe('useCompletion git-aware filtering integration', () => { mockConfig = { getFileFilteringRespectGitIgnore: vi.fn(() => true), getFileService: vi.fn().mockReturnValue(mockFileDiscoveryService), + getEnableRecursiveFileSearch: vi.fn(() => true), }; vi.mocked(FileDiscoveryService).mockImplementation( @@ -170,6 +171,35 @@ describe('useCompletion git-aware filtering integration', () => { ); }); + it('should not perform recursive search when disabled in config', async () => { + const globResults = [`${testCwd}/data`, `${testCwd}/dist`]; + vi.mocked(glob).mockResolvedValue(globResults); + + // Disable recursive search in the mock config + const mockConfigNoRecursive = { + ...mockConfig, + getEnableRecursiveFileSearch: vi.fn(() => false), + }; + + vi.mocked(fs.readdir).mockResolvedValue([ + { name: 'data', isDirectory: () => true }, + { name: 'dist', isDirectory: () => true }, + ] as Array<{ name: string; isDirectory: () => boolean }>); + + renderHook(() => + useCompletion('@d', testCwd, true, slashCommands, mockConfigNoRecursive), + ); + + await act(async () => { + await new Promise((resolve) => setTimeout(resolve, 150)); + }); + + // `glob` should not be called because recursive search is disabled + expect(glob).not.toHaveBeenCalled(); + // `fs.readdir` should be called for the top-level directory instead + expect(fs.readdir).toHaveBeenCalledWith(testCwd, { withFileTypes: true }); + }); + it('should work without config (fallback behavior)', async () => { vi.mocked(fs.readdir).mockResolvedValue([ { name: 'src', isDirectory: () => true }, diff --git a/packages/cli/src/ui/hooks/useCompletion.ts b/packages/cli/src/ui/hooks/useCompletion.ts index 7cbe8a7e..eef54fc8 100644 --- a/packages/cli/src/ui/hooks/useCompletion.ts +++ b/packages/cli/src/ui/hooks/useCompletion.ts @@ -322,10 +322,16 @@ export function useCompletion( let fetchedSuggestions: Suggestion[] = []; const fileDiscoveryService = config ? config.getFileService() : null; + const enableRecursiveSearch = + config?.getEnableRecursiveFileSearch() ?? true; try { // If there's no slash, or it's the root, do a recursive search from cwd - if (partialPath.indexOf('/') === -1 && prefix) { + if ( + partialPath.indexOf('/') === -1 && + prefix && + enableRecursiveSearch + ) { if (fileDiscoveryService) { fetchedSuggestions = await findFilesWithGlob( prefix, |
