Skip to content

fix(cli): correct migration map typo for loadMemoryFromIncludeDirectories #15438

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Ashwinhegde19 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(cli): correct migration map typo for loadMemoryFromIncludeDirectories #15438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions packages/cli/src/config/settings.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/config/settings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down