@office-ai/aioncli-core 0.26.0 → 0.30.1

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

@@ -7,10 +7,18 @@ import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
 import * as fsPromises from 'node:fs/promises';
 import * as os from 'node:os';
 import * as path from 'node:path';
-import { loadServerHierarchicalMemory, loadGlobalMemory, loadEnvironmentMemory, loadJitSubdirectoryMemory, refreshServerHierarchicalMemory, } from './memoryDiscovery.js';
+import { loadServerHierarchicalMemory, getGlobalMemoryPaths, getExtensionMemoryPaths, getEnvironmentMemoryPaths, loadJitSubdirectoryMemory, refreshServerHierarchicalMemory, } from './memoryDiscovery.js';
 import { setGeminiMdFilename, DEFAULT_CONTEXT_FILENAME, } from '../tools/memoryTool.js';
+import { flattenMemory } from '../config/memory.js';
 import { FileDiscoveryService } from '../services/fileDiscoveryService.js';
-import { GEMINI_DIR } from './paths.js';
+import { GEMINI_DIR, normalizePath } from './paths.js';
+function flattenResult(result) {
+    return {
+        ...result,
+        memoryContent: flattenMemory(result.memoryContent),
+        filePaths: result.filePaths.map((p) => normalizePath(p)),
+    };
+}
 import { Config } from '../config/config.js';
 import { Storage } from '../config/storage.js';
 import { SimpleExtensionLoader } from './extensionLoader.js';
@@ -23,6 +31,18 @@ vi.mock('os', async (importOriginal) => {
         homedir: vi.fn(),
     };
 });
