Prototyped improvements for memory subagent

packages/core/src/agents/memory-manager-agent.test.ts

@@ -4,10 +4,40 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 import { MemoryManagerAgent } from './memory-manager-agent.js';
+import * as fs from 'node:fs';
+import * as path from 'node:path';
+import {
+  ASK_USER_TOOL_NAME,
+  EDIT_TOOL_NAME,
+  GLOB_TOOL_NAME,
+  GREP_TOOL_NAME,
+  LS_TOOL_NAME,
+  READ_FILE_TOOL_NAME,
+  WRITE_FILE_TOOL_NAME,
+} from '../tools/tool-names.js';
+import { Storage } from '../config/storage.js';
+
+vi.mock('node:fs', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('node:fs')>();
+  return {
+    ...actual,
+    existsSync: vi.fn(),
+    statSync: vi.fn(),
+    readFileSync: vi.fn(),
+  };
+});
 
 describe('MemoryManagerAgent', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  afterEach(() => {
+    vi.restoreAllMocks();
+  });
+
   it('should have the correct name "save_memory"', () => {
     const agent = MemoryManagerAgent();
     expect(agent.name).toBe('save_memory');
@@ -27,25 +57,116 @@ describe('MemoryManagerAgent', () => {
   it('should have a system prompt with memory management instructions', () => {
     const agent = MemoryManagerAgent();
     const prompt = agent.promptConfig.systemPrompt;
-    expect(prompt).toContain('Global (~/.gemini/)');
-    expect(prompt).toContain('Project (.gemini/)');
-    expect(prompt).toContain('Table of Contents');
-    expect(prompt).toContain('De-duplicating');
-    expect(prompt).toContain('Adding');
-    expect(prompt).toContain('Removing stale');
-    expect(prompt).toContain('Organizing');
+    const globalGeminiDir = Storage.getGlobalGeminiDir();
+    expect(prompt).toContain(`Global (${globalGeminiDir}`);
+    expect(prompt).toContain('Project (.gemini/');
+    expect(prompt).toContain('Hierarchy & Routing');
+    expect(prompt).toContain('De-duplicate');
+    expect(prompt).toContain('Add');
+    expect(prompt).toContain('Remove');
+    expect(prompt).toContain('Organize');
     expect(prompt).toContain('Routing');
   });
 
+  it('should have efficiency guidelines in the system prompt', () => {
+    const agent = MemoryManagerAgent();
+    const prompt = agent.promptConfig.systemPrompt;
+    expect(prompt).toContain('Efficiency & Performance');
+    expect(prompt).toContain('Minimize Turns');
+    expect(prompt).toContain('Stay Focused');
+    expect(prompt).toContain('Be Decisive');
+    expect(prompt).toContain('Context Awareness');
+  });
+
+  it('should inject GEMINI.md files from global and project root into initial context', () => {
+    const globalDir = Storage.getGlobalGeminiDir();
+    const projectRoot = '/test/project';
+    const globalFile = path.join(globalDir, 'GEMINI.md');
+    const projectFile = path.join(projectRoot, '.gemini', 'GEMINI.md');
+
+    vi.mocked(fs.existsSync).mockImplementation((p: fs.PathLike) => {
+      if (typeof p === 'string' && (p === globalFile || p === projectFile))
+        return true;
+      return false;
+    });
+
+    vi.mocked(fs.statSync).mockImplementation((p: fs.PathLike) => {
+      if (typeof p === 'string' && (p === globalFile || p === projectFile)) {
+        return { isFile: () => true } as fs.Stats;
+      }
+
+      return { isFile: () => false } as fs.Stats;
+    });
+
+    vi.mocked(fs.readFileSync).mockImplementation(
+      (p: fs.PathOrFileDescriptor) => {
+        if (p === globalFile) return 'global context';
+        if (p === projectFile) return 'project context';
+        return '';
+      },
+    );
+
+    const agent = MemoryManagerAgent(projectRoot);
+    const prompt = agent.promptConfig.systemPrompt;
+
+    expect(prompt).toContain('# Initial Context');
+    expect(prompt).toContain(`## File: ${globalFile}`);
+    expect(prompt).toContain('global context');
+    expect(prompt).toContain(`## File: ${projectFile}`);
+    expect(prompt).toContain('project context');
+  });
+
+  it('should inject GEMINI.md files along the CWD up to project root', () => {
+    const projectRoot = '/test/project';
+    const cwd = '/test/project/src/module';
+    const srcFile = path.join('/test/project/src', 'GEMINI.md');
+    const moduleFile = path.join('/test/project/src/module', 'GEMINI.md');
+
+    vi.spyOn(process, 'cwd').mockReturnValue(cwd);
+    vi.mocked(fs.existsSync).mockImplementation((p: fs.PathLike) => {
+      if (typeof p === 'string' && (p === srcFile || p === moduleFile))
+        return true;
+      return false;
+    });
+
+    vi.mocked(fs.statSync).mockImplementation((p: fs.PathLike) => {
+      if (typeof p === 'string' && (p === srcFile || p === moduleFile)) {
+        return { isFile: () => true } as fs.Stats;
+      }
+
+      return { isFile: () => false } as fs.Stats;
+    });
+
+    vi.mocked(fs.readFileSync).mockImplementation(
+      (p: fs.PathOrFileDescriptor) => {
+        if (p === srcFile) return 'src context';
+        if (p === moduleFile) return 'module context';
+        return '';
+      },
+    );
+
+    const agent = MemoryManagerAgent(projectRoot);
+    const prompt = agent.promptConfig.systemPrompt;
+
+    expect(prompt).toContain('# Initial Context');
+    expect(prompt).toContain(`## File: ${srcFile}`);
+    expect(prompt).toContain('src context');
+    expect(prompt).toContain(`## File: ${moduleFile}`);
+    expect(prompt).toContain('module context');
+  });
+
   it('should have file-management and search tools', () => {
     const agent = MemoryManagerAgent();
     expect(agent.toolConfig).toBeDefined();
     expect(agent.toolConfig!.tools).toEqual(
       expect.arrayContaining([
-        'read_file',
-        'replace',
-        'write_file',
-        'grep_search',
+        READ_FILE_TOOL_NAME,
+        EDIT_TOOL_NAME,
+        WRITE_FILE_TOOL_NAME,
+        LS_TOOL_NAME,
+        GLOB_TOOL_NAME,
+        GREP_TOOL_NAME,
+        ASK_USER_TOOL_NAME,
       ]),
     );
   });
@@ -58,8 +179,11 @@ describe('MemoryManagerAgent', () => {
     expect(schema['required']).toContain('request');
   });
 
-  it('should inherit the model from the parent agent', () => {
+  it('should use a fast base model to avoid unnecessary thinking', () => {
     const agent = MemoryManagerAgent();
-    expect(agent.modelConfig.model).toBe('inherit');
+    expect(agent.modelConfig.model).toBe('gemini-2.5-flash-base');
+    expect(
+      agent.modelConfig.generateContentConfig?.thinkingConfig?.thinkingBudget,
+    ).toBe(0);
   });
 });