Merge pull request #1609 from QwenLM/fix/settings-load-from-include-directories

fix: correct schema field name for context.loadFromIncludeDirectories

Author: LaZzyMan

packages/cli/src/config/config.ts

@@ -932,7 +932,7 @@ export async function loadCliConfig(
     targetDir: cwd,
     includeDirectories,
     loadMemoryFromIncludeDirectories:
-      settings.context?.loadMemoryFromIncludeDirectories || false,
+      settings.context?.loadFromIncludeDirectories || false,
     importFormat: settings.context?.importFormat || 'tree',
     debugMode,
     question,

packages/cli/src/config/settingsSchema.test.ts

@@ -218,14 +218,14 @@ describe('SettingsSchema', () => {
         },
         context: {
           includeDirectories: ['/path/to/dir'],
-          loadMemoryFromIncludeDirectories: true,
+          loadFromIncludeDirectories: true,
         },
       };
 
       // TypeScript should not complain about these properties
       expect(settings.ui?.theme).toBe('dark');
       expect(settings.context?.includeDirectories).toEqual(['/path/to/dir']);
-      expect(settings.context?.loadMemoryFromIncludeDirectories).toBe(true);
+      expect(settings.context?.loadFromIncludeDirectories).toBe(true);
     });
 
     it('should have includeDirectories setting in schema', () => {
@@ -243,21 +243,19 @@ describe('SettingsSchema', () => {
       ).toEqual([]);
     });
 
-    it('should have loadMemoryFromIncludeDirectories setting in schema', () => {
+    it('should have loadFromIncludeDirectories setting in schema', () => {
       expect(
-        getSettingsSchema().context?.properties
-          .loadMemoryFromIncludeDirectories,
+        getSettingsSchema().context?.properties.loadFromIncludeDirectories,
       ).toBeDefined();
       expect(
-        getSettingsSchema().context?.properties.loadMemoryFromIncludeDirectories
-          .type,
+        getSettingsSchema().context?.properties.loadFromIncludeDirectories.type,
       ).toBe('boolean');
       expect(
-        getSettingsSchema().context?.properties.loadMemoryFromIncludeDirectories
+        getSettingsSchema().context?.properties.loadFromIncludeDirectories
           .category,
       ).toBe('Context');
       expect(
-        getSettingsSchema().context?.properties.loadMemoryFromIncludeDirectories
+        getSettingsSchema().context?.properties.loadFromIncludeDirectories
           .default,
       ).toBe(false);
     });

packages/cli/src/config/settingsSchema.ts

@@ -687,7 +687,7 @@ const SETTINGS_SCHEMA = {
         showInDialog: false,
         mergeStrategy: MergeStrategy.CONCAT,
       },
-      loadMemoryFromIncludeDirectories: {
+      loadFromIncludeDirectories: {
         type: 'boolean',
         label: 'Load Memory From Include Directories',
         category: 'Context',

packages/cli/src/ui/AppContainer.tsx

@@ -623,7 +623,7 @@ export const AppContainer = (props: AppContainerProps) => {
     try {
       const { memoryContent, fileCount } = await loadHierarchicalGeminiMemory(
         process.cwd(),
-        settings.merged.context?.loadMemoryFromIncludeDirectories
+        settings.merged.context?.loadFromIncludeDirectories
           ? config.getWorkspaceContext().getDirectories()
           : [],
         config.getDebugMode(),

packages/cli/src/ui/components/SettingsDialog.test.tsx

@@ -1368,7 +1368,7 @@ describe('SettingsDialog', () => {
           enabled: true,
         },
         context: {
-          loadMemoryFromIncludeDirectories: true,
+          loadFromIncludeDirectories: true,
           fileFiltering: {
             respectGitIgnore: true,
             respectQwenIgnore: true,
@@ -1540,7 +1540,7 @@ describe('SettingsDialog', () => {
             enableRecursiveFileSearch: false,
             disableFuzzySearch: true,
           },
-          loadMemoryFromIncludeDirectories: true,
+          loadFromIncludeDirectories: true,
         },
       });
       const onSelect = vi.fn();
@@ -1605,7 +1605,7 @@ describe('SettingsDialog', () => {
           enabled: false,
         },
         context: {
-          loadMemoryFromIncludeDirectories: false,
+          loadFromIncludeDirectories: false,
           fileFiltering: {
             respectGitIgnore: false,
             respectQwenIgnore: false,

packages/core/src/config/config.ts

@@ -712,7 +712,7 @@ export class Config {
       this.getDebugMode(),
       this.getFileService(),
       this.getExtensionContextFilePaths(),
-      this.getFolderTrust(),
+      this.isTrustedFolder(),
       this.getImportFormat(),
     );
     this.setUserMemory(memoryContent);