@google/gemini-cli-core 0.1.13 → 0.1.15

package/dist/src/utils/getFolderStructure.js

@@ -6,6 +6,7 @@
 import * as fs from 'fs/promises';
 import * as path from 'path';
 import { getErrorMessage, isNodeError } from './errors.js';
+import { DEFAULT_FILE_FILTERING_OPTIONS } from '../config/config.js';
 const MAX_ITEMS = 200;
 const TRUNCATION_INDICATOR = '...';
 const DEFAULT_IGNORED_FOLDERS = new Set(['node_modules', '.git', 'dist']);
@@ -68,8 +69,12 @@ async function readFullStructure(rootPath, options) {
                 }
                 const fileName = entry.name;
                 const filePath = path.join(currentPath, fileName);
-                if (options.respectGitIgnore && options.fileService) {
-                    if (options.fileService.shouldGitIgnoreFile(filePath)) {
+                if (options.fileService) {
+                    const shouldIgnore = (options.fileFilteringOptions.respectGitIgnore &&
+                        options.fileService.shouldGitIgnoreFile(filePath)) ||
+                        (options.fileFilteringOptions.respectGeminiIgnore &&
+                            options.fileService.shouldGeminiIgnoreFile(filePath));
+                    if (shouldIgnore) {
                         continue;
                     }
                 }
@@ -97,13 +102,15 @@ async function readFullStructure(rootPath, options) {
                 // This logic is tricky. Let's try a simpler: if we can't add this item, mark and break.
                 const subFolderName = entry.name;
                 const subFolderPath = path.join(currentPath, subFolderName);
-                let isIgnoredByGit = false;
-                if (options.respectGitIgnore && options.fileService) {
-                    if (options.fileService.shouldGitIgnoreFile(subFolderPath)) {
-                        isIgnoredByGit = true;
-                    }
+                let isIgnored = false;
+                if (options.fileService) {
+                    isIgnored =
+                        (options.fileFilteringOptions.respectGitIgnore &&
+                            options.fileService.shouldGitIgnoreFile(subFolderPath)) ||
+                            (options.fileFilteringOptions.respectGeminiIgnore &&
+                                options.fileService.shouldGeminiIgnoreFile(subFolderPath));
                 }
-                if (options.ignoredFolders.has(subFolderName) || isIgnoredByGit) {
+                if (options.ignoredFolders.has(subFolderName) || isIgnored) {
                     const ignoredSubFolder = {
                         name: subFolderName,
                         path: subFolderPath,
@@ -151,7 +158,7 @@ function formatStructure(node, currentIndent, isLastChildOfParent, isProcessingR
     // Its children are printed relative to that conceptual root.
     // Ignored root nodes ARE printed with a connector.
     if (!isProcessingRootNode || node.isIgnored) {
-        builder.push(`${currentIndent}${connector}${node.name}/${node.isIgnored ? TRUNCATION_INDICATOR : ''}`);
+        builder.push(`${currentIndent}${connector}${node.name}${path.sep}${node.isIgnored ? TRUNCATION_INDICATOR : ''}`);
     }
     // Determine the indent for the children of *this* node.
     // If *this* node was the root of the whole structure, its children start with no indent before their connectors.
@@ -201,7 +208,7 @@ export async function getFolderStructure(directory, options) {
         ignoredFolders: options?.ignoredFolders ?? DEFAULT_IGNORED_FOLDERS,
         fileIncludePattern: options?.fileIncludePattern,
         fileService: options?.fileService,
-        respectGitIgnore: options?.respectGitIgnore ?? true,
+        fileFilteringOptions: options?.fileFilteringOptions ?? DEFAULT_FILE_FILTERING_OPTIONS,
     };
     try {
         // 1. Read the structure using BFS, respecting maxItems
@@ -214,30 +221,22 @@ export async function getFolderStructure(directory, options) {
         // Pass true for isRoot for the initial call
         formatStructure(structureRoot, '', true, true, structureLines);
         // 3. Build the final output string
-        const displayPath = resolvedPath.replace(/\\/g, '/');
-        let disclaimer = '';
-        // Check if truncation occurred anywhere or if ignored folders are present.
-        // A simple check: if any node indicates more files/subfolders, or is ignored.
-        let truncationOccurred = false;
-        function checkForTruncation(node) {
+        function isTruncated(node) {
             if (node.hasMoreFiles || node.hasMoreSubfolders || node.isIgnored) {
-                truncationOccurred = true;
+                return true;
             }
-            if (!truncationOccurred) {
-                for (const sub of node.subFolders) {
-                    checkForTruncation(sub);
-                    if (truncationOccurred)
-                        break;
+            for (const sub of node.subFolders) {
+                if (isTruncated(sub)) {
+                    return true;
                 }
             }
+            return false;
         }
-        checkForTruncation(structureRoot);
-        if (truncationOccurred) {
-            disclaimer = `Folders or files indicated with ${TRUNCATION_INDICATOR} contain more items not shown, were ignored, or the display limit (${mergedOptions.maxItems} items) was reached.`;
+        let summary = `Showing up to ${mergedOptions.maxItems} items (files + folders).`;
+        if (isTruncated(structureRoot)) {
+            summary += ` Folders or files indicated with ${TRUNCATION_INDICATOR} contain more items not shown, were ignored, or the display limit (${mergedOptions.maxItems} items) was reached.`;
         }
-        const summary = `Showing up to ${mergedOptions.maxItems} items (files + folders). ${disclaimer}`.trim();
-        const output = `${summary}\n\n${displayPath}/\n${structureLines.join('\n')}`;
-        return output;
+        return `${summary}\n\n${resolvedPath}${path.sep}\n${structureLines.join('\n')}`;
     }
     catch (error) {
         console.error(`Error getting folder structure for ${resolvedPath}:`, error);

package/dist/src/utils/getFolderStructure.js.map

@@ -1 +1 @@
-{"version":3,"file":"getFolderStructure.js","sourceRoot":"","sources":["../../../src/utils/getFolderStructure.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"getFolderStructure.js","sourceRoot":"","sources":["../../../src/utils/getFolderStructure.ts"],"names":[],"mappings":"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"}

package/dist/src/utils/getFolderStructure.test.js

@@ -3,298 +3,280 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-/* eslint-disable @typescript-eslint/no-explicit-any */
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+import { describe, it, expect, beforeEach, afterEach } from 'vitest';
 import fsPromises from 'fs/promises';
-import * as fs from 'fs';
+import * as nodePath from 'path';
+import * as os from 'os';
 import { getFolderStructure } from './getFolderStructure.js';
-import * as gitUtils from './gitUtils.js';
 import { FileDiscoveryService } from '../services/fileDiscoveryService.js';
-vi.mock('path', async (importOriginal) => {
-    const original = (await importOriginal());
-    return {
-        ...original,
-        resolve: vi.fn((str) => str),
-        // Other path functions (basename, join, normalize, etc.) will use original implementation
-    };
-});
-vi.mock('fs/promises');
-vi.mock('fs');
-vi.mock('./gitUtils.js');
-// Import 'path' again here, it will be the mocked version
 import * as path from 'path';
-// Helper to create Dirent-like objects for mocking fs.readdir
-const createDirent = (name, type) => ({
-    name,
-    isFile: () => type === 'file',
-    isDirectory: () => type === 'dir',
-    isBlockDevice: () => false,
-    isCharacterDevice: () => false,
-    isSymbolicLink: () => false,
-    isFIFO: () => false,
-    isSocket: () => false,
-    path: '',
-    parentPath: '',
-});
 describe('getFolderStructure', () => {
-    beforeEach(() => {
-        vi.resetAllMocks();
-        // path.resolve is now a vi.fn() due to the top-level vi.mock.
-        // We ensure its implementation is set for each test (or rely on the one from vi.mock).
-        // vi.resetAllMocks() clears call history but not the implementation set by vi.fn() in vi.mock.
-        // If we needed to change it per test, we would do it here:
-        path.resolve.mockImplementation((str) => str);
-        // Re-apply/define the mock implementation for fsPromises.readdir for each test
-        fsPromises.readdir.mockImplementation(async (dirPath) => {
-            // path.normalize here will use the mocked path module.
-            // Since normalize is spread from original, it should be the real one.
-            const normalizedPath = path.normalize(dirPath.toString());
-            if (mockFsStructure[normalizedPath]) {
-                return mockFsStructure[normalizedPath];
-            }
-            throw Object.assign(new Error(`ENOENT: no such file or directory, scandir '${normalizedPath}'`), { code: 'ENOENT' });
-        });
+    let testRootDir;
+    async function createEmptyDir(...pathSegments) {
+        const fullPath = path.join(testRootDir, ...pathSegments);
+        await fsPromises.mkdir(fullPath, { recursive: true });
+    }
+    async function createTestFile(...pathSegments) {
+        const fullPath = path.join(testRootDir, ...pathSegments);
+        await fsPromises.mkdir(path.dirname(fullPath), { recursive: true });
+        await fsPromises.writeFile(fullPath, '');
+        return fullPath;
+    }
+    beforeEach(async () => {
+        testRootDir = await fsPromises.mkdtemp(path.join(os.tmpdir(), 'folder-structure-test-'));
     });
-    afterEach(() => {
-        vi.restoreAllMocks(); // Restores spies (like fsPromises.readdir) and resets vi.fn mocks (like path.resolve)
+    afterEach(async () => {
+        await fsPromises.rm(testRootDir, { recursive: true, force: true });
     });
-    const mockFsStructure = {
-        '/testroot': [
-            createDirent('file1.txt', 'file'),
-            createDirent('subfolderA', 'dir'),
-            createDirent('emptyFolder', 'dir'),
-            createDirent('.hiddenfile', 'file'),
-            createDirent('node_modules', 'dir'),
-        ],
-        '/testroot/subfolderA': [
-            createDirent('fileA1.ts', 'file'),
-            createDirent('fileA2.js', 'file'),
-            createDirent('subfolderB', 'dir'),
-        ],
-        '/testroot/subfolderA/subfolderB': [createDirent('fileB1.md', 'file')],
-        '/testroot/emptyFolder': [],
-        '/testroot/node_modules': [createDirent('somepackage', 'dir')],
-        '/testroot/manyFilesFolder': Array.from({ length: 10 }, (_, i) => createDirent(`file-${i}.txt`, 'file')),
-        '/testroot/manyFolders': Array.from({ length: 5 }, (_, i) => createDirent(`folder-${i}`, 'dir')),
-        ...Array.from({ length: 5 }, (_, i) => ({
-            [`/testroot/manyFolders/folder-${i}`]: [
-                createDirent('child.txt', 'file'),
-            ],
-        })).reduce((acc, val) => ({ ...acc, ...val }), {}),
-        '/testroot/deepFolders': [createDirent('level1', 'dir')],
-        '/testroot/deepFolders/level1': [createDirent('level2', 'dir')],
-        '/testroot/deepFolders/level1/level2': [createDirent('level3', 'dir')],
-        '/testroot/deepFolders/level1/level2/level3': [
-            createDirent('file.txt', 'file'),
-        ],
-    };
     it('should return basic folder structure', async () => {
-        const structure = await getFolderStructure('/testroot/subfolderA');
-        const expected = `
+        await createTestFile('fileA1.ts');
+        await createTestFile('fileA2.js');
+        await createTestFile('subfolderB', 'fileB1.md');
+        const structure = await getFolderStructure(testRootDir);
+        expect(structure.trim()).toBe(`
 Showing up to 200 items (files + folders).
 
-/testroot/subfolderA/
+${testRootDir}${path.sep}
 ├───fileA1.ts
 ├───fileA2.js
-└───subfolderB/
+└───subfolderB${path.sep}
     └───fileB1.md
-`.trim();
-        expect(structure.trim()).toBe(expected);
+`.trim());
     });
     it('should handle an empty folder', async () => {
-        const structure = await getFolderStructure('/testroot/emptyFolder');
-        const expected = `
+        const structure = await getFolderStructure(testRootDir);
+        expect(structure.trim()).toBe(`
 Showing up to 200 items (files + folders).
 
-/testroot/emptyFolder/
-`.trim();
-        expect(structure.trim()).toBe(expected.trim());
+${testRootDir}${path.sep}
+`
+            .trim()
+            .trim());
     });
     it('should ignore folders specified in ignoredFolders (default)', async () => {
-        const structure = await getFolderStructure('/testroot');
-        const expected = `
+        await createTestFile('.hiddenfile');
+        await createTestFile('file1.txt');
+        await createEmptyDir('emptyFolder');
+        await createTestFile('node_modules', 'somepackage', 'index.js');
+        await createTestFile('subfolderA', 'fileA1.ts');
+        await createTestFile('subfolderA', 'fileA2.js');
+        await createTestFile('subfolderA', 'subfolderB', 'fileB1.md');
+        const structure = await getFolderStructure(testRootDir);
+        expect(structure.trim()).toBe(`
 Showing up to 200 items (files + folders). Folders or files indicated with ... contain more items not shown, were ignored, or the display limit (200 items) was reached.
 
-/testroot/
+${testRootDir}${path.sep}
 ├───.hiddenfile
 ├───file1.txt
-├───emptyFolder/
-├───node_modules/...
-└───subfolderA/
+├───emptyFolder${path.sep}
+├───node_modules${path.sep}...
+└───subfolderA${path.sep}
     ├───fileA1.ts
     ├───fileA2.js
-    └───subfolderB/
+    └───subfolderB${path.sep}
         └───fileB1.md
-`.trim();
-        expect(structure.trim()).toBe(expected);
+`.trim());
     });
     it('should ignore folders specified in custom ignoredFolders', async () => {
-        const structure = await getFolderStructure('/testroot', {
+        await createTestFile('.hiddenfile');
+        await createTestFile('file1.txt');
+        await createEmptyDir('emptyFolder');
+        await createTestFile('node_modules', 'somepackage', 'index.js');
+        await createTestFile('subfolderA', 'fileA1.ts');
+        const structure = await getFolderStructure(testRootDir, {
             ignoredFolders: new Set(['subfolderA', 'node_modules']),
         });
         const expected = `
 Showing up to 200 items (files + folders). Folders or files indicated with ... contain more items not shown, were ignored, or the display limit (200 items) was reached.
 
-/testroot/
+${testRootDir}${path.sep}
 ├───.hiddenfile
 ├───file1.txt
-├───emptyFolder/
-├───node_modules/...
-└───subfolderA/...
+├───emptyFolder${path.sep}
+├───node_modules${path.sep}...
+└───subfolderA${path.sep}...
 `.trim();
         expect(structure.trim()).toBe(expected);
     });
     it('should filter files by fileIncludePattern', async () => {
-        const structure = await getFolderStructure('/testroot/subfolderA', {
+        await createTestFile('fileA1.ts');
+        await createTestFile('fileA2.js');
+        await createTestFile('subfolderB', 'fileB1.md');
+        const structure = await getFolderStructure(testRootDir, {
             fileIncludePattern: /\.ts$/,
         });
         const expected = `
 Showing up to 200 items (files + folders).
 
-/testroot/subfolderA/
+${testRootDir}${path.sep}
 ├───fileA1.ts
-└───subfolderB/
+└───subfolderB${path.sep}
 `.trim();
         expect(structure.trim()).toBe(expected);
     });
     it('should handle maxItems truncation for files within a folder', async () => {
-        const structure = await getFolderStructure('/testroot/subfolderA', {
+        await createTestFile('fileA1.ts');
+        await createTestFile('fileA2.js');
+        await createTestFile('subfolderB', 'fileB1.md');
+        const structure = await getFolderStructure(testRootDir, {
             maxItems: 3,
         });
         const expected = `
 Showing up to 3 items (files + folders).
 
-/testroot/subfolderA/
+${testRootDir}${path.sep}
 ├───fileA1.ts
 ├───fileA2.js
-└───subfolderB/
+└───subfolderB${path.sep}
 `.trim();
         expect(structure.trim()).toBe(expected);
     });
     it('should handle maxItems truncation for subfolders', async () => {
-        const structure = await getFolderStructure('/testroot/manyFolders', {
+        for (let i = 0; i < 5; i++) {
+            await createTestFile(`folder-${i}`, 'child.txt');
+        }
+        const structure = await getFolderStructure(testRootDir, {
             maxItems: 4,
         });
         const expectedRevised = `
 Showing up to 4 items (files + folders). Folders or files indicated with ... contain more items not shown, were ignored, or the display limit (4 items) was reached.
 
-/testroot/manyFolders/
-├───folder-0/
-├───folder-1/
-├───folder-2/
-├───folder-3/
+${testRootDir}${path.sep}
+├───folder-0${path.sep}
+├───folder-1${path.sep}
+├───folder-2${path.sep}
+├───folder-3${path.sep}
 └───...
 `.trim();
         expect(structure.trim()).toBe(expectedRevised);
     });
     it('should handle maxItems that only allows the root folder itself', async () => {
-        const structure = await getFolderStructure('/testroot/subfolderA', {
+        await createTestFile('fileA1.ts');
+        await createTestFile('fileA2.ts');
+        await createTestFile('subfolderB', 'fileB1.ts');
+        const structure = await getFolderStructure(testRootDir, {
             maxItems: 1,
         });
-        const expectedRevisedMax1 = `
+        const expected = `
 Showing up to 1 items (files + folders). Folders or files indicated with ... contain more items not shown, were ignored, or the display limit (1 items) was reached.
 
-/testroot/subfolderA/
+${testRootDir}${path.sep}
 ├───fileA1.ts
 ├───...
 └───...
 `.trim();
-        expect(structure.trim()).toBe(expectedRevisedMax1);
+        expect(structure.trim()).toBe(expected);
     });
     it('should handle non-existent directory', async () => {
-        // Temporarily make fsPromises.readdir throw ENOENT for this specific path
-        const originalReaddir = fsPromises.readdir;
-        fsPromises.readdir.mockImplementation(async (p) => {
-            if (p === '/nonexistent') {
-                throw Object.assign(new Error('ENOENT'), { code: 'ENOENT' });
-            }
-            return originalReaddir(p);
-        });
-        const structure = await getFolderStructure('/nonexistent');
-        expect(structure).toContain('Error: Could not read directory "/nonexistent"');
+        const nonExistentPath = path.join(testRootDir, 'non-existent');
+        const structure = await getFolderStructure(nonExistentPath);
+        expect(structure).toContain(`Error: Could not read directory "${nonExistentPath}". Check path and permissions.`);
     });
     it('should handle deep folder structure within limits', async () => {
-        const structure = await getFolderStructure('/testroot/deepFolders', {
+        await createTestFile('level1', 'level2', 'level3', 'file.txt');
+        const structure = await getFolderStructure(testRootDir, {
             maxItems: 10,
         });
         const expected = `
 Showing up to 10 items (files + folders).
 
-/testroot/deepFolders/
-└───level1/
-    └───level2/
-        └───level3/
+${testRootDir}${path.sep}
+└───level1${path.sep}
+    └───level2${path.sep}
+        └───level3${path.sep}
             └───file.txt
 `.trim();
         expect(structure.trim()).toBe(expected);
     });
     it('should truncate deep folder structure if maxItems is small', async () => {
-        const structure = await getFolderStructure('/testroot/deepFolders', {
+        await createTestFile('level1', 'level2', 'level3', 'file.txt');
+        const structure = await getFolderStructure(testRootDir, {
             maxItems: 3,
         });
         const expected = `
 Showing up to 3 items (files + folders).
 
-/testroot/deepFolders/
-└───level1/
-    └───level2/
-        └───level3/
+${testRootDir}${path.sep}
+└───level1${path.sep}
+    └───level2${path.sep}
+        └───level3${path.sep}
 `.trim();
         expect(structure.trim()).toBe(expected);
     });
-});
-describe('getFolderStructure gitignore', () => {
-    beforeEach(() => {
-        vi.resetAllMocks();
-        path.resolve.mockImplementation((str) => str);
-        fsPromises.readdir.mockImplementation(async (p) => {
-            const path = p.toString();
-            if (path === '/test/project') {
-                return [
-                    createDirent('file1.txt', 'file'),
-                    createDirent('node_modules', 'dir'),
-                    createDirent('ignored.txt', 'file'),
-                    createDirent('.gemini', 'dir'),
-                ];
-            }
-            if (path === '/test/project/node_modules') {
-                return [createDirent('some-package', 'dir')];
-            }
-            if (path === '/test/project/.gemini') {
-                return [
-                    createDirent('config.yaml', 'file'),
-                    createDirent('logs.json', 'file'),
-                ];
-            }
-            return [];
+    describe('with gitignore', () => {
+        beforeEach(async () => {
+            await fsPromises.mkdir(path.join(testRootDir, '.git'), {
+                recursive: true,
+            });
         });
-        fs.readFileSync.mockImplementation((p) => {
-            const path = p.toString();
-            if (path === '/test/project/.gitignore') {
-                return 'ignored.txt\nnode_modules/\n.gemini/\n!/.gemini/config.yaml';
-            }
-            return '';
+        it('should ignore files and folders specified in .gitignore', async () => {
+            await fsPromises.writeFile(nodePath.join(testRootDir, '.gitignore'), 'ignored.txt\nnode_modules/\n.gemini/*\n!/.gemini/config.yaml');
+            await createTestFile('file1.txt');
+            await createTestFile('node_modules', 'some-package', 'index.js');
+            await createTestFile('ignored.txt');
+            await createTestFile('.gemini', 'config.yaml');
+            await createTestFile('.gemini', 'logs.json');
+            const fileService = new FileDiscoveryService(testRootDir);
+            const structure = await getFolderStructure(testRootDir, {
+                fileService,
+            });
+            expect(structure).not.toContain('ignored.txt');
+            expect(structure).toContain(`node_modules${path.sep}...`);
+            expect(structure).not.toContain('logs.json');
+            expect(structure).toContain('config.yaml');
+            expect(structure).toContain('file1.txt');
         });
-        vi.mocked(gitUtils.isGitRepository).mockReturnValue(true);
-    });
-    it('should ignore files and folders specified in .gitignore', async () => {
-        const fileService = new FileDiscoveryService('/test/project');
-        const structure = await getFolderStructure('/test/project', {
-            fileService,
+        it('should not ignore files if respectGitIgnore is false', async () => {
+            await fsPromises.writeFile(nodePath.join(testRootDir, '.gitignore'), 'ignored.txt');
+            await createTestFile('file1.txt');
+            await createTestFile('ignored.txt');
+            const fileService = new FileDiscoveryService(testRootDir);
+            const structure = await getFolderStructure(testRootDir, {
+                fileService,
+                fileFilteringOptions: {
+                    respectGeminiIgnore: false,
+                    respectGitIgnore: false,
+                },
+            });
+            expect(structure).toContain('ignored.txt');
+            expect(structure).toContain('file1.txt');
         });
-        expect(structure).not.toContain('ignored.txt');
-        expect(structure).toContain('node_modules/...');
-        expect(structure).not.toContain('logs.json');
     });
-    it('should not ignore files if respectGitIgnore is false', async () => {
-        const fileService = new FileDiscoveryService('/test/project');
-        const structure = await getFolderStructure('/test/project', {
-            fileService,
-            respectGitIgnore: false,
+    describe('with geminiignore', () => {
+        it('should ignore geminiignore files by default', async () => {
+            await fsPromises.writeFile(nodePath.join(testRootDir, '.geminiignore'), 'ignored.txt\nnode_modules/\n.gemini/\n!/.gemini/config.yaml');
+            await createTestFile('file1.txt');
+            await createTestFile('node_modules', 'some-package', 'index.js');
+            await createTestFile('ignored.txt');
+            await createTestFile('.gemini', 'config.yaml');
+            await createTestFile('.gemini', 'logs.json');
+            const fileService = new FileDiscoveryService(testRootDir);
+            const structure = await getFolderStructure(testRootDir, {
+                fileService,
+            });
+            expect(structure).not.toContain('ignored.txt');
+            expect(structure).toContain(`node_modules${path.sep}...`);
+            expect(structure).not.toContain('logs.json');
+        });
+        it('should not ignore files if respectGeminiIgnore is false', async () => {
+            await fsPromises.writeFile(nodePath.join(testRootDir, '.geminiignore'), 'ignored.txt\nnode_modules/\n.gemini/\n!/.gemini/config.yaml');
+            await createTestFile('file1.txt');
+            await createTestFile('node_modules', 'some-package', 'index.js');
+            await createTestFile('ignored.txt');
+            await createTestFile('.gemini', 'config.yaml');
+            await createTestFile('.gemini', 'logs.json');
+            const fileService = new FileDiscoveryService(testRootDir);
+            const structure = await getFolderStructure(testRootDir, {
+                fileService,
+                fileFilteringOptions: {
+                    respectGeminiIgnore: false,
+                    respectGitIgnore: true, // Explicitly disable gemini ignore only
+                },
+            });
+            expect(structure).toContain('ignored.txt');
+            // node_modules is still ignored by default
+            expect(structure).toContain(`node_modules${path.sep}...`);
         });
-        expect(structure).toContain('ignored.txt');
-        // node_modules is still ignored by default
-        expect(structure).toContain('node_modules/...');
     });
 });
 //# sourceMappingURL=getFolderStructure.test.js.map