@google/gemini-cli 0.11.0-nightly.20251020.a96f0659 → 0.11.0-preview.0

package/dist/src/config/config.test.js

@@ -10,7 +10,6 @@ import { DEFAULT_GEMINI_MODEL, DEFAULT_GEMINI_MODEL_AUTO, OutputFormat, SHELL_TO
 import { loadCliConfig, parseArguments } from './config.js';
 import * as ServerConfig from '@google/gemini-cli-core';
 import { isWorkspaceTrusted } from './trustedFolders.js';
-import { ExtensionEnablementManager } from './extensions/extensionEnablement.js';
 vi.mock('./trustedFolders.js', () => ({
     isWorkspaceTrusted: vi
         .fn()
@@ -420,7 +419,7 @@ describe('loadCliConfig', () => {
             process.argv = ['node', 'script.js'];
             const argv = await parseArguments({});
             const settings = {};
-            const config = await loadCliConfig(settings, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+            const config = await loadCliConfig(settings, [], 'test-session', argv);
             expect(config.getProxy()).toBeFalsy();
         });
         const proxy_url = 'http://localhost:7890';
@@ -460,7 +459,7 @@ describe('loadCliConfig', () => {
                 process.argv = ['node', 'script.js'];
                 const argv = await parseArguments({});
                 const settings = {};
-                const config = await loadCliConfig(settings, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+                const config = await loadCliConfig(settings, [], 'test-session', argv);
                 expect(config.getProxy()).toBe(expected);
             });
         });
@@ -482,6 +481,7 @@ describe('Hierarchical Memory Loading (config.ts) - Placeholder Suite', () => {
             {
                 path: '/path/to/ext1',
                 name: 'ext1',
+                id: 'ext1-id',
                 version: '1.0.0',
                 contextFiles: ['/path/to/ext1/GEMINI.md'],
                 isActive: true,
@@ -489,6 +489,7 @@ describe('Hierarchical Memory Loading (config.ts) - Placeholder Suite', () => {
             {
                 path: '/path/to/ext2',
                 name: 'ext2',
+                id: 'ext2-id',
                 version: '1.0.0',
                 contextFiles: [],
                 isActive: true,
@@ -496,6 +497,7 @@ describe('Hierarchical Memory Loading (config.ts) - Placeholder Suite', () => {
             {
                 path: '/path/to/ext3',
                 name: 'ext3',
+                id: 'ext3-id',
                 version: '1.0.0',
                 contextFiles: [
                     '/path/to/ext3/context1.md',
@@ -505,12 +507,8 @@ describe('Hierarchical Memory Loading (config.ts) - Placeholder Suite', () => {
             },
         ];
         const argv = await parseArguments({});
-        await loadCliConfig(settings, extensions, new ExtensionEnablementManager(argv.extensions), 'session-id', argv);
-        expect(ServerConfig.loadServerHierarchicalMemory).toHaveBeenCalledWith(expect.any(String), [], false, expect.any(Object), [
-            '/path/to/ext1/GEMINI.md',
-            '/path/to/ext3/context1.md',
-            '/path/to/ext3/context2.md',
-        ], true, 'tree', {
+        await loadCliConfig(settings, extensions, 'session-id', argv);
+        expect(ServerConfig.loadServerHierarchicalMemory).toHaveBeenCalledWith(expect.any(String), [], false, expect.any(Object), extensions, true, 'tree', {
             respectGitIgnore: false,
             respectGeminiIgnore: true,
         }, undefined);
@@ -561,6 +559,7 @@ describe('mergeMcpServers', () => {
             {
                 path: '/path/to/ext1',
                 name: 'ext1',
+                id: 'ext1-id',
                 version: '1.0.0',
                 mcpServers: {
                     'ext1-server': {
@@ -574,7 +573,7 @@ describe('mergeMcpServers', () => {
         const originalSettings = JSON.parse(JSON.stringify(settings));
         process.argv = ['node', 'script.js'];
         const argv = await parseArguments({});
-        await loadCliConfig(settings, extensions, new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        await loadCliConfig(settings, extensions, 'test-session', argv);
         expect(settings).toEqual(originalSettings);
     });
 });
@@ -597,6 +596,7 @@ describe('mergeExcludeTools', () => {
             {
                 path: '/path/to/ext1',
                 name: 'ext1',
+                id: 'ext1-id',
                 version: '1.0.0',
                 excludeTools: ['tool3', 'tool4'],
                 contextFiles: [],
@@ -605,6 +605,7 @@ describe('mergeExcludeTools', () => {
             {
                 path: '/path/to/ext2',
                 name: 'ext2',
+                id: 'ext2-id',
                 version: '1.0.0',
                 excludeTools: ['tool5'],
                 contextFiles: [],
@@ -613,7 +614,7 @@ describe('mergeExcludeTools', () => {
         ];
         process.argv = ['node', 'script.js'];
         const argv = await parseArguments({});
-        const config = await loadCliConfig(settings, extensions, new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig(settings, extensions, 'test-session', argv);
         expect(config.getExcludeTools()).toEqual(expect.arrayContaining(['tool1', 'tool2', 'tool3', 'tool4', 'tool5']));
         expect(config.getExcludeTools()).toHaveLength(5);
     });
@@ -623,6 +624,7 @@ describe('mergeExcludeTools', () => {
             {
                 path: '/path/to/ext1',
                 name: 'ext1',
+                id: 'ext1-id',
                 version: '1.0.0',
                 excludeTools: ['tool2', 'tool3'],
                 contextFiles: [],
@@ -631,7 +633,7 @@ describe('mergeExcludeTools', () => {
         ];
         process.argv = ['node', 'script.js'];
         const argv = await parseArguments({});
-        const config = await loadCliConfig(settings, extensions, new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig(settings, extensions, 'test-session', argv);
         expect(config.getExcludeTools()).toEqual(expect.arrayContaining(['tool1', 'tool2', 'tool3']));
         expect(config.getExcludeTools()).toHaveLength(3);
     });
@@ -641,6 +643,7 @@ describe('mergeExcludeTools', () => {
             {
                 path: '/path/to/ext1',
                 name: 'ext1',
+                id: 'ext1-id',
                 version: '1.0.0',
                 excludeTools: ['tool2', 'tool3'],
                 contextFiles: [],
@@ -649,6 +652,7 @@ describe('mergeExcludeTools', () => {
             {
                 path: '/path/to/ext2',
                 name: 'ext2',
+                id: 'ext2-id',
                 version: '1.0.0',
                 excludeTools: ['tool3', 'tool4'],
                 contextFiles: [],
@@ -657,7 +661,7 @@ describe('mergeExcludeTools', () => {
         ];
         process.argv = ['node', 'script.js'];
         const argv = await parseArguments({});
-        const config = await loadCliConfig(settings, extensions, new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig(settings, extensions, 'test-session', argv);
         expect(config.getExcludeTools()).toEqual(expect.arrayContaining(['tool1', 'tool2', 'tool3', 'tool4']));
         expect(config.getExcludeTools()).toHaveLength(4);
     });
@@ -667,7 +671,7 @@ describe('mergeExcludeTools', () => {
         const extensions = [];
         process.argv = ['node', 'script.js'];
         const argv = await parseArguments({});
-        const config = await loadCliConfig(settings, extensions, new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig(settings, extensions, 'test-session', argv);
         expect(config.getExcludeTools()).toEqual([]);
     });
     it('should return default excludes when no excludeTools are specified and it is not interactive', async () => {
@@ -676,7 +680,7 @@ describe('mergeExcludeTools', () => {
         const extensions = [];
         process.argv = ['node', 'script.js', '-p', 'test'];
         const argv = await parseArguments({});
-        const config = await loadCliConfig(settings, extensions, new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig(settings, extensions, 'test-session', argv);
         expect(config.getExcludeTools()).toEqual(defaultExcludes);
     });
     it('should handle settings with excludeTools but no extensions', async () => {
@@ -684,7 +688,7 @@ describe('mergeExcludeTools', () => {
         const argv = await parseArguments({});
         const settings = { tools: { exclude: ['tool1', 'tool2'] } };
         const extensions = [];
-        const config = await loadCliConfig(settings, extensions, new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig(settings, extensions, 'test-session', argv);
         expect(config.getExcludeTools()).toEqual(expect.arrayContaining(['tool1', 'tool2']));
         expect(config.getExcludeTools()).toHaveLength(2);
     });
@@ -694,6 +698,7 @@ describe('mergeExcludeTools', () => {
             {
                 path: '/path/to/ext',
                 name: 'ext1',
+                id: 'ext1-id',
                 version: '1.0.0',
                 excludeTools: ['tool1', 'tool2'],
                 contextFiles: [],
@@ -702,7 +707,7 @@ describe('mergeExcludeTools', () => {
         ];
         process.argv = ['node', 'script.js'];
         const argv = await parseArguments({});
-        const config = await loadCliConfig(settings, extensions, new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig(settings, extensions, 'test-session', argv);
         expect(config.getExcludeTools()).toEqual(expect.arrayContaining(['tool1', 'tool2']));
         expect(config.getExcludeTools()).toHaveLength(2);
     });
@@ -712,6 +717,7 @@ describe('mergeExcludeTools', () => {
             {
                 path: '/path/to/ext',
                 name: 'ext1',
+                id: 'ext1-id',
                 version: '1.0.0',
                 excludeTools: ['tool2'],
                 contextFiles: [],
@@ -721,7 +727,7 @@ describe('mergeExcludeTools', () => {
         const originalSettings = JSON.parse(JSON.stringify(settings));
         process.argv = ['node', 'script.js'];
         const argv = await parseArguments({});
-        await loadCliConfig(settings, extensions, new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        await loadCliConfig(settings, extensions, 'test-session', argv);
         expect(settings).toEqual(originalSettings);
     });
 });
@@ -742,7 +748,7 @@ describe('Approval mode tool exclusion logic', () => {
         const argv = await parseArguments({});
         const settings = {};
         const extensions = [];
-        const config = await loadCliConfig(settings, extensions, new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig(settings, extensions, 'test-session', argv);
         const excludedTools = config.getExcludeTools();
         expect(excludedTools).toContain(SHELL_TOOL_NAME);
         expect(excludedTools).toContain(EDIT_TOOL_NAME);
@@ -760,7 +766,7 @@ describe('Approval mode tool exclusion logic', () => {
         const argv = await parseArguments({});
         const settings = {};
         const extensions = [];
-        const config = await loadCliConfig(settings, extensions, new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig(settings, extensions, 'test-session', argv);
         const excludedTools = config.getExcludeTools();
         expect(excludedTools).toContain(SHELL_TOOL_NAME);
         expect(excludedTools).toContain(EDIT_TOOL_NAME);
@@ -778,7 +784,7 @@ describe('Approval mode tool exclusion logic', () => {
         const argv = await parseArguments({});
         const settings = {};
         const extensions = [];
-        const config = await loadCliConfig(settings, extensions, new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig(settings, extensions, 'test-session', argv);
         const excludedTools = config.getExcludeTools();
         expect(excludedTools).toContain(SHELL_TOOL_NAME);
         expect(excludedTools).not.toContain(EDIT_TOOL_NAME);
@@ -796,7 +802,7 @@ describe('Approval mode tool exclusion logic', () => {
         const argv = await parseArguments({});
         const settings = {};
         const extensions = [];
-        const config = await loadCliConfig(settings, extensions, new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig(settings, extensions, 'test-session', argv);
         const excludedTools = config.getExcludeTools();
         expect(excludedTools).not.toContain(SHELL_TOOL_NAME);
         expect(excludedTools).not.toContain(EDIT_TOOL_NAME);
@@ -807,7 +813,7 @@ describe('Approval mode tool exclusion logic', () => {
         const argv = await parseArguments({});
         const settings = {};
         const extensions = [];
-        const config = await loadCliConfig(settings, extensions, new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig(settings, extensions, 'test-session', argv);
         const excludedTools = config.getExcludeTools();
         expect(excludedTools).not.toContain(SHELL_TOOL_NAME);
         expect(excludedTools).not.toContain(EDIT_TOOL_NAME);
@@ -827,7 +833,7 @@ describe('Approval mode tool exclusion logic', () => {
             const argv = await parseArguments({});
             const settings = {};
             const extensions = [];
-            const config = await loadCliConfig(settings, extensions, new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+            const config = await loadCliConfig(settings, extensions, 'test-session', argv);
             const excludedTools = config.getExcludeTools();
             expect(excludedTools).not.toContain(SHELL_TOOL_NAME);
             expect(excludedTools).not.toContain(EDIT_TOOL_NAME);
@@ -846,7 +852,7 @@ describe('Approval mode tool exclusion logic', () => {
         const argv = await parseArguments({});
         const settings = { tools: { exclude: ['custom_tool'] } };
         const extensions = [];
-        const config = await loadCliConfig(settings, extensions, new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig(settings, extensions, 'test-session', argv);
         const excludedTools = config.getExcludeTools();
         expect(excludedTools).toContain('custom_tool'); // From settings
         expect(excludedTools).toContain(SHELL_TOOL_NAME); // From approval mode
@@ -863,7 +869,7 @@ describe('Approval mode tool exclusion logic', () => {
         };
         const settings = {};
         const extensions = [];
-        await expect(loadCliConfig(settings, extensions, new ExtensionEnablementManager(invalidArgv.extensions), 'test-session', invalidArgv)).rejects.toThrow('Invalid approval mode: invalid_mode. Valid values are: yolo, auto_edit, default');
+        await expect(loadCliConfig(settings, extensions, 'test-session', invalidArgv)).rejects.toThrow('Invalid approval mode: invalid_mode. Valid values are: yolo, auto_edit, default');
     });
 });
 describe('loadCliConfig with allowed-mcp-server-names', () => {
@@ -888,7 +894,7 @@ describe('loadCliConfig with allowed-mcp-server-names', () => {
     it('should allow all MCP servers if the flag is not provided', async () => {
         process.argv = ['node', 'script.js'];
         const argv = await parseArguments({});
-        const config = await loadCliConfig(baseSettings, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig(baseSettings, [], 'test-session', argv);
         expect(config.getMcpServers()).toEqual(baseSettings.mcpServers);
     });
     it('should allow only the specified MCP server', async () => {
@@ -899,7 +905,7 @@ describe('loadCliConfig with allowed-mcp-server-names', () => {
             'server1',
         ];
         const argv = await parseArguments({});
-        const config = await loadCliConfig(baseSettings, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig(baseSettings, [], 'test-session', argv);
         expect(config.getMcpServers()).toEqual({
             server1: { url: 'http://localhost:8080' },
         });
@@ -914,7 +920,7 @@ describe('loadCliConfig with allowed-mcp-server-names', () => {
             'server3',
         ];
         const argv = await parseArguments({});
-        const config = await loadCliConfig(baseSettings, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig(baseSettings, [], 'test-session', argv);
         expect(config.getMcpServers()).toEqual({
             server1: { url: 'http://localhost:8080' },
             server3: { url: 'http://localhost:8082' },
@@ -930,7 +936,7 @@ describe('loadCliConfig with allowed-mcp-server-names', () => {
             'server4',
         ];
         const argv = await parseArguments({});
-        const config = await loadCliConfig(baseSettings, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig(baseSettings, [], 'test-session', argv);
         expect(config.getMcpServers()).toEqual({
             server1: { url: 'http://localhost:8080' },
         });
@@ -938,7 +944,7 @@ describe('loadCliConfig with allowed-mcp-server-names', () => {
     it('should allow no MCP servers if the flag is provided but empty', async () => {
         process.argv = ['node', 'script.js', '--allowed-mcp-server-names', ''];
         const argv = await parseArguments({});
-        const config = await loadCliConfig(baseSettings, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig(baseSettings, [], 'test-session', argv);
         expect(config.getMcpServers()).toEqual({});
     });
     it('should read allowMCPServers from settings', async () => {
@@ -948,7 +954,7 @@ describe('loadCliConfig with allowed-mcp-server-names', () => {
             ...baseSettings,
             mcp: { allowed: ['server1', 'server2'] },
         };
-        const config = await loadCliConfig(settings, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig(settings, [], 'test-session', argv);
         expect(config.getMcpServers()).toEqual({
             server1: { url: 'http://localhost:8080' },
             server2: { url: 'http://localhost:8081' },
@@ -961,7 +967,7 @@ describe('loadCliConfig with allowed-mcp-server-names', () => {
             ...baseSettings,
             mcp: { excluded: ['server1', 'server2'] },
         };
-        const config = await loadCliConfig(settings, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig(settings, [], 'test-session', argv);
         expect(config.getMcpServers()).toEqual({
             server3: { url: 'http://localhost:8082' },
         });
@@ -976,7 +982,7 @@ describe('loadCliConfig with allowed-mcp-server-names', () => {
                 allowed: ['server1', 'server2'],
             },
         };
-        const config = await loadCliConfig(settings, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig(settings, [], 'test-session', argv);
         expect(config.getMcpServers()).toEqual({
             server2: { url: 'http://localhost:8081' },
         });
@@ -996,7 +1002,7 @@ describe('loadCliConfig with allowed-mcp-server-names', () => {
                 allowed: ['server2'],
             },
         };
-        const config = await loadCliConfig(settings, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig(settings, [], 'test-session', argv);
         expect(config.getMcpServers()).toEqual({
             server1: { url: 'http://localhost:8080' },
         });
@@ -1018,48 +1024,13 @@ describe('loadCliConfig with allowed-mcp-server-names', () => {
                 excluded: ['server3'], // Should be ignored
             },
         };
-        const config = await loadCliConfig(settings, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig(settings, [], 'test-session', argv);
         expect(config.getMcpServers()).toEqual({
             server2: { url: 'http://localhost:8081' },
             server3: { url: 'http://localhost:8082' },
         });
     });
 });
-describe('loadCliConfig extensions', () => {
-    const mockExtensions = [
-        {
-            path: '/path/to/ext1',
-            name: 'ext1',
-            version: '1.0.0',
-            contextFiles: ['/path/to/ext1.md'],
-            isActive: true,
-        },
-        {
-            path: '/path/to/ext2',
-            name: 'ext2',
-            version: '1.0.0',
-            contextFiles: ['/path/to/ext2.md'],
-            isActive: true,
-        },
-    ];
-    it('should not filter extensions if --extensions flag is not used', async () => {
-        process.argv = ['node', 'script.js'];
-        const argv = await parseArguments({});
-        const settings = {};
-        const config = await loadCliConfig(settings, mockExtensions, new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
-        expect(config.getExtensionContextFilePaths()).toEqual([
-            '/path/to/ext1.md',
-            '/path/to/ext2.md',
-        ]);
-    });
-    it('should filter extensions if --extensions flag is used', async () => {
-        process.argv = ['node', 'script.js', '--extensions', 'ext1'];
-        const argv = await parseArguments({});
-        const settings = {};
-        const config = await loadCliConfig(settings, mockExtensions, new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
-        expect(config.getExtensionContextFilePaths()).toEqual(['/path/to/ext1.md']);
-    });
-});
 describe('loadCliConfig model selection', () => {
     it('selects a model from settings.json if provided', async () => {
         process.argv = ['node', 'script.js'];
@@ -1068,7 +1039,7 @@ describe('loadCliConfig model selection', () => {
             model: {
                 name: 'gemini-9001-ultra',
             },
-        }, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        }, [], 'test-session', argv);
         expect(config.getModel()).toBe('gemini-9001-ultra');
     });
     it('uses the default gemini model if nothing is set', async () => {
@@ -1076,25 +1047,25 @@ describe('loadCliConfig model selection', () => {
         const argv = await parseArguments({});
         const config = await loadCliConfig({
         // No model set.
-        }, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        }, [], 'test-session', argv);
         expect(config.getModel()).toBe('auto');
     });
-    it('always prefers model from argvs', async () => {
+    it('always prefers model from argv', async () => {
         process.argv = ['node', 'script.js', '--model', 'gemini-8675309-ultra'];
         const argv = await parseArguments({});
         const config = await loadCliConfig({
             model: {
                 name: 'gemini-9001-ultra',
             },
-        }, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        }, [], 'test-session', argv);
         expect(config.getModel()).toBe('gemini-8675309-ultra');
     });
-    it('selects the model from argvs if provided', async () => {
+    it('selects the model from argv if provided', async () => {
         process.argv = ['node', 'script.js', '--model', 'gemini-8675309-ultra'];
         const argv = await parseArguments({});
         const config = await loadCliConfig({
         // No model provided via settings.
-        }, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        }, [], 'test-session', argv);
         expect(config.getModel()).toBe('gemini-8675309-ultra');
     });
 });
@@ -1106,7 +1077,7 @@ describe('loadCliConfig model selection with model router', () => {
             experimental: {
                 useModelRouter: true,
             },
-        }, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        }, [], 'test-session', argv);
         expect(config.getModel()).toBe(DEFAULT_GEMINI_MODEL_AUTO);
     });
     it('should use default model when useModelRouter is false and no model is provided', async () => {
@@ -1116,7 +1087,7 @@ describe('loadCliConfig model selection with model router', () => {
             experimental: {
                 useModelRouter: false,
             },
-        }, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        }, [], 'test-session', argv);
         expect(config.getModel()).toBe(DEFAULT_GEMINI_MODEL);
     });
     it('should prioritize argv over useModelRouter', async () => {
@@ -1126,7 +1097,7 @@ describe('loadCliConfig model selection with model router', () => {
             experimental: {
                 useModelRouter: true,
             },
-        }, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        }, [], 'test-session', argv);
         expect(config.getModel()).toBe('gemini-from-argv');
     });
     it('should prioritize settings over useModelRouter', async () => {
@@ -1139,7 +1110,7 @@ describe('loadCliConfig model selection with model router', () => {
             model: {
                 name: 'gemini-from-settings',
             },
-        }, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        }, [], 'test-session', argv);
         expect(config.getModel()).toBe('gemini-from-settings');
     });
     it('should prioritize environment variable over useModelRouter', async () => {
@@ -1150,7 +1121,7 @@ describe('loadCliConfig model selection with model router', () => {
             experimental: {
                 useModelRouter: true,
             },
-        }, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        }, [], 'test-session', argv);
         expect(config.getModel()).toBe('gemini-from-env');
     });
 });
@@ -1176,7 +1147,7 @@ describe('loadCliConfig folderTrust', () => {
             },
         };
         const argv = await parseArguments({});
-        const config = await loadCliConfig(settings, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig(settings, [], 'test-session', argv);
         expect(config.getFolderTrust()).toBe(false);
     });
     it('should be true when folderTrust is true', async () => {
@@ -1189,14 +1160,14 @@ describe('loadCliConfig folderTrust', () => {
                 },
             },
         };
-        const config = await loadCliConfig(settings, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig(settings, [], 'test-session', argv);
         expect(config.getFolderTrust()).toBe(true);
     });
     it('should be false by default', async () => {
         process.argv = ['node', 'script.js'];
         const argv = await parseArguments({});
         const settings = {};
-        const config = await loadCliConfig(settings, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig(settings, [], 'test-session', argv);
         expect(config.getFolderTrust()).toBe(false);
     });
 });
@@ -1231,7 +1202,7 @@ describe('loadCliConfig with includeDirectories', () => {
                 ],
             },
         };
-        const config = await loadCliConfig(settings, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig(settings, [], 'test-session', argv);
         const expected = [
             mockCwd,
             path.resolve(path.sep, 'cli', 'path1'),
@@ -1266,7 +1237,7 @@ describe('loadCliConfig chatCompression', () => {
                 },
             },
         };
-        const config = await loadCliConfig(settings, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig(settings, [], 'test-session', argv);
         expect(config.getChatCompression()).toEqual({
             contextPercentageThreshold: 0.5,
         });
@@ -1275,7 +1246,7 @@ describe('loadCliConfig chatCompression', () => {
         process.argv = ['node', 'script.js'];
         const argv = await parseArguments({});
         const settings = {};
-        const config = await loadCliConfig(settings, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig(settings, [], 'test-session', argv);
         expect(config.getChatCompression()).toBeUndefined();
     });
 });
@@ -1295,43 +1266,43 @@ describe('loadCliConfig useRipgrep', () => {
         process.argv = ['node', 'script.js'];
         const argv = await parseArguments({});
         const settings = {};
-        const config = await loadCliConfig(settings, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig(settings, [], 'test-session', argv);
         expect(config.getUseRipgrep()).toBe(true);
     });
     it('should be false when useRipgrep is set to false in settings', async () => {
         process.argv = ['node', 'script.js'];
         const argv = await parseArguments({});
         const settings = { tools: { useRipgrep: false } };
-        const config = await loadCliConfig(settings, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig(settings, [], 'test-session', argv);
         expect(config.getUseRipgrep()).toBe(false);
     });
     it('should be true when useRipgrep is explicitly set to true in settings', async () => {
         process.argv = ['node', 'script.js'];
         const argv = await parseArguments({});
         const settings = { tools: { useRipgrep: true } };
-        const config = await loadCliConfig(settings, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig(settings, [], 'test-session', argv);
         expect(config.getUseRipgrep()).toBe(true);
     });
     describe('loadCliConfig useModelRouter', () => {
-        it('should be false by default when useModelRouter is not set in settings', async () => {
+        it('should be true by default when useModelRouter is not set in settings', async () => {
             process.argv = ['node', 'script.js'];
             const argv = await parseArguments({});
             const settings = {};
-            const config = await loadCliConfig(settings, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+            const config = await loadCliConfig(settings, [], 'test-session', argv);
             expect(config.getUseModelRouter()).toBe(true);
         });
         it('should be true when useModelRouter is set to true in settings', async () => {
             process.argv = ['node', 'script.js'];
             const argv = await parseArguments({});
             const settings = { experimental: { useModelRouter: true } };
-            const config = await loadCliConfig(settings, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+            const config = await loadCliConfig(settings, [], 'test-session', argv);
             expect(config.getUseModelRouter()).toBe(true);
         });
         it('should be false when useModelRouter is explicitly set to false in settings', async () => {
             process.argv = ['node', 'script.js'];
             const argv = await parseArguments({});
             const settings = { experimental: { useModelRouter: false } };
-            const config = await loadCliConfig(settings, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+            const config = await loadCliConfig(settings, [], 'test-session', argv);
             expect(config.getUseModelRouter()).toBe(false);
         });
     });
@@ -1354,7 +1325,7 @@ describe('screenReader configuration', () => {
         const settings = {
             ui: { accessibility: { screenReader: true } },
         };
-        const config = await loadCliConfig(settings, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig(settings, [], 'test-session', argv);
         expect(config.getScreenReader()).toBe(true);
     });
     it('should use screenReader value from settings if CLI flag is not present (settings false)', async () => {
@@ -1363,7 +1334,7 @@ describe('screenReader configuration', () => {
         const settings = {
             ui: { accessibility: { screenReader: false } },
         };
-        const config = await loadCliConfig(settings, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig(settings, [], 'test-session', argv);
         expect(config.getScreenReader()).toBe(false);
     });
     it('should prioritize --screen-reader CLI flag (true) over settings (false)', async () => {
@@ -1372,14 +1343,14 @@ describe('screenReader configuration', () => {
         const settings = {
             ui: { accessibility: { screenReader: false } },
         };
-        const config = await loadCliConfig(settings, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig(settings, [], 'test-session', argv);
         expect(config.getScreenReader()).toBe(true);
     });
     it('should be false by default when no flag or setting is present', async () => {
         process.argv = ['node', 'script.js'];
         const argv = await parseArguments({});
         const settings = {};
-        const config = await loadCliConfig(settings, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig(settings, [], 'test-session', argv);
         expect(config.getScreenReader()).toBe(false);
     });
 });
@@ -1406,7 +1377,7 @@ describe('loadCliConfig tool exclusions', () => {
         process.stdin.isTTY = true;
         process.argv = ['node', 'script.js'];
         const argv = await parseArguments({});
-        const config = await loadCliConfig({}, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig({}, [], 'test-session', argv);
         expect(config.getExcludeTools()).not.toContain('run_shell_command');
         expect(config.getExcludeTools()).not.toContain('replace');
         expect(config.getExcludeTools()).not.toContain('write_file');
@@ -1415,7 +1386,7 @@ describe('loadCliConfig tool exclusions', () => {
         process.stdin.isTTY = true;
         process.argv = ['node', 'script.js', '--yolo'];
         const argv = await parseArguments({});
-        const config = await loadCliConfig({}, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig({}, [], 'test-session', argv);
         expect(config.getExcludeTools()).not.toContain('run_shell_command');
         expect(config.getExcludeTools()).not.toContain('replace');
         expect(config.getExcludeTools()).not.toContain('write_file');
@@ -1424,7 +1395,7 @@ describe('loadCliConfig tool exclusions', () => {
         process.stdin.isTTY = false;
         process.argv = ['node', 'script.js', '-p', 'test'];
         const argv = await parseArguments({});
-        const config = await loadCliConfig({}, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig({}, [], 'test-session', argv);
         expect(config.getExcludeTools()).toContain('run_shell_command');
         expect(config.getExcludeTools()).toContain('replace');
         expect(config.getExcludeTools()).toContain('write_file');
@@ -1433,7 +1404,7 @@ describe('loadCliConfig tool exclusions', () => {
         process.stdin.isTTY = false;
         process.argv = ['node', 'script.js', '-p', 'test', '--yolo'];
         const argv = await parseArguments({});
-        const config = await loadCliConfig({}, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig({}, [], 'test-session', argv);
         expect(config.getExcludeTools()).not.toContain('run_shell_command');
         expect(config.getExcludeTools()).not.toContain('replace');
         expect(config.getExcludeTools()).not.toContain('write_file');
@@ -1449,7 +1420,7 @@ describe('loadCliConfig tool exclusions', () => {
             'ShellTool',
         ];
         const argv = await parseArguments({});
-        const config = await loadCliConfig({}, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig({}, [], 'test-session', argv);
         expect(config.getExcludeTools()).not.toContain(SHELL_TOOL_NAME);
     });
     it('should not exclude shell tool in non-interactive mode when --allowed-tools="run_shell_command" is set', async () => {
@@ -1463,7 +1434,7 @@ describe('loadCliConfig tool exclusions', () => {
             'run_shell_command',
         ];
         const argv = await parseArguments({});
-        const config = await loadCliConfig({}, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig({}, [], 'test-session', argv);
         expect(config.getExcludeTools()).not.toContain(SHELL_TOOL_NAME);
     });
     it('should not exclude shell tool in non-interactive mode when --allowed-tools="ShellTool(wc)" is set', async () => {
@@ -1477,7 +1448,7 @@ describe('loadCliConfig tool exclusions', () => {
             'ShellTool(wc)',
         ];
         const argv = await parseArguments({});
-        const config = await loadCliConfig({}, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig({}, [], 'test-session', argv);
         expect(config.getExcludeTools()).not.toContain(SHELL_TOOL_NAME);
     });
 });
@@ -1500,35 +1471,35 @@ describe('loadCliConfig interactive', () => {
         process.stdin.isTTY = true;
         process.argv = ['node', 'script.js'];
         const argv = await parseArguments({});
-        const config = await loadCliConfig({}, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig({}, [], 'test-session', argv);
         expect(config.isInteractive()).toBe(true);
     });
     it('should be interactive if prompt-interactive is set', async () => {
         process.stdin.isTTY = false;
         process.argv = ['node', 'script.js', '--prompt-interactive', 'test'];
         const argv = await parseArguments({});
-        const config = await loadCliConfig({}, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig({}, [], 'test-session', argv);
         expect(config.isInteractive()).toBe(true);
     });
     it('should not be interactive if not isTTY and no prompt', async () => {
         process.stdin.isTTY = false;
         process.argv = ['node', 'script.js'];
         const argv = await parseArguments({});
-        const config = await loadCliConfig({}, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig({}, [], 'test-session', argv);
         expect(config.isInteractive()).toBe(false);
     });
     it('should not be interactive if prompt is set', async () => {
         process.stdin.isTTY = true;
         process.argv = ['node', 'script.js', '--prompt', 'test'];
         const argv = await parseArguments({});
-        const config = await loadCliConfig({}, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig({}, [], 'test-session', argv);
         expect(config.isInteractive()).toBe(false);
     });
     it('should not be interactive if positional prompt words are provided with other flags', async () => {
         process.stdin.isTTY = true;
         process.argv = ['node', 'script.js', '--model', 'gemini-1.5-pro', 'Hello'];
         const argv = await parseArguments({});
-        const config = await loadCliConfig({}, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig({}, [], 'test-session', argv);
         expect(config.isInteractive()).toBe(false);
     });
     it('should not be interactive if positional prompt words are provided with multiple flags', async () => {
@@ -1542,7 +1513,7 @@ describe('loadCliConfig interactive', () => {
             'Hello world',
         ];
         const argv = await parseArguments({});
-        const config = await loadCliConfig({}, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig({}, [], 'test-session', argv);
         expect(config.isInteractive()).toBe(false);
         // Verify the question is preserved for one-shot execution
         expect(argv.prompt).toBe('Hello world');
@@ -1552,7 +1523,7 @@ describe('loadCliConfig interactive', () => {
         process.stdin.isTTY = true;
         process.argv = ['node', 'script.js', '-e', 'none', 'hello'];
         const argv = await parseArguments({});
-        const config = await loadCliConfig({}, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig({}, [], 'test-session', argv);
         expect(config.isInteractive()).toBe(false);
         expect(argv.query).toBe('hello');
         expect(argv.extensions).toEqual(['none']);
@@ -1561,7 +1532,7 @@ describe('loadCliConfig interactive', () => {
         process.stdin.isTTY = true;
         process.argv = ['node', 'script.js', 'hello world how are you'];
         const argv = await parseArguments({});
-        const config = await loadCliConfig({}, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig({}, [], 'test-session', argv);
         expect(config.isInteractive()).toBe(false);
         expect(argv.query).toBe('hello world how are you');
         expect(argv.prompt).toBe('hello world how are you');
@@ -1581,7 +1552,7 @@ describe('loadCliConfig interactive', () => {
             'array',
         ];
         const argv = await parseArguments({});
-        const config = await loadCliConfig({}, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig({}, [], 'test-session', argv);
         expect(config.isInteractive()).toBe(false);
         expect(argv.query).toBe('write a function to sort array');
         expect(argv.model).toBe('gemini-1.5-pro');
@@ -1590,7 +1561,7 @@ describe('loadCliConfig interactive', () => {
         process.stdin.isTTY = true;
         process.argv = ['node', 'script.js', ''];
         const argv = await parseArguments({});
-        const config = await loadCliConfig({}, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig({}, [], 'test-session', argv);
         expect(config.isInteractive()).toBe(true);
         expect(argv.query).toBeUndefined();
     });
@@ -1608,7 +1579,7 @@ describe('loadCliConfig interactive', () => {
             'you',
         ];
         const argv = await parseArguments({});
-        const config = await loadCliConfig({}, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig({}, [], 'test-session', argv);
         expect(config.isInteractive()).toBe(false);
         expect(argv.query).toBe('hello world how are you');
         expect(argv.extensions).toEqual(['none']);
@@ -1617,7 +1588,7 @@ describe('loadCliConfig interactive', () => {
         process.stdin.isTTY = true;
         process.argv = ['node', 'script.js', '--model', 'gemini-1.5-pro'];
         const argv = await parseArguments({});
-        const config = await loadCliConfig({}, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig({}, [], 'test-session', argv);
         expect(config.isInteractive()).toBe(true);
     });
 });
@@ -1641,37 +1612,37 @@ describe('loadCliConfig approval mode', () => {
     it('should default to DEFAULT approval mode when no flags are set', async () => {
         process.argv = ['node', 'script.js'];
         const argv = await parseArguments({});
-        const config = await loadCliConfig({}, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig({}, [], 'test-session', argv);
         expect(config.getApprovalMode()).toBe(ServerConfig.ApprovalMode.DEFAULT);
     });
     it('should set YOLO approval mode when --yolo flag is used', async () => {
         process.argv = ['node', 'script.js', '--yolo'];
         const argv = await parseArguments({});
-        const config = await loadCliConfig({}, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig({}, [], 'test-session', argv);
         expect(config.getApprovalMode()).toBe(ServerConfig.ApprovalMode.YOLO);
     });
     it('should set YOLO approval mode when -y flag is used', async () => {
         process.argv = ['node', 'script.js', '-y'];
         const argv = await parseArguments({});
-        const config = await loadCliConfig({}, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig({}, [], 'test-session', argv);
         expect(config.getApprovalMode()).toBe(ServerConfig.ApprovalMode.YOLO);
     });
     it('should set DEFAULT approval mode when --approval-mode=default', async () => {
         process.argv = ['node', 'script.js', '--approval-mode', 'default'];
         const argv = await parseArguments({});
-        const config = await loadCliConfig({}, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig({}, [], 'test-session', argv);
         expect(config.getApprovalMode()).toBe(ServerConfig.ApprovalMode.DEFAULT);
     });
     it('should set AUTO_EDIT approval mode when --approval-mode=auto_edit', async () => {
         process.argv = ['node', 'script.js', '--approval-mode', 'auto_edit'];
         const argv = await parseArguments({});
-        const config = await loadCliConfig({}, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig({}, [], 'test-session', argv);
         expect(config.getApprovalMode()).toBe(ServerConfig.ApprovalMode.AUTO_EDIT);
     });
     it('should set YOLO approval mode when --approval-mode=yolo', async () => {
         process.argv = ['node', 'script.js', '--approval-mode', 'yolo'];
         const argv = await parseArguments({});
-        const config = await loadCliConfig({}, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig({}, [], 'test-session', argv);
         expect(config.getApprovalMode()).toBe(ServerConfig.ApprovalMode.YOLO);
     });
     it('should prioritize --approval-mode over --yolo when both would be valid (but validation prevents this)', async () => {
@@ -1681,13 +1652,13 @@ describe('loadCliConfig approval mode', () => {
         const argv = await parseArguments({});
         // Manually set yolo to true to simulate what would happen if validation didn't prevent it
         argv.yolo = true;
-        const config = await loadCliConfig({}, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig({}, [], 'test-session', argv);
         expect(config.getApprovalMode()).toBe(ServerConfig.ApprovalMode.DEFAULT);
     });
     it('should fall back to --yolo behavior when --approval-mode is not set', async () => {
         process.argv = ['node', 'script.js', '--yolo'];
         const argv = await parseArguments({});
-        const config = await loadCliConfig({}, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig({}, [], 'test-session', argv);
         expect(config.getApprovalMode()).toBe(ServerConfig.ApprovalMode.YOLO);
     });
     // --- Untrusted Folder Scenarios ---
@@ -1701,25 +1672,25 @@ describe('loadCliConfig approval mode', () => {
         it('should override --approval-mode=yolo to DEFAULT', async () => {
             process.argv = ['node', 'script.js', '--approval-mode', 'yolo'];
             const argv = await parseArguments({});
-            const config = await loadCliConfig({}, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+            const config = await loadCliConfig({}, [], 'test-session', argv);
             expect(config.getApprovalMode()).toBe(ServerConfig.ApprovalMode.DEFAULT);
         });
         it('should override --approval-mode=auto_edit to DEFAULT', async () => {
             process.argv = ['node', 'script.js', '--approval-mode', 'auto_edit'];
             const argv = await parseArguments({});
-            const config = await loadCliConfig({}, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+            const config = await loadCliConfig({}, [], 'test-session', argv);
             expect(config.getApprovalMode()).toBe(ServerConfig.ApprovalMode.DEFAULT);
         });
         it('should override --yolo flag to DEFAULT', async () => {
             process.argv = ['node', 'script.js', '--yolo'];
             const argv = await parseArguments({});
-            const config = await loadCliConfig({}, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+            const config = await loadCliConfig({}, [], 'test-session', argv);
             expect(config.getApprovalMode()).toBe(ServerConfig.ApprovalMode.DEFAULT);
         });
         it('should remain DEFAULT when --approval-mode=default', async () => {
             process.argv = ['node', 'script.js', '--approval-mode', 'default'];
             const argv = await parseArguments({});
-            const config = await loadCliConfig({}, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+            const config = await loadCliConfig({}, [], 'test-session', argv);
             expect(config.getApprovalMode()).toBe(ServerConfig.ApprovalMode.DEFAULT);
         });
     });
@@ -1786,7 +1757,7 @@ describe('loadCliConfig fileFiltering', () => {
             },
         };
         const argv = await parseArguments(settings);
-        const config = await loadCliConfig(settings, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig(settings, [], 'test-session', argv);
         expect(getter(config)).toBe(value);
     });
 });
@@ -1794,25 +1765,25 @@ describe('Output format', () => {
     it('should default to TEXT', async () => {
         process.argv = ['node', 'script.js'];
         const argv = await parseArguments({});
-        const config = await loadCliConfig({}, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig({}, [], 'test-session', argv);
         expect(config.getOutputFormat()).toBe(OutputFormat.TEXT);
     });
     it('should use the format from settings', async () => {
         process.argv = ['node', 'script.js'];
         const argv = await parseArguments({});
-        const config = await loadCliConfig({ output: { format: OutputFormat.JSON } }, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig({ output: { format: OutputFormat.JSON } }, [], 'test-session', argv);
         expect(config.getOutputFormat()).toBe(OutputFormat.JSON);
     });
     it('should prioritize the format from argv', async () => {
         process.argv = ['node', 'script.js', '--output-format', 'json'];
         const argv = await parseArguments({});
-        const config = await loadCliConfig({ output: { format: OutputFormat.JSON } }, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig({ output: { format: OutputFormat.JSON } }, [], 'test-session', argv);
         expect(config.getOutputFormat()).toBe(OutputFormat.JSON);
     });
     it('should accept stream-json as a valid output format', async () => {
         process.argv = ['node', 'script.js', '--output-format', 'stream-json'];
         const argv = await parseArguments({});
-        const config = await loadCliConfig({}, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig({}, [], 'test-session', argv);
         expect(config.getOutputFormat()).toBe(OutputFormat.STREAM_JSON);
     });
     it('should error on invalid --output-format argument', async () => {
@@ -1883,7 +1854,7 @@ describe('Telemetry configuration via environment variables', () => {
         process.argv = ['node', 'script.js'];
         const argv = await parseArguments({});
         const settings = { telemetry: { enabled: false } };
-        const config = await loadCliConfig(settings, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig(settings, [], 'test-session', argv);
         expect(config.getTelemetryEnabled()).toBe(true);
     });
     it('should prioritize GEMINI_TELEMETRY_TARGET over settings', async () => {
@@ -1893,7 +1864,7 @@ describe('Telemetry configuration via environment variables', () => {
         const settings = {
             telemetry: { target: ServerConfig.TelemetryTarget.LOCAL },
         };
-        const config = await loadCliConfig(settings, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig(settings, [], 'test-session', argv);
         expect(config.getTelemetryTarget()).toBe('gcp');
     });
     it('should throw when GEMINI_TELEMETRY_TARGET is invalid', async () => {
@@ -1903,7 +1874,7 @@ describe('Telemetry configuration via environment variables', () => {
         const settings = {
             telemetry: { target: ServerConfig.TelemetryTarget.GCP },
         };
-        await expect(loadCliConfig(settings, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv)).rejects.toThrow(/Invalid telemetry configuration: .*Invalid telemetry target/i);
+        await expect(loadCliConfig(settings, [], 'test-session', argv)).rejects.toThrow(/Invalid telemetry configuration: .*Invalid telemetry target/i);
         vi.unstubAllEnvs();
     });
     it('should prioritize GEMINI_TELEMETRY_OTLP_ENDPOINT over settings and default env var', async () => {
@@ -1914,7 +1885,7 @@ describe('Telemetry configuration via environment variables', () => {
         const settings = {
             telemetry: { otlpEndpoint: 'http://settings.com' },
         };
-        const config = await loadCliConfig(settings, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig(settings, [], 'test-session', argv);
         expect(config.getTelemetryOtlpEndpoint()).toBe('http://gemini.env.com');
     });
     it('should prioritize GEMINI_TELEMETRY_OTLP_PROTOCOL over settings', async () => {
@@ -1922,7 +1893,7 @@ describe('Telemetry configuration via environment variables', () => {
         process.argv = ['node', 'script.js'];
         const argv = await parseArguments({});
         const settings = { telemetry: { otlpProtocol: 'grpc' } };
-        const config = await loadCliConfig(settings, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig(settings, [], 'test-session', argv);
         expect(config.getTelemetryOtlpProtocol()).toBe('http');
     });
     it('should prioritize GEMINI_TELEMETRY_LOG_PROMPTS over settings', async () => {
@@ -1930,7 +1901,7 @@ describe('Telemetry configuration via environment variables', () => {
         process.argv = ['node', 'script.js'];
         const argv = await parseArguments({});
         const settings = { telemetry: { logPrompts: true } };
-        const config = await loadCliConfig(settings, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig(settings, [], 'test-session', argv);
         expect(config.getTelemetryLogPromptsEnabled()).toBe(false);
     });
     it('should prioritize GEMINI_TELEMETRY_OUTFILE over settings', async () => {
@@ -1940,7 +1911,7 @@ describe('Telemetry configuration via environment variables', () => {
         const settings = {
             telemetry: { outfile: '/settings/telemetry.log' },
         };
-        const config = await loadCliConfig(settings, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig(settings, [], 'test-session', argv);
         expect(config.getTelemetryOutfile()).toBe('/gemini/env/telemetry.log');
     });
     it('should prioritize GEMINI_TELEMETRY_USE_COLLECTOR over settings', async () => {
@@ -1948,7 +1919,7 @@ describe('Telemetry configuration via environment variables', () => {
         process.argv = ['node', 'script.js'];
         const argv = await parseArguments({});
         const settings = { telemetry: { useCollector: false } };
-        const config = await loadCliConfig(settings, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig(settings, [], 'test-session', argv);
         expect(config.getTelemetryUseCollector()).toBe(true);
     });
     it('should use settings value when GEMINI_TELEMETRY_ENABLED is not set', async () => {
@@ -1956,7 +1927,7 @@ describe('Telemetry configuration via environment variables', () => {
         process.argv = ['node', 'script.js'];
         const argv = await parseArguments({});
         const settings = { telemetry: { enabled: true } };
-        const config = await loadCliConfig(settings, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig(settings, [], 'test-session', argv);
         expect(config.getTelemetryEnabled()).toBe(true);
     });
     it('should use settings value when GEMINI_TELEMETRY_TARGET is not set', async () => {
@@ -1966,35 +1937,35 @@ describe('Telemetry configuration via environment variables', () => {
         const settings = {
             telemetry: { target: ServerConfig.TelemetryTarget.LOCAL },
         };
-        const config = await loadCliConfig(settings, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig(settings, [], 'test-session', argv);
         expect(config.getTelemetryTarget()).toBe('local');
     });
     it("should treat GEMINI_TELEMETRY_ENABLED='1' as true", async () => {
         vi.stubEnv('GEMINI_TELEMETRY_ENABLED', '1');
         process.argv = ['node', 'script.js'];
         const argv = await parseArguments({});
-        const config = await loadCliConfig({}, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig({}, [], 'test-session', argv);
         expect(config.getTelemetryEnabled()).toBe(true);
     });
     it("should treat GEMINI_TELEMETRY_ENABLED='0' as false", async () => {
         vi.stubEnv('GEMINI_TELEMETRY_ENABLED', '0');
         process.argv = ['node', 'script.js'];
         const argv = await parseArguments({});
-        const config = await loadCliConfig({ telemetry: { enabled: true } }, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig({ telemetry: { enabled: true } }, [], 'test-session', argv);
         expect(config.getTelemetryEnabled()).toBe(false);
     });
     it("should treat GEMINI_TELEMETRY_LOG_PROMPTS='1' as true", async () => {
         vi.stubEnv('GEMINI_TELEMETRY_LOG_PROMPTS', '1');
         process.argv = ['node', 'script.js'];
         const argv = await parseArguments({});
-        const config = await loadCliConfig({}, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig({}, [], 'test-session', argv);
         expect(config.getTelemetryLogPromptsEnabled()).toBe(true);
     });
     it("should treat GEMINI_TELEMETRY_LOG_PROMPTS='false' as false", async () => {
         vi.stubEnv('GEMINI_TELEMETRY_LOG_PROMPTS', 'false');
         process.argv = ['node', 'script.js'];
         const argv = await parseArguments({});
-        const config = await loadCliConfig({ telemetry: { logPrompts: true } }, [], new ExtensionEnablementManager(argv.extensions), 'test-session', argv);
+        const config = await loadCliConfig({ telemetry: { logPrompts: true } }, [], 'test-session', argv);
         expect(config.getTelemetryLogPromptsEnabled()).toBe(false);
     });
 });