From f70778120853a25be91e560d45edbc2bf9577637 Mon Sep 17 00:00:00 2001
From: ashwinhegde19 <ashwinhegde19@gmail.com>
Date: Tue, 23 Dec 2025 00:20:42 +0530
Subject: [PATCH] fix(cli): correct migration map typo for
 loadMemoryFromIncludeDirectories

Fixes #15069

The MIGRATION_MAP was incorrectly mapping 'loadMemoryFromIncludeDirectories'
to 'context.loadFromIncludeDirectories' instead of
'context.loadMemoryFromIncludeDirectories'.

This caused the V1 setting to be silently ignored during migration,
resulting in GEMINI.md files not being loaded from include directories.
---
 packages/cli/src/config/settings.test.ts | 25 ++++++++++++++++++++++++
 packages/cli/src/config/settings.ts      |  2 +-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/packages/cli/src/config/settings.test.ts b/packages/cli/src/config/settings.test.ts
index 1559cbe78cb..7058a42b43c 100644
--- a/packages/cli/src/config/settings.test.ts
+++ b/packages/cli/src/config/settings.test.ts
@@ -371,6 +371,31 @@ describe('Settings Loading and Merging', () => {
       expect((settings.merged as TestSettings)['allowedTools']).toBeUndefined();
     });
 
+    it('should migrate loadMemoryFromIncludeDirectories to context.loadMemoryFromIncludeDirectories', () => {
+      (mockFsExistsSync as Mock).mockImplementation(
+        (p: fs.PathLike) => p === USER_SETTINGS_PATH,
+      );
+      const legacySettingsContent = {
+        loadMemoryFromIncludeDirectories: true,
+      };
+      (fs.readFileSync as Mock).mockImplementation(
+        (p: fs.PathOrFileDescriptor) => {
+          if (p === USER_SETTINGS_PATH)
+            return JSON.stringify(legacySettingsContent);
+          return '{}';
+        },
+      );
+
+      const settings = loadSettings(MOCK_WORKSPACE_DIR);
+
+      expect(settings.merged.context?.loadMemoryFromIncludeDirectories).toBe(
+        true,
+      );
+      expect(
+        (settings.merged as TestSettings)['loadMemoryFromIncludeDirectories'],
+      ).toBeUndefined();
+    });
+
     it('should allow V2 settings to override V1 settings when both are present (zombie setting fix)', () => {
       (mockFsExistsSync as Mock).mockImplementation(
         (p: fs.PathLike) => p === USER_SETTINGS_PATH,
diff --git a/packages/cli/src/config/settings.ts b/packages/cli/src/config/settings.ts
index 3e41fbe87e9..15e448c129c 100644
--- a/packages/cli/src/config/settings.ts
+++ b/packages/cli/src/config/settings.ts
@@ -112,7 +112,7 @@ const MIGRATION_MAP: Record<string, string> = {
   showCitations: 'ui.showCitations',
   ideMode: 'ide.enabled',
   includeDirectories: 'context.includeDirectories',
-  loadMemoryFromIncludeDirectories: 'context.loadFromIncludeDirectories',
+  loadMemoryFromIncludeDirectories: 'context.loadMemoryFromIncludeDirectories',
   maxSessionTurns: 'model.maxSessionTurns',
   mcpServers: 'mcpServers',
   mcpServerCommand: 'mcp.serverCommand',