feat(core): Render memory hierarchically in context.

[joshualitt]

Fixes #16999

[gemini-code-assist]

Summary of Changes

Hello @joshualitt, I'm Gemini Code Assist¹! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request significantly refactors how the Gemini CLI manages and presents contextual memory. By introducing a hierarchical memory model, the system can now differentiate between global, extension-specific, and project-level instructions and information. This change improves the clarity and organization of context provided to the underlying AI model, enabling more precise and context-aware responses, and addresses the need for a defined conflict resolution strategy when multiple context sources are present.

Highlights

• Hierarchical Memory Structure: Implemented a new 'HierarchicalMemory' type to categorize context into global, extension, and project levels, replacing the previous flat string memory.
• Context Manager Enhancements: The 'ContextManager' now independently loads and manages global, extension, and project-specific memory, providing a more granular control over context.
• System Prompt Integration: The system prompt generation has been updated to render hierarchical memory using distinct XML tags ('<global_context>', '<extension_context>', '<project_context>'), ensuring clear separation and prioritization of context sources.
• Conflict Resolution Mechanism: A new rule has been added to the core mandates of the system prompt, establishing a clear priority for resolving conflicting instructions: project context > extension context > global context.
• Memory Flattening Utility: Introduced a 'flattenMemory' utility function to convert the new hierarchical memory structure back into a single string, primarily for display purposes in the CLI and for compatibility with existing components.

Changelog

• packages/a2a-server/src/config/config.test.ts
  • Updated the mock for 'loadServerHierarchicalMemory' to return a structured 'HierarchicalMemory' object instead of a simple string.
• packages/a2a-server/src/config/config.ts
  • Imported the 'HierarchicalMemory' type.
  • Adjusted the return type of 'loadServerHierarchicalMemory' to 'HierarchicalMemory'.
• packages/cli/src/config/config.ts
  • Imported the 'HierarchicalMemory' type.
  • Updated the 'memoryContent' variable to accept 'string | HierarchicalMemory'.
• packages/cli/src/ui/AppContainer.tsx
  • Imported the 'flattenMemory' utility.
  • Modified memory display logic to use 'flattenMemory' for presenting refreshed memory content.
• packages/cli/src/ui/commands/memoryCommand.test.ts
  • Imported the 'flattenMemory' utility.
  • Updated test mocks and 'showMemory' implementation to utilize 'flattenMemory' for consistent memory representation.
• packages/cli/src/ui/hooks/useShowMemoryCommand.ts
  • Imported the 'flattenMemory' utility.
  • Applied 'flattenMemory' to 'currentMemory' before logging and displaying it in the UI.
• packages/core/src/commands/memory.test.ts
  • Updated 'refreshMemory' mock to return a 'HierarchicalMemory' object.
• packages/core/src/commands/memory.ts
  • Imported the 'flattenMemory' utility.
  • Ensured 'showMemory' and 'refreshMemory' commands flatten the hierarchical memory before processing or displaying.
• packages/core/src/config/config.test.ts
  • Enhanced the 'ContextManager' mock to include 'getExtensionMemory'.
  • Modified 'config.getUserMemory()' expectation to return a 'HierarchicalMemory' object.
• packages/core/src/config/config.ts
  • Imported the 'HierarchicalMemory' type.
  • Updated 'ConfigParameters.userMemory' and 'Config.userMemory' to support 'string | HierarchicalMemory'.
  • Refactored 'getUserMemory' to return a 'HierarchicalMemory' object when JIT context is enabled, combining global, extension, and project memory.
  • Updated 'setUserMemory' to accept 'string | HierarchicalMemory'.
• packages/core/src/config/memory.ts
  • New file: Defined the 'HierarchicalMemory' interface.
  • New function: Implemented 'flattenMemory' to convert 'HierarchicalMemory' into a single string, with section headers for clarity.
• packages/core/src/core/snapshots/prompts.test.ts.snap
  • Updated snapshots to include the new hierarchical memory rendering with XML tags and the conflict resolution rule.
• packages/core/src/core/client.test.ts
  • Adjusted test expectations for 'mockGetCoreSystemPrompt' to reflect the use of flattened memory.
