feat(core): Render memory hierarchically in context. (#18350)

packages/cli/src/config/config.ts

@@ -32,6 +32,7 @@ import {
   ASK_USER_TOOL_NAME,
   getVersion,
   PREVIEW_GEMINI_MODEL_AUTO,
+  type HierarchicalMemory,
   coreEvents,
   GEMINI_MODEL_ALIAS_AUTO,
   getAdminErrorMessage,
@@ -39,11 +40,9 @@ import {
   Config,
   applyAdminAllowlist,
   getAdminBlockedMcpServersMessage,
-} from '@google/gemini-cli-core';
-import type {
-  HookDefinition,
-  HookEventName,
-  OutputFormat,
+  type HookDefinition,
+  type HookEventName,
+  type OutputFormat,
 } from '@google/gemini-cli-core';
 import {
   type Settings,
@@ -489,7 +488,7 @@ export async function loadCliConfig(
 
   const experimentalJitContext = settings.experimental?.jitContext ?? false;
 
-  let memoryContent = '';
+  let memoryContent: string | HierarchicalMemory = '';
   let fileCount = 0;
   let filePaths: string[] = [];
 

packages/cli/src/ui/AppContainer.tsx

@@ -55,6 +55,7 @@ import {
   coreEvents,
   CoreEvent,
   refreshServerHierarchicalMemory,
+  flattenMemory,
   type MemoryChangedPayload,
   writeToStdout,
   disableMouseEvents,
@@ -871,12 +872,14 @@ Logging in with Google... Restarting Gemini CLI to continue.
       const { memoryContent, fileCount } =
         await refreshServerHierarchicalMemory(config);
 
+      const flattenedMemory = flattenMemory(memoryContent);
+
       historyManager.addItem(
         {
           type: MessageType.INFO,
           text: `Memory refreshed successfully. ${
-            memoryContent.length > 0
-              ? `Loaded ${memoryContent.length} characters from ${fileCount} file(s).`
+            flattenedMemory.length > 0
+              ? `Loaded ${flattenedMemory.length} characters from ${fileCount} file(s).`
               : 'No memory content found.'
           }`,
         },
@@ -884,7 +887,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
       );
       if (config.getDebugMode()) {
         debugLogger.log(
-          `[DEBUG] Refreshed memory content in config: ${memoryContent.substring(
+          `[DEBUG] Refreshed memory content in config: ${flattenedMemory.substring(
             0,
             200,
           )}...`,

packages/cli/src/ui/commands/memoryCommand.test.ts

@@ -19,6 +19,7 @@ import {
   showMemory,
   addMemory,
   listMemoryFiles,
+  flattenMemory,
 } from '@google/gemini-cli-core';
 
 vi.mock('@google/gemini-cli-core', async (importOriginal) => {
@@ -33,7 +34,7 @@ vi.mock('@google/gemini-cli-core', async (importOriginal) => {
     refreshMemory: vi.fn(async (config) => {
       if (config.isJitContextEnabled()) {
         await config.getContextManager()?.refresh();
-        const memoryContent = config.getUserMemory() || '';
+        const memoryContent = original.flattenMemory(config.getUserMemory());
         const fileCount = config.getGeminiMdFileCount() || 0;
         return {
           type: 'message',
@@ -85,7 +86,7 @@ describe('memoryCommand', () => {
       mockGetGeminiMdFileCount = vi.fn();
 
       vi.mocked(showMemory).mockImplementation((config) => {
-        const memoryContent = config.getUserMemory() || '';
+        const memoryContent = flattenMemory(config.getUserMemory());
         const fileCount = config.getGeminiMdFileCount() || 0;
         let content;
         if (memoryContent.length > 0) {