+vi.mock('../utils/paths.js', async (importOriginal) => {
+    const actual = await importOriginal();
+    return {
+        ...actual,
+        normalizePath: (p) => {
+            const resolved = path.resolve(p);
+            return process.platform === 'win32' ? resolved.toLowerCase() : resolved;
+        },
+        homedir: vi.fn(),
+    };
+});
+import { homedir as pathsHomedir } from './paths.js';
 describe('memoryDiscovery', () => {
     const DEFAULT_FOLDER_TRUST = true;
     let testRootDir;
@@ -31,15 +51,15 @@ describe('memoryDiscovery', () => {
     let homedir;
     async function createEmptyDir(fullPath) {
         await fsPromises.mkdir(fullPath, { recursive: true });
-        return fullPath;
+        return normalizePath(fullPath);
     }
     async function createTestFile(fullPath, fileContents) {
         await fsPromises.mkdir(path.dirname(fullPath), { recursive: true });
         await fsPromises.writeFile(fullPath, fileContents);
-        return path.resolve(testRootDir, fullPath);
+        return normalizePath(path.resolve(testRootDir, fullPath));
     }
     beforeEach(async () => {
-        testRootDir = await fsPromises.mkdtemp(path.join(os.tmpdir(), 'folder-structure-test-'));
+        testRootDir = normalizePath(await fsPromises.mkdtemp(path.join(os.tmpdir(), 'folder-structure-test-')));
         vi.resetAllMocks();
         // Set environment variables to indicate test environment
         vi.stubEnv('NODE_ENV', 'test');
@@ -48,7 +68,9 @@ describe('memoryDiscovery', () => {
         cwd = await createEmptyDir(path.join(projectRoot, 'src'));
         homedir = await createEmptyDir(path.join(testRootDir, 'userhome'));
         vi.mocked(os.homedir).mockReturnValue(homedir);
+        vi.mocked(pathsHomedir).mockReturnValue(homedir);
     });
+    const normMarker = (p) => process.platform === 'win32' ? p.toLowerCase() : p;
     afterEach(async () => {
         vi.unstubAllEnvs();
         // Some tests set this to a different value.
@@ -66,7 +88,7 @@ describe('memoryDiscovery', () => {
         it('does not load context files from untrusted workspaces', async () => {
             await createTestFile(path.join(projectRoot, DEFAULT_CONTEXT_FILENAME), 'Project root memory');
             await createTestFile(path.join(cwd, DEFAULT_CONTEXT_FILENAME), 'Src directory memory');
-            const result = await loadServerHierarchicalMemory(cwd, [], false, new FileDiscoveryService(projectRoot), new SimpleExtensionLoader([]), false);
+            const result = flattenResult(await loadServerHierarchicalMemory(cwd, [], false, new FileDiscoveryService(projectRoot), new SimpleExtensionLoader([]), false));
             expect(result).toEqual({
                 memoryContent: '',
                 fileCount: 0,
@@ -76,16 +98,16 @@ describe('memoryDiscovery', () => {
         it('loads context from outside the untrusted workspace', async () => {
             await createTestFile(path.join(projectRoot, DEFAULT_CONTEXT_FILENAME), 'Project root memory');
             await createTestFile(path.join(cwd, DEFAULT_CONTEXT_FILENAME), 'Src directory memory');
-            const filepath = path.join(homedir, GEMINI_DIR, DEFAULT_CONTEXT_FILENAME);
-            await createTestFile(filepath, 'default context content'); // In user home dir (outside untrusted space).
-            const { fileCount, memoryContent, filePaths } = await loadServerHierarchicalMemory(cwd, [], false, new FileDiscoveryService(projectRoot), new SimpleExtensionLoader([]), false);
+            const filepathInput = path.join(homedir, GEMINI_DIR, DEFAULT_CONTEXT_FILENAME);
+            const filepath = await createTestFile(filepathInput, 'default context content'); // In user home dir (outside untrusted space).
+            const { fileCount, memoryContent, filePaths } = flattenResult(await loadServerHierarchicalMemory(cwd, [], false, new FileDiscoveryService(projectRoot), new SimpleExtensionLoader([]), false));
             expect(fileCount).toEqual(1);
             expect(memoryContent).toContain(path.relative(cwd, filepath).toString());
             expect(filePaths).toEqual([filepath]);
         });
     });
     it('should return empty memory and count if no context files are found', async () => {
-        const result = await loadServerHierarchicalMemory(cwd, [], false, new FileDiscoveryService(projectRoot), new SimpleExtensionLoader([]), DEFAULT_FOLDER_TRUST);
+        const result = flattenResult(await loadServerHierarchicalMemory(cwd, [], false, new FileDiscoveryService(projectRoot), new SimpleExtensionLoader([]), DEFAULT_FOLDER_TRUST));
         expect(result).toEqual({
             memoryContent: '',
             fileCount: 0,
@@ -94,9 +116,13 @@ describe('memoryDiscovery', () => {
     });
     it('should load only the global context file if present and others are not (default filename)', async () => {
         const defaultContextFile = await createTestFile(path.join(homedir, GEMINI_DIR, DEFAULT_CONTEXT_FILENAME), 'default context content');
-        const result = await loadServerHierarchicalMemory(cwd, [], false, new FileDiscoveryService(projectRoot), new SimpleExtensionLoader([]), DEFAULT_FOLDER_TRUST);
-        expect(result).toEqual({
-            memoryContent: `--- Context from: ${path.relative(cwd, defaultContextFile)} ---
+        const result = flattenResult(await loadServerHierarchicalMemory(cwd, [], false, new FileDiscoveryService(projectRoot), new SimpleExtensionLoader([]), DEFAULT_FOLDER_TRUST));
+        expect({
+            ...result,
+            memoryContent: flattenMemory(result.memoryContent),
+        }).toEqual({
+            memoryContent: `--- Global ---
+--- Context from: ${path.relative(cwd, defaultContextFile)} ---
 default context content
 --- End of Context from: ${path.relative(cwd, defaultContextFile)} ---`,
             fileCount: 1,
@@ -107,11 +133,12 @@ default context content
         const customFilename = 'CUSTOM_AGENTS.md';
         setGeminiMdFilename(customFilename);
         const customContextFile = await createTestFile(path.join(homedir, GEMINI_DIR, customFilename), 'custom context content');
-        const result = await loadServerHierarchicalMemory(cwd, [], false, new FileDiscoveryService(projectRoot), new SimpleExtensionLoader([]), DEFAULT_FOLDER_TRUST);
+        const result = flattenResult(await loadServerHierarchicalMemory(cwd, [], false, new FileDiscoveryService(projectRoot), new SimpleExtensionLoader([]), DEFAULT_FOLDER_TRUST));
         expect(result).toEqual({
-            memoryContent: `--- Context from: ${path.relative(cwd, customContextFile)} ---
+            memoryContent: `--- Global ---
+--- Context from: ${normMarker(path.relative(cwd, customContextFile))} ---
 custom context content
---- End of Context from: ${path.relative(cwd, customContextFile)} ---`,
+--- End of Context from: ${normMarker(path.relative(cwd, customContextFile))} ---`,
             fileCount: 1,
             filePaths: [customContextFile],
         });
@@ -121,15 +148,16 @@ custom context content
         setGeminiMdFilename(customFilename);
         const projectContextFile = await createTestFile(path.join(projectRoot, customFilename), 'project context content');
         const cwdContextFile = await createTestFile(path.join(cwd, customFilename), 'cwd context content');
-        const result = await loadServerHierarchicalMemory(cwd, [], false, new FileDiscoveryService(projectRoot), new SimpleExtensionLoader([]), DEFAULT_FOLDER_TRUST);
+        const result = flattenResult(await loadServerHierarchicalMemory(cwd, [], false, new FileDiscoveryService(projectRoot), new SimpleExtensionLoader([]), DEFAULT_FOLDER_TRUST));
         expect(result).toEqual({
-            memoryContent: `--- Context from: ${path.relative(cwd, projectContextFile)} ---
+            memoryContent: `--- Project ---
+--- Context from: ${normMarker(path.relative(cwd, projectContextFile))} ---
 project context content
---- End of Context from: ${path.relative(cwd, projectContextFile)} ---
+--- End of Context from: ${normMarker(path.relative(cwd, projectContextFile))} ---
 
---- Context from: ${path.relative(cwd, cwdContextFile)} ---
+--- Context from: ${normMarker(path.relative(cwd, cwdContextFile))} ---
 cwd context content
---- End of Context from: ${path.relative(cwd, cwdContextFile)} ---`,
+--- End of Context from: ${normMarker(path.relative(cwd, cwdContextFile))} ---`,
             fileCount: 2,
             filePaths: [projectContextFile, cwdContextFile],
         });
@@ -139,15 +167,16 @@ cwd context content
         setGeminiMdFilename(customFilename);
         const subdirCustomFile = await createTestFile(path.join(cwd, 'subdir', customFilename), 'Subdir custom memory');
         const cwdCustomFile = await createTestFile(path.join(cwd, customFilename), 'CWD custom memory');
-        const result = await loadServerHierarchicalMemory(cwd, [], false, new FileDiscoveryService(projectRoot), new SimpleExtensionLoader([]), DEFAULT_FOLDER_TRUST);
+        const result = flattenResult(await loadServerHierarchicalMemory(cwd, [], false, new FileDiscoveryService(projectRoot), new SimpleExtensionLoader([]), DEFAULT_FOLDER_TRUST));
         expect(result).toEqual({
-            memoryContent: `--- Context from: ${customFilename} ---
+            memoryContent: `--- Project ---
+--- Context from: ${normMarker(customFilename)} ---
 CWD custom memory
---- End of Context from: ${customFilename} ---
+--- End of Context from: ${normMarker(customFilename)} ---
 
---- Context from: ${path.join('subdir', customFilename)} ---
+--- Context from: ${normMarker(path.join('subdir', customFilename))} ---
 Subdir custom memory
---- End of Context from: ${path.join('subdir', customFilename)} ---`,
+--- End of Context from: ${normMarker(path.join('subdir', customFilename))} ---`,
             fileCount: 2,
             filePaths: [cwdCustomFile, subdirCustomFile],
         });
@@ -155,15 +184,16 @@ Subdir custom memory
     it('should load ORIGINAL_GEMINI_MD_FILENAME files by upward traversal from CWD to project root', async () => {
         const projectRootGeminiFile = await createTestFile(path.join(projectRoot, DEFAULT_CONTEXT_FILENAME), 'Project root memory');
         const srcGeminiFile = await createTestFile(path.join(cwd, DEFAULT_CONTEXT_FILENAME), 'Src directory memory');
-        const result = await loadServerHierarchicalMemory(cwd, [], false, new FileDiscoveryService(projectRoot), new SimpleExtensionLoader([]), DEFAULT_FOLDER_TRUST);
+        const result = flattenResult(await loadServerHierarchicalMemory(cwd, [], false, new FileDiscoveryService(projectRoot), new SimpleExtensionLoader([]), DEFAULT_FOLDER_TRUST));
         expect(result).toEqual({
-            memoryContent: `--- Context from: ${path.relative(cwd, projectRootGeminiFile)} ---
+            memoryContent: `--- Project ---
+--- Context from: ${normMarker(path.relative(cwd, projectRootGeminiFile))} ---
 Project root memory
---- End of Context from: ${path.relative(cwd, projectRootGeminiFile)} ---
+--- End of Context from: ${normMarker(path.relative(cwd, projectRootGeminiFile))} ---
 
---- Context from: ${path.relative(cwd, srcGeminiFile)} ---
+--- Context from: ${normMarker(path.relative(cwd, srcGeminiFile))} ---
 Src directory memory
---- End of Context from: ${path.relative(cwd, srcGeminiFile)} ---`,
+--- End of Context from: ${normMarker(path.relative(cwd, srcGeminiFile))} ---`,
             fileCount: 2,
             filePaths: [projectRootGeminiFile, srcGeminiFile],
         });
@@ -171,15 +201,16 @@ Src directory memory
     it('should load ORIGINAL_GEMINI_MD_FILENAME files by downward traversal from CWD', async () => {
         const subDirGeminiFile = await createTestFile(path.join(cwd, 'subdir', DEFAULT_CONTEXT_FILENAME), 'Subdir memory');
         const cwdGeminiFile = await createTestFile(path.join(cwd, DEFAULT_CONTEXT_FILENAME), 'CWD memory');
-        const result = await loadServerHierarchicalMemory(cwd, [], false, new FileDiscoveryService(projectRoot), new SimpleExtensionLoader([]), DEFAULT_FOLDER_TRUST);
+        const result = flattenResult(await loadServerHierarchicalMemory(cwd, [], false, new FileDiscoveryService(projectRoot), new SimpleExtensionLoader([]), DEFAULT_FOLDER_TRUST));
         expect(result).toEqual({
-            memoryContent: `--- Context from: ${DEFAULT_CONTEXT_FILENAME} ---
+            memoryContent: `--- Project ---
+--- Context from: ${normMarker(DEFAULT_CONTEXT_FILENAME)} ---
 CWD memory
---- End of Context from: ${DEFAULT_CONTEXT_FILENAME} ---
+--- End of Context from: ${normMarker(DEFAULT_CONTEXT_FILENAME)} ---
 
---- Context from: ${path.join('subdir', DEFAULT_CONTEXT_FILENAME)} ---
+--- Context from: ${normMarker(path.join('subdir', DEFAULT_CONTEXT_FILENAME))} ---
 Subdir memory
---- End of Context from: ${path.join('subdir', DEFAULT_CONTEXT_FILENAME)} ---`,
+--- End of Context from: ${normMarker(path.join('subdir', DEFAULT_CONTEXT_FILENAME))} ---`,
             fileCount: 2,
             filePaths: [cwdGeminiFile, subDirGeminiFile],
         });
@@ -190,27 +221,29 @@ Subdir memory
         const projectRootGeminiFile = await createTestFile(path.join(projectRoot, DEFAULT_CONTEXT_FILENAME), 'Project root memory');
         const cwdGeminiFile = await createTestFile(path.join(cwd, DEFAULT_CONTEXT_FILENAME), 'CWD memory');
         const subDirGeminiFile = await createTestFile(path.join(cwd, 'sub', DEFAULT_CONTEXT_FILENAME), 'Subdir memory');
-        const result = await loadServerHierarchicalMemory(cwd, [], false, new FileDiscoveryService(projectRoot), new SimpleExtensionLoader([]), DEFAULT_FOLDER_TRUST);
+        const result = flattenResult(await loadServerHierarchicalMemory(cwd, [], false, new FileDiscoveryService(projectRoot), new SimpleExtensionLoader([]), DEFAULT_FOLDER_TRUST));
         expect(result).toEqual({
-            memoryContent: `--- Context from: ${path.relative(cwd, defaultContextFile)} ---
+            memoryContent: `--- Global ---
+--- Context from: ${normMarker(path.relative(cwd, defaultContextFile))} ---
 default context content
---- End of Context from: ${path.relative(cwd, defaultContextFile)} ---
+--- End of Context from: ${normMarker(path.relative(cwd, defaultContextFile))} ---
 
---- Context from: ${path.relative(cwd, rootGeminiFile)} ---
+--- Project ---
+--- Context from: ${normMarker(path.relative(cwd, rootGeminiFile))} ---
 Project parent memory
---- End of Context from: ${path.relative(cwd, rootGeminiFile)} ---
+--- End of Context from: ${normMarker(path.relative(cwd, rootGeminiFile))} ---
 
---- Context from: ${path.relative(cwd, projectRootGeminiFile)} ---
+--- Context from: ${normMarker(path.relative(cwd, projectRootGeminiFile))} ---
 Project root memory
---- End of Context from: ${path.relative(cwd, projectRootGeminiFile)} ---
+--- End of Context from: ${normMarker(path.relative(cwd, projectRootGeminiFile))} ---
 
---- Context from: ${path.relative(cwd, cwdGeminiFile)} ---
+--- Context from: ${normMarker(path.relative(cwd, cwdGeminiFile))} ---
 CWD memory
---- End of Context from: ${path.relative(cwd, cwdGeminiFile)} ---
+--- End of Context from: ${normMarker(path.relative(cwd, cwdGeminiFile))} ---
 
---- Context from: ${path.relative(cwd, subDirGeminiFile)} ---
+--- Context from: ${normMarker(path.relative(cwd, subDirGeminiFile))} ---
 Subdir memory
---- End of Context from: ${path.relative(cwd, subDirGeminiFile)} ---`,
+--- End of Context from: ${normMarker(path.relative(cwd, subDirGeminiFile))} ---`,
             fileCount: 5,
             filePaths: [
                 defaultContextFile,
@@ -226,14 +259,16 @@ Subdir memory
         await createTestFile(path.join(projectRoot, '.gitignore'), 'node_modules');
         await createTestFile(path.join(cwd, 'node_modules', DEFAULT_CONTEXT_FILENAME), 'Ignored memory');
         const regularSubDirGeminiFile = await createTestFile(path.join(cwd, 'my_code', DEFAULT_CONTEXT_FILENAME), 'My code memory');
-        const result = await loadServerHierarchicalMemory(cwd, [], false, new FileDiscoveryService(projectRoot), new SimpleExtensionLoader([]), DEFAULT_FOLDER_TRUST, 'tree', {
+        const result = flattenResult(await loadServerHierarchicalMemory(cwd, [], false, new FileDiscoveryService(projectRoot), new SimpleExtensionLoader([]), DEFAULT_FOLDER_TRUST, 'tree', {
             respectGitIgnore: true,
             respectGeminiIgnore: true,
-        }, 200);
+            customIgnoreFilePaths: [],
+        }, 200));
         expect(result).toEqual({
-            memoryContent: `--- Context from: ${path.relative(cwd, regularSubDirGeminiFile)} ---
+            memoryContent: `--- Project ---
+--- Context from: ${normMarker(path.relative(cwd, regularSubDirGeminiFile))} ---
 My code memory
---- End of Context from: ${path.relative(cwd, regularSubDirGeminiFile)} ---`,
+--- End of Context from: ${normMarker(path.relative(cwd, regularSubDirGeminiFile))} ---`,
             fileCount: 1,
             filePaths: [regularSubDirGeminiFile],
         });
@@ -250,10 +285,11 @@ My code memory
         {
             respectGitIgnore: true,
             respectGeminiIgnore: true,
+            customIgnoreFilePaths: [],
         }, 1);
         expect(consoleDebugSpy).toHaveBeenCalledWith(expect.stringContaining('[DEBUG] [BfsFileSearch]'), expect.stringContaining('Scanning [1/1]:'));
         consoleDebugSpy.mockRestore();
-        const result = await loadServerHierarchicalMemory(cwd, [], false, new FileDiscoveryService(projectRoot), new SimpleExtensionLoader([]), DEFAULT_FOLDER_TRUST);
+        const result = flattenResult(await loadServerHierarchicalMemory(cwd, [], false, new FileDiscoveryService(projectRoot), new SimpleExtensionLoader([]), DEFAULT_FOLDER_TRUST));
         expect(result).toEqual({
             memoryContent: '',
             fileCount: 0,
@@ -262,16 +298,17 @@ My code memory
     });
     it('should load extension context file paths', async () => {
         const extensionFilePath = await createTestFile(path.join(testRootDir, 'extensions/ext1/GEMINI.md'), 'Extension memory content');
-        const result = await loadServerHierarchicalMemory(cwd, [], false, new FileDiscoveryService(projectRoot), new SimpleExtensionLoader([
+        const result = flattenResult(await loadServerHierarchicalMemory(cwd, [], false, new FileDiscoveryService(projectRoot), new SimpleExtensionLoader([
             {
                 contextFiles: [extensionFilePath],
                 isActive: true,
             },
-        ]), DEFAULT_FOLDER_TRUST);
+        ]), DEFAULT_FOLDER_TRUST));
         expect(result).toEqual({
-            memoryContent: `--- Context from: ${path.relative(cwd, extensionFilePath)} ---
+            memoryContent: `--- Extension ---
+--- Context from: ${normMarker(path.relative(cwd, extensionFilePath))} ---
 Extension memory content
---- End of Context from: ${path.relative(cwd, extensionFilePath)} ---`,
+--- End of Context from: ${normMarker(path.relative(cwd, extensionFilePath))} ---`,
             fileCount: 1,
             filePaths: [extensionFilePath],
         });
@@ -279,11 +316,12 @@ Extension memory content
     it('should load memory from included directories', async () => {
         const includedDir = await createEmptyDir(path.join(testRootDir, 'included'));
         const includedFile = await createTestFile(path.join(includedDir, DEFAULT_CONTEXT_FILENAME), 'included directory memory');
-        const result = await loadServerHierarchicalMemory(cwd, [includedDir], false, new FileDiscoveryService(projectRoot), new SimpleExtensionLoader([]), DEFAULT_FOLDER_TRUST);
+        const result = flattenResult(await loadServerHierarchicalMemory(cwd, [includedDir], false, new FileDiscoveryService(projectRoot), new SimpleExtensionLoader([]), DEFAULT_FOLDER_TRUST));
         expect(result).toEqual({
-            memoryContent: `--- Context from: ${path.relative(cwd, includedFile)} ---
+            memoryContent: `--- Project ---
+--- Context from: ${normMarker(path.relative(cwd, includedFile))} ---
 included directory memory
---- End of Context from: ${path.relative(cwd, includedFile)} ---`,
+--- End of Context from: ${normMarker(path.relative(cwd, includedFile))} ---`,
             fileCount: 1,
             filePaths: [includedFile],
         });
@@ -298,14 +336,15 @@ included directory memory
             createdFiles.push(filePath);
         }
         // Load memory from all directories
-        const result = await loadServerHierarchicalMemory(cwd, createdFiles.map((f) => path.dirname(f)), false, new FileDiscoveryService(projectRoot), new SimpleExtensionLoader([]), DEFAULT_FOLDER_TRUST);
+        const result = flattenResult(await loadServerHierarchicalMemory(cwd, createdFiles.map((f) => path.dirname(f)), false, new FileDiscoveryService(projectRoot), new SimpleExtensionLoader([]), DEFAULT_FOLDER_TRUST));
         // Should have loaded all files
         expect(result.fileCount).toBe(numDirs);
         expect(result.filePaths.length).toBe(numDirs);
         expect(result.filePaths.sort()).toEqual(createdFiles.sort());
         // Content should include all project contents
+        const flattenedMemory = flattenMemory(result.memoryContent);
         for (let i = 0; i < numDirs; i++) {
-            expect(result.memoryContent).toContain(`Content from project ${i}`);
+            expect(flattenedMemory).toContain(`Content from project ${i}`);
         }
     });
     it('should preserve order and prevent duplicates when processing multiple directories', async () => {
@@ -315,46 +354,60 @@ included directory memory
         const parentFile = await createTestFile(path.join(parentDir, DEFAULT_CONTEXT_FILENAME), 'Parent content');
         const childFile = await createTestFile(path.join(childDir, DEFAULT_CONTEXT_FILENAME), 'Child content');
         // Include both parent and child directories
-        const result = await loadServerHierarchicalMemory(parentDir, [childDir, parentDir], // Deliberately include duplicates
-        false, new FileDiscoveryService(projectRoot), new SimpleExtensionLoader([]), DEFAULT_FOLDER_TRUST);
+        const result = flattenResult(await loadServerHierarchicalMemory(parentDir, [childDir, parentDir], // Deliberately include duplicates
+        false, new FileDiscoveryService(projectRoot), new SimpleExtensionLoader([]), DEFAULT_FOLDER_TRUST));
         // Should have both files without duplicates
+        const flattenedMemory = flattenMemory(result.memoryContent);
         expect(result.fileCount).toBe(2);
-        expect(result.memoryContent).toContain('Parent content');
-        expect(result.memoryContent).toContain('Child content');
+        expect(flattenedMemory).toContain('Parent content');
+        expect(flattenedMemory).toContain('Child content');
         expect(result.filePaths.sort()).toEqual([parentFile, childFile].sort());
         // Check that files are not duplicated
-        const parentOccurrences = (result.memoryContent.match(/Parent content/g) || []).length;
-        const childOccurrences = (result.memoryContent.match(/Child content/g) || []).length;
+        const parentOccurrences = (flattenedMemory.match(/Parent content/g) || [])
+            .length;
+        const childOccurrences = (flattenedMemory.match(/Child content/g) || [])
+            .length;
         expect(parentOccurrences).toBe(1);
         expect(childOccurrences).toBe(1);
     });
-    describe('loadGlobalMemory', () => {
-        it('should load global memory file if it exists', async () => {
+    describe('getGlobalMemoryPaths', () => {
+        it('should find global memory file if it exists', async () => {
             const globalMemoryFile = await createTestFile(path.join(homedir, GEMINI_DIR, DEFAULT_CONTEXT_FILENAME), 'Global memory content');
-            const result = await loadGlobalMemory();
-            expect(result.files).toHaveLength(1);
-            expect(result.files[0].path).toBe(globalMemoryFile);
-            expect(result.files[0].content).toBe('Global memory content');
+            const result = await getGlobalMemoryPaths();
+            expect(result).toHaveLength(1);
+            expect(result[0]).toBe(globalMemoryFile);
         });
-        it('should return empty content if global memory file does not exist', async () => {
-            const result = await loadGlobalMemory();
-            expect(result.files).toHaveLength(0);
+        it('should return empty array if global memory file does not exist', async () => {
+            const result = await getGlobalMemoryPaths();
+            expect(result).toHaveLength(0);
         });
     });
-    describe('loadEnvironmentMemory', () => {
-        it('should load extension memory', async () => {
+    describe('getExtensionMemoryPaths', () => {
+        it('should return active extension context files', async () => {
             const extFile = await createTestFile(path.join(testRootDir, 'ext', 'GEMINI.md'), 'Extension content');
-            const mockExtensionLoader = new SimpleExtensionLoader([
+            const loader = new SimpleExtensionLoader([
                 {
                     isActive: true,
                     contextFiles: [extFile],
                 },
             ]);
-            const result = await loadEnvironmentMemory([], mockExtensionLoader);
-            expect(result.files).toHaveLength(1);
-            expect(result.files[0].path).toBe(extFile);
-            expect(result.files[0].content).toBe('Extension content');
+            const result = getExtensionMemoryPaths(loader);
+            expect(result).toHaveLength(1);
+            expect(result[0]).toBe(extFile);
         });
+        it('should ignore inactive extensions', async () => {
+            const extFile = await createTestFile(path.join(testRootDir, 'ext', 'GEMINI.md'), 'Extension content');
+            const loader = new SimpleExtensionLoader([
+                {
+                    isActive: false,
+                    contextFiles: [extFile],
+                },
+            ]);
+            const result = getExtensionMemoryPaths(loader);
+            expect(result).toHaveLength(0);
+        });
+    });
+    describe('getEnvironmentMemoryPaths', () => {
         it('should NOT traverse upward beyond trusted root (even with .git)', async () => {
             // Setup: /temp/parent/repo/.git
             const parentDir = await createEmptyDir(path.join(testRootDir, 'parent'));
@@ -366,10 +419,9 @@ included directory memory
             const srcFile = await createTestFile(path.join(srcDir, DEFAULT_CONTEXT_FILENAME), 'Src content');
             // Trust srcDir. Should ONLY load srcFile.
             // Repo and Parent are NOT trusted.
-            const result = await loadEnvironmentMemory([srcDir], new SimpleExtensionLoader([]));
-            expect(result.files).toHaveLength(1);
-            expect(result.files[0].path).toBe(srcFile);
-            expect(result.files[0].content).toBe('Src content');
+            const result = await getEnvironmentMemoryPaths([srcDir]);
+            expect(result).toHaveLength(1);
+            expect(result[0]).toBe(srcFile);
         });
         it('should NOT traverse upward beyond trusted root (no .git)', async () => {
             // Setup: /homedir/docs/notes (no .git anywhere)
@@ -379,22 +431,21 @@ included directory memory
             const docsFile = await createTestFile(path.join(docsDir, DEFAULT_CONTEXT_FILENAME), 'Docs content');
             // Trust notesDir. Should load NOTHING because notesDir has no file,
             // and we do not traverse up to docsDir.
-            const resultNotes = await loadEnvironmentMemory([notesDir], new SimpleExtensionLoader([]));
-            expect(resultNotes.files).toHaveLength(0);
+            const resultNotes = await getEnvironmentMemoryPaths([notesDir]);
+            expect(resultNotes).toHaveLength(0);
             // Trust docsDir. Should load docsFile, but NOT homeFile.
-            const resultDocs = await loadEnvironmentMemory([docsDir], new SimpleExtensionLoader([]));
-            expect(resultDocs.files).toHaveLength(1);
-            expect(resultDocs.files[0].path).toBe(docsFile);
-            expect(resultDocs.files[0].content).toBe('Docs content');
+            const resultDocs = await getEnvironmentMemoryPaths([docsDir]);
+            expect(resultDocs).toHaveLength(1);
+            expect(resultDocs[0]).toBe(docsFile);
         });
         it('should deduplicate paths when same root is trusted multiple times', async () => {
             const repoDir = await createEmptyDir(path.join(testRootDir, 'repo'));
             await createEmptyDir(path.join(repoDir, '.git'));
             const repoFile = await createTestFile(path.join(repoDir, DEFAULT_CONTEXT_FILENAME), 'Repo content');
             // Trust repoDir twice.
-            const result = await loadEnvironmentMemory([repoDir, repoDir], new SimpleExtensionLoader([]));
-            expect(result.files).toHaveLength(1);
-            expect(result.files[0].path).toBe(repoFile);
+            const result = await getEnvironmentMemoryPaths([repoDir, repoDir]);
+            expect(result).toHaveLength(1);
+            expect(result[0]).toBe(repoFile);
         });
         it('should keep multiple memory files from the same directory adjacent and in order', async () => {
             // Configure multiple memory filenames
@@ -403,15 +454,13 @@ included directory memory
             await createEmptyDir(path.join(dir, '.git'));
             const primaryFile = await createTestFile(path.join(dir, 'PRIMARY.md'), 'Primary content');
             const secondaryFile = await createTestFile(path.join(dir, 'SECONDARY.md'), 'Secondary content');
-            const result = await loadEnvironmentMemory([dir], new SimpleExtensionLoader([]));
-            expect(result.files).toHaveLength(2);
+            const result = await getEnvironmentMemoryPaths([dir]);
+            expect(result).toHaveLength(2);
             // Verify order: PRIMARY should come before SECONDARY because they are
             // sorted by path and PRIMARY.md comes before SECONDARY.md alphabetically
             // if in same dir.
-            expect(result.files[0].path).toBe(primaryFile);
-            expect(result.files[1].path).toBe(secondaryFile);
-            expect(result.files[0].content).toBe('Primary content');
-            expect(result.files[1].content).toBe('Secondary content');
+            expect(result[0]).toBe(primaryFile);
+            expect(result[1]).toBe(secondaryFile);
         });
     });
     describe('loadJitSubdirectoryMemory', () => {
@@ -470,9 +519,9 @@ included directory memory
             model: 'fake-model',
             extensionLoader,
         });
-        const result = await loadServerHierarchicalMemory(config.getWorkingDir(), config.shouldLoadMemoryFromIncludeDirectories()
+        const result = flattenResult(await loadServerHierarchicalMemory(config.getWorkingDir(), config.shouldLoadMemoryFromIncludeDirectories()
             ? config.getWorkspaceContext().getDirectories()
-            : [], config.getDebugMode(), config.getFileService(), config.getExtensionLoader(), config.isTrustedFolder(), config.getImportFormat());
+            : [], config.getDebugMode(), config.getFileService(), config.getExtensionLoader(), config.isTrustedFolder(), config.getImportFormat()));
         expect(result.fileCount).equals(0);
         // Now add an extension with a memory file
         const extensionsDir = new Storage(homedir).getExtensionsDir();
@@ -493,9 +542,10 @@ included directory memory
         const refreshResult = await refreshServerHierarchicalMemory(config);
         expect(refreshResult.fileCount).equals(1);
         expect(config.getGeminiMdFileCount()).equals(refreshResult.fileCount);
-        expect(refreshResult.memoryContent).toContain('Really cool custom context!');
-        expect(config.getUserMemory()).equals(refreshResult.memoryContent);
-        expect(refreshResult.filePaths[0]).toContain(path.join(extensionPath, 'CustomContext.md'));
+        const flattenedMemory = flattenMemory(refreshResult.memoryContent);
+        expect(flattenedMemory).toContain('Really cool custom context!');
+        expect(config.getUserMemory()).toStrictEqual(refreshResult.memoryContent);
+        expect(refreshResult.filePaths[0]).toContain(normMarker(path.join(extensionPath, 'CustomContext.md')));
         expect(config.getGeminiMdFilePaths()).equals(refreshResult.filePaths);
         expect(mockEventListener).toHaveBeenCalledExactlyOnceWith({
             fileCount: refreshResult.fileCount,
@@ -526,8 +576,12 @@ included directory memory
             }),
         };
         await refreshServerHierarchicalMemory(mockConfig);
-        expect(mockConfig.setUserMemory).toHaveBeenCalledWith(expect.stringContaining("# Instructions for MCP Server 'extension-server'"));
-        expect(mockConfig.setUserMemory).toHaveBeenCalledWith(expect.stringContaining('Always be polite.'));
+        expect(mockConfig.setUserMemory).toHaveBeenCalledWith(expect.objectContaining({
+            project: expect.stringContaining("# Instructions for MCP Server 'extension-server'"),
+        }));
+        expect(mockConfig.setUserMemory).toHaveBeenCalledWith(expect.objectContaining({
+            project: expect.stringContaining('Always be polite.'),
+        }));
     });
 });
 //# sourceMappingURL=memoryDiscovery.test.js.map