• packages/core/src/core/client.ts
  • Simplified the logic for retrieving 'systemMemory' by consistently using 'this.config.getUserMemory()'.
• packages/core/src/core/prompts.test.ts
  • Added new tests to verify the correct rendering of hierarchical memory with XML tags and the inclusion of conflict resolution rules in the system prompt.
• packages/core/src/core/prompts.ts
  • Imported the 'HierarchicalMemory' type.
  • Updated 'getCoreSystemPrompt' to accept 'userMemory' as 'string | HierarchicalMemory'.
• packages/core/src/index.ts
  • Exported the new 'memory.js' module from the 'config' directory.
• packages/core/src/prompts/promptProvider.ts
  • Imported the 'HierarchicalMemory' type.
  • Updated 'getCoreSystemPrompt' to accept 'userMemory' as 'string | HierarchicalMemory'.
• packages/core/src/prompts/snippets.ts
  • Imported the 'HierarchicalMemory' type.
  • Added a "Conflict Resolution" mandate to 'renderCoreMandates' to define priority for hierarchical context.
  • Modified 'renderUserMemory' to intelligently render 'HierarchicalMemory' with XML tags for each level (global, extension, project).
• packages/core/src/services/contextManager.test.ts
  • Updated mocks for 'memoryDiscovery' to include 'loadExtensionMemory'.
  • Modified 'getExtensionLoader' mock to return an object with a 'getExtensions' method.
• packages/core/src/services/contextManager.ts
  • Imported 'loadExtensionMemory'.
  • Introduced 'extensionMemory' and 'projectMemory' private fields.
  • Refactored the 'refresh' method to load global, extension, and project memory independently.
  • Added 'loadExtensionMemory' and 'loadProjectMemory' private methods.
  • Updated 'getEnvironmentMemory' to return 'projectMemory'.
• packages/core/src/utils/memoryDiscovery.test.ts
  • Imported 'flattenMemory' and 'HierarchicalMemory'.
  • Introduced a 'flattenResult' helper function to simplify test assertions.
  • Updated numerous tests to use 'flattenResult' and expect the new hierarchical memory structure.
• packages/core/src/utils/memoryDiscovery.ts
  • Imported 'HierarchicalMemory'.
  • Added a new 'loadExtensionMemory' function to retrieve context files from active extensions.
  • Updated 'LoadServerHierarchicalMemoryResponse' interface to use 'HierarchicalMemory' for 'memoryContent'.
  • Refactored 'loadServerHierarchicalMemory' to separate global, project, and extension paths, and to return a 'HierarchicalMemory' object.
  • Modified 'refreshServerHierarchicalMemory' to correctly handle and set the new hierarchical memory structure.

Activity

• This pull request addresses and fixes issue '[Context Mgmt] Refactor GEMINI.md Context Loading to be Hierarchical #16999'.

Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature	Command	Description
Code Review	/gemini review	Performs a code review for the current pull request in its current state.
Pull Request Summary	/gemini summary	Provides a summary of the current pull request in its current state.
Comment	@gemini-code-assist	Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help	/gemini help	Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution. ↩

[github-actions]

Size Change: +6.13 kB (+0.03%)

Total Size: 23.9 MB

Filename	Size	Change
./bundle/gemini.js	23.9 MB	+6.13 kB (+0.03%)

ℹ️ View Unchanged

Filename	Size
./bundle/sandbox-macos-permissive-closed.sb	1.03 kB
./bundle/sandbox-macos-permissive-open.sb	890 B
./bundle/sandbox-macos-permissive-proxied.sb	1.31 kB
./bundle/sandbox-macos-restrictive-closed.sb	3.29 kB
./bundle/sandbox-macos-restrictive-open.sb	3.36 kB
./bundle/sandbox-macos-restrictive-proxied.sb	3.56 kB

_{compressed-size-action}

[gemini-code-assist]

Code Review

This pull request refactors the memory management to support a hierarchical structure (global, extension, project), which is a great improvement for context organization. The changes are consistently applied across the codebase, from data loading to UI display. I've identified a performance improvement opportunity in how project memory is loaded, where extension context files are read and then discarded. My suggestion refactors this to avoid unnecessary file operations, making the process more efficient.