@google/gemini-cli 0.12.0-nightly.20251027.cb0947c5 → 0.12.0-preview.2

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

@@ -3,12 +3,11 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-/** @vitest-environment jsdom */
 import { vi } from 'vitest';
 import * as fs from 'node:fs';
 import * as os from 'node:os';
 import * as path from 'node:path';
-import { ExtensionUninstallEvent, ExtensionDisableEvent, ExtensionEnableEvent, } from '@google/gemini-cli-core';
+import { ExtensionUninstallEvent, ExtensionDisableEvent, ExtensionEnableEvent, KeychainTokenStorage, } from '@google/gemini-cli-core';
 import { loadSettings, SettingScope } from './settings.js';
 import { isWorkspaceTrusted } from './trustedFolders.js';
 import { createExtension } from '../test-utils/createExtension.js';
@@ -43,11 +42,12 @@ vi.mock('simple-git', () => ({
         return mockGit;
     }),
 }));
+const mockHomedir = vi.hoisted(() => vi.fn(() => '/tmp/mock-home'));
 vi.mock('os', async (importOriginal) => {
     const mockedOs = await importOriginal();
     return {
         ...mockedOs,
-        homedir: vi.fn(),
+        homedir: mockHomedir,
     };
 });
 vi.mock('./trustedFolders.js', async (importOriginal) => {
@@ -75,6 +75,13 @@ vi.mock('@google/gemini-cli-core', async (importOriginal) => {
         ExtensionInstallEvent: vi.fn(),
         ExtensionUninstallEvent: vi.fn(),
         ExtensionDisableEvent: vi.fn(),
+        KeychainTokenStorage: vi.fn().mockImplementation(() => ({
+            getSecret: vi.fn(),
+            setSecret: vi.fn(),
+            deleteSecret: vi.fn(),
+            listSecrets: vi.fn(),
+            isAvailable: vi.fn().mockResolvedValue(true),
+        })),
     };
 });
 vi.mock('child_process', async (importOriginal) => {
@@ -91,7 +98,29 @@ describe('extension tests', () => {
     let extensionManager;
     let mockRequestConsent;
     let mockPromptForSettings;
+    let mockKeychainStorage;
+    let keychainData;
     beforeEach(() => {
+        vi.clearAllMocks();
+        keychainData = {};
+        mockKeychainStorage = {
+            getSecret: vi
+                .fn()
+                .mockImplementation(async (key) => keychainData[key] || null),
+            setSecret: vi
+                .fn()
+                .mockImplementation(async (key, value) => {
+                keychainData[key] = value;
+            }),
+            deleteSecret: vi.fn().mockImplementation(async (key) => {
+                delete keychainData[key];
+            }),
+            listSecrets: vi
+                .fn()
+                .mockImplementation(async () => Object.keys(keychainData)),
+            isAvailable: vi.fn().mockResolvedValue(true),
+        };
+        KeychainTokenStorage.mockImplementation(() => mockKeychainStorage);
         tempHomeDir = fs.mkdtempSync(path.join(os.tmpdir(), 'gemini-cli-test-home-'));
         tempWorkspaceDir = fs.mkdtempSync(path.join(tempHomeDir, 'gemini-cli-test-workspace-'));
         userExtensionsDir = path.join(tempHomeDir, EXTENSIONS_DIRECTORY_NAME);
@@ -110,7 +139,7 @@ describe('extension tests', () => {
             workspaceDir: tempWorkspaceDir,
             requestConsent: mockRequestConsent,
             requestSetting: mockPromptForSettings,
-            loadedSettings: loadSettings(tempWorkspaceDir),
+            settings: loadSettings(tempWorkspaceDir).merged,
         });
     });
     afterEach(() => {
@@ -119,7 +148,7 @@ describe('extension tests', () => {
         vi.restoreAllMocks();
     });
     describe('loadExtensions', () => {
-        it('should include extension path in loaded extension', () => {
+        it('should include extension path in loaded extension', async () => {
             const extensionDir = path.join(userExtensionsDir, 'test-extension');
             fs.mkdirSync(extensionDir, { recursive: true });
             createExtension({
@@ -127,12 +156,12 @@ describe('extension tests', () => {
                 name: 'test-extension',
                 version: '1.0.0',
             });
-            const extensions = extensionManager.loadExtensions();
+            const extensions = await extensionManager.loadExtensions();
             expect(extensions).toHaveLength(1);
             expect(extensions[0].path).toBe(extensionDir);
             expect(extensions[0].name).toBe('test-extension');
         });
-        it('should load context file path when GEMINI.md is present', () => {
+        it('should load context file path when GEMINI.md is present', async () => {
             createExtension({
                 extensionsDir: userExtensionsDir,
                 name: 'ext1',
@@ -144,7 +173,7 @@ describe('extension tests', () => {
                 name: 'ext2',
                 version: '2.0.0',
             });
-            const extensions = extensionManager.loadExtensions();
+            const extensions = await extensionManager.loadExtensions();
             expect(extensions).toHaveLength(2);
             const ext1 = extensions.find((e) => e.name === 'ext1');
             const ext2 = extensions.find((e) => e.name === 'ext2');
@@ -153,7 +182,7 @@ describe('extension tests', () => {
             ]);
             expect(ext2?.contextFiles).toEqual([]);
         });
-        it('should load context file path from the extension config', () => {
+        it('should load context file path from the extension config', async () => {
             createExtension({
                 extensionsDir: userExtensionsDir,
                 name: 'ext1',
@@ -161,14 +190,14 @@ describe('extension tests', () => {
                 addContextFile: false,
                 contextFileName: 'my-context-file.md',
             });
-            const extensions = extensionManager.loadExtensions();
+            const extensions = await extensionManager.loadExtensions();
             expect(extensions).toHaveLength(1);
             const ext1 = extensions.find((e) => e.name === 'ext1');
             expect(ext1?.contextFiles).toEqual([
                 path.join(userExtensionsDir, 'ext1', 'my-context-file.md'),
             ]);
         });
-        it('should annotate disabled extensions', () => {
+        it('should annotate disabled extensions', async () => {
             createExtension({
                 extensionsDir: userExtensionsDir,
                 name: 'disabled-extension',
@@ -179,15 +208,16 @@ describe('extension tests', () => {
                 name: 'enabled-extension',
                 version: '2.0.0',
             });
-            extensionManager.disableExtension('disabled-extension', SettingScope.User);
-            const extensions = extensionManager.loadExtensions();
+            await extensionManager.loadExtensions();
+            await extensionManager.disableExtension('disabled-extension', SettingScope.User);
+            const extensions = extensionManager.getExtensions();
             expect(extensions).toHaveLength(2);
             expect(extensions[0].name).toBe('disabled-extension');
             expect(extensions[0].isActive).toBe(false);
             expect(extensions[1].name).toBe('enabled-extension');
             expect(extensions[1].isActive).toBe(true);
         });
-        it('should hydrate variables', () => {
+        it('should hydrate variables', async () => {
             createExtension({
                 extensionsDir: userExtensionsDir,
                 name: 'test-extension',
@@ -200,7 +230,7 @@ describe('extension tests', () => {
                     },
                 },
             });
-            const extensions = extensionManager.loadExtensions();
+            const extensions = await extensionManager.loadExtensions();
             expect(extensions).toHaveLength(1);
             const expectedCwd = path.join(userExtensionsDir, 'test-extension', 'server');
             expect(extensions[0].mcpServers?.['test-server'].cwd).toBe(expectedCwd);
@@ -213,12 +243,13 @@ describe('extension tests', () => {
                 contextFileName: 'context.md',
             });
             fs.writeFileSync(path.join(sourceExtDir, 'context.md'), 'linked context');
-            const extensionName = await extensionManager.installOrUpdateExtension({
+            await extensionManager.loadExtensions();
+            const extension = await extensionManager.installOrUpdateExtension({
                 source: sourceExtDir,
                 type: 'link',
             });
-            expect(extensionName).toEqual('my-linked-extension');
-            const extensions = extensionManager.loadExtensions();
+            expect(extension.name).toEqual('my-linked-extension');
+            const extensions = extensionManager.getExtensions();
             expect(extensions).toHaveLength(1);
             const linkedExt = extensions[0];
             expect(linkedExt.name).toBe('my-linked-extension');
@@ -244,18 +275,19 @@ describe('extension tests', () => {
                     },
                 },
             });
+            await extensionManager.loadExtensions();
             await extensionManager.installOrUpdateExtension({
                 source: sourceExtDir,
                 type: 'link',
             });
-            const extensions = extensionManager.loadExtensions();
+            const extensions = extensionManager.getExtensions();
             expect(extensions).toHaveLength(1);
             expect(extensions[0].mcpServers?.['test-server'].cwd).toBe(path.join(sourceExtDir, 'server'));
             expect(extensions[0].mcpServers?.['test-server'].args).toEqual([
                 path.join(sourceExtDir, 'server', 'index.js'),
             ]);
         });
-        it('should resolve environment variables in extension configuration', () => {
+        it('should resolve environment variables in extension configuration', async () => {
             process.env['TEST_API_KEY'] = 'test-api-key-123';
             process.env['TEST_DB_URL'] = 'postgresql://localhost:5432/testdb';
             try {
@@ -281,7 +313,7 @@ describe('extension tests', () => {
                     },
                 };
                 fs.writeFileSync(configPath, JSON.stringify(extensionConfig));
-                const extensions = extensionManager.loadExtensions();
+                const extensions = await extensionManager.loadExtensions();
                 expect(extensions).toHaveLength(1);
                 const extension = extensions[0];
                 expect(extension.name).toBe('test-extension');
@@ -298,7 +330,7 @@ describe('extension tests', () => {
                 delete process.env['TEST_DB_URL'];
             }
         });
-        it('should resolve environment variables from an extension .env file', () => {
+        it('should resolve environment variables from an extension .env file', async () => {
             const extDir = createExtension({
                 extensionsDir: userExtensionsDir,
                 name: 'test-extension',
@@ -313,10 +345,17 @@ describe('extension tests', () => {
                         },
                     },
                 },
+                settings: [
+                    {
+                        name: 'My API Key',
+                        description: 'API key for testing.',
+                        envVar: 'MY_API_KEY',
+                    },
+                ],
             });
             const envFilePath = path.join(extDir, '.env');
             fs.writeFileSync(envFilePath, 'MY_API_KEY=test-key-from-file\n');
-            const extensions = extensionManager.loadExtensions();
+            const extensions = await extensionManager.loadExtensions();
             expect(extensions).toHaveLength(1);
             const extension = extensions[0];
             const serverConfig = extension.mcpServers['test-server'];
@@ -324,7 +363,7 @@ describe('extension tests', () => {
             expect(serverConfig.env['API_KEY']).toBe('test-key-from-file');
             expect(serverConfig.env['STATIC_VALUE']).toBe('no-substitution');
         });
-        it('should handle missing environment variables gracefully', () => {
+        it('should handle missing environment variables gracefully', async () => {
             const userExtensionsDir = path.join(tempHomeDir, EXTENSIONS_DIRECTORY_NAME);
             fs.mkdirSync(userExtensionsDir, { recursive: true });
             const extDir = path.join(userExtensionsDir, 'test-extension');
@@ -344,7 +383,7 @@ describe('extension tests', () => {
                 },
             };
             fs.writeFileSync(path.join(extDir, EXTENSIONS_CONFIG_FILENAME), JSON.stringify(extensionConfig));
-            const extensions = extensionManager.loadExtensions();
+            const extensions = await extensionManager.loadExtensions();
             expect(extensions).toHaveLength(1);
             const extension = extensions[0];
             const serverConfig = extension.mcpServers['test-server'];
@@ -352,7 +391,7 @@ describe('extension tests', () => {
             expect(serverConfig.env['MISSING_VAR']).toBe('$UNDEFINED_ENV_VAR');
             expect(serverConfig.env['MISSING_VAR_BRACES']).toBe('${ALSO_UNDEFINED}');
         });
-        it('should skip extensions with invalid JSON and log a warning', () => {
+        it('should skip extensions with invalid JSON and log a warning', async () => {
             const consoleSpy = vi
                 .spyOn(console, 'error')
                 .mockImplementation(() => { });
@@ -367,13 +406,13 @@ describe('extension tests', () => {
             fs.mkdirSync(badExtDir);
             const badConfigPath = path.join(badExtDir, EXTENSIONS_CONFIG_FILENAME);
             fs.writeFileSync(badConfigPath, '{ "name": "bad-ext"'); // Malformed
-            const extensions = extensionManager.loadExtensions();
+            const extensions = await extensionManager.loadExtensions();
             expect(extensions).toHaveLength(1);
             expect(extensions[0].name).toBe('good-ext');
             expect(consoleSpy).toHaveBeenCalledExactlyOnceWith(expect.stringContaining(`Warning: Skipping extension in ${badExtDir}: Failed to load extension config from ${badConfigPath}`));
             consoleSpy.mockRestore();
         });
-        it('should skip extensions with missing name and log a warning', () => {
+        it('should skip extensions with missing name and log a warning', async () => {
             const consoleSpy = vi
                 .spyOn(console, 'error')
                 .mockImplementation(() => { });
@@ -388,13 +427,13 @@ describe('extension tests', () => {
             fs.mkdirSync(badExtDir);
             const badConfigPath = path.join(badExtDir, EXTENSIONS_CONFIG_FILENAME);
             fs.writeFileSync(badConfigPath, JSON.stringify({ version: '1.0.0' }));
-            const extensions = extensionManager.loadExtensions();
+            const extensions = await extensionManager.loadExtensions();
             expect(extensions).toHaveLength(1);
             expect(extensions[0].name).toBe('good-ext');
             expect(consoleSpy).toHaveBeenCalledExactlyOnceWith(expect.stringContaining(`Warning: Skipping extension in ${badExtDir}: Failed to load extension config from ${badConfigPath}: Invalid configuration in ${badConfigPath}: missing "name"`));
             consoleSpy.mockRestore();
         });
-        it('should filter trust out of mcp servers', () => {
+        it('should filter trust out of mcp servers', async () => {
             createExtension({
                 extensionsDir: userExtensionsDir,
                 name: 'test-extension',
@@ -407,27 +446,28 @@ describe('extension tests', () => {
                     },
                 },
             });
-            const extensions = extensionManager.loadExtensions();
+            const extensions = await extensionManager.loadExtensions();
             expect(extensions).toHaveLength(1);
             expect(extensions[0].mcpServers?.['test-server'].trust).toBeUndefined();
         });
-        it('should throw an error for invalid extension names', () => {
+        it('should throw an error for invalid extension names', async () => {
             const consoleSpy = vi
                 .spyOn(console, 'error')
                 .mockImplementation(() => { });
-            const badExtDir = createExtension({
+            createExtension({
                 extensionsDir: userExtensionsDir,
                 name: 'bad_name',
                 version: '1.0.0',
             });
-            const extension = extensionManager.loadExtension(badExtDir);
-            expect(extension).toBeNull();
+            const extensions = await extensionManager.loadExtensions();
+            const extension = extensions.find((e) => e.name === 'bad_name');
+            expect(extension).toBeUndefined();
             expect(consoleSpy).toHaveBeenCalledWith(expect.stringContaining('Invalid extension name: "bad_name"'));
             consoleSpy.mockRestore();
         });
         describe('id generation', () => {
-            it('should generate id from source for non-github git urls', () => {
-                const extensionDir = createExtension({
+            it('should generate id from source for non-github git urls', async () => {
+                createExtension({
                     extensionsDir: userExtensionsDir,
                     name: 'my-ext',
                     version: '1.0.0',
@@ -436,11 +476,12 @@ describe('extension tests', () => {
                         source: 'http://somehost.com/foo/bar',
                     },
                 });
-                const extension = extensionManager.loadExtension(extensionDir);
+                const extensions = await extensionManager.loadExtensions();
+                const extension = extensions.find((e) => e.name === 'my-ext');
                 expect(extension?.id).toBe(hashValue('http://somehost.com/foo/bar'));
             });
-            it('should generate id from owner/repo for github http urls', () => {
-                const extensionDir = createExtension({
+            it('should generate id from owner/repo for github http urls', async () => {
+                createExtension({
                     extensionsDir: userExtensionsDir,
                     name: 'my-ext',
                     version: '1.0.0',
@@ -449,11 +490,12 @@ describe('extension tests', () => {
                         source: 'http://github.com/foo/bar',
                     },
                 });
-                const extension = extensionManager.loadExtension(extensionDir);
+                const extensions = await extensionManager.loadExtensions();
+                const extension = extensions.find((e) => e.name === 'my-ext');
                 expect(extension?.id).toBe(hashValue('https://github.com/foo/bar'));
             });
-            it('should generate id from owner/repo for github ssh urls', () => {
-                const extensionDir = createExtension({
+            it('should generate id from owner/repo for github ssh urls', async () => {
+                createExtension({
                     extensionsDir: userExtensionsDir,
                     name: 'my-ext',
                     version: '1.0.0',
@@ -462,11 +504,12 @@ describe('extension tests', () => {
                         source: 'git@github.com:foo/bar',
                     },
                 });
-                const extension = extensionManager.loadExtension(extensionDir);
+                const extensions = await extensionManager.loadExtensions();
+                const extension = extensions.find((e) => e.name === 'my-ext');
                 expect(extension?.id).toBe(hashValue('https://github.com/foo/bar'));
             });
-            it('should generate id from source for github-release extension', () => {
-                const extensionDir = createExtension({
+            it('should generate id from source for github-release extension', async () => {
+                createExtension({
                     extensionsDir: userExtensionsDir,
                     name: 'my-ext',
                     version: '1.0.0',
@@ -475,11 +518,12 @@ describe('extension tests', () => {
                         source: 'https://github.com/foo/bar',
                     },
                 });
-                const extension = extensionManager.loadExtension(extensionDir);
+                const extensions = await extensionManager.loadExtensions();
+                const extension = extensions.find((e) => e.name === 'my-ext');
                 expect(extension?.id).toBe(hashValue('https://github.com/foo/bar'));
             });
-            it('should generate id from the original source for local extension', () => {
-                const extensionDir = createExtension({
+            it('should generate id from the original source for local extension', async () => {
+                createExtension({
                     extensionsDir: userExtensionsDir,
                     name: 'local-ext-name',
                     version: '1.0.0',
@@ -488,7 +532,8 @@ describe('extension tests', () => {
                         source: '/some/path',
                     },
                 });
-                const extension = extensionManager.loadExtension(extensionDir);
+                const extensions = await extensionManager.loadExtensions();
+                const extension = extensions.find((e) => e.name === 'local-ext-name');
                 expect(extension?.id).toBe(hashValue('/some/path'));
             });
             it('should generate id from the original source for linked extensions', async () => {
@@ -498,20 +543,24 @@ describe('extension tests', () => {
                     name: 'link-ext-name',
                     version: '1.0.0',
                 });
-                const extensionName = await extensionManager.installOrUpdateExtension({
+                await extensionManager.loadExtensions();
+                await extensionManager.installOrUpdateExtension({
                     type: 'link',
                     source: actualExtensionDir,
                 });
-                const extension = extensionManager.loadExtension(new ExtensionStorage(extensionName).getExtensionDir());
+                const extension = extensionManager
+                    .getExtensions()
+                    .find((e) => e.name === 'link-ext-name');
                 expect(extension?.id).toBe(hashValue(actualExtensionDir));
             });
-            it('should generate id from name for extension with no install metadata', () => {
-                const extensionDir = createExtension({
+            it('should generate id from name for extension with no install metadata', async () => {
+                createExtension({
                     extensionsDir: userExtensionsDir,
                     name: 'no-meta-name',
                     version: '1.0.0',
                 });
-                const extension = extensionManager.loadExtension(extensionDir);
+                const extensions = await extensionManager.loadExtensions();
+                const extension = extensions.find((e) => e.name === 'no-meta-name');
                 expect(extension?.id).toBe(hashValue('no-meta-name'));
             });
         });
@@ -525,6 +574,7 @@ describe('extension tests', () => {
             });
             const targetExtDir = path.join(userExtensionsDir, 'my-local-extension');
             const metadataPath = path.join(targetExtDir, INSTALL_METADATA_FILENAME);
+            await extensionManager.loadExtensions();
             await extensionManager.installOrUpdateExtension({
                 source: sourceExtDir,
                 type: 'local',
@@ -544,6 +594,7 @@ describe('extension tests', () => {
                 name: 'my-local-extension',
                 version: '1.0.0',
             });
+            await extensionManager.loadExtensions();
             await extensionManager.installOrUpdateExtension({
                 source: sourceExtDir,
                 type: 'local',
@@ -605,6 +656,7 @@ describe('extension tests', () => {
                 failureReason: 'no release data',
                 type: 'github-release',
             });
+            await extensionManager.loadExtensions();
             await extensionManager.installOrUpdateExtension({
                 source: gitUrl,
                 type: 'git',
@@ -626,6 +678,7 @@ describe('extension tests', () => {
             const targetExtDir = path.join(userExtensionsDir, 'my-linked-extension');
             const metadataPath = path.join(targetExtDir, INSTALL_METADATA_FILENAME);
             const configPath = path.join(targetExtDir, EXTENSIONS_CONFIG_FILENAME);
+            await extensionManager.loadExtensions();
             await extensionManager.installOrUpdateExtension({
                 source: sourceExtDir,
                 type: 'link',
@@ -648,6 +701,7 @@ describe('extension tests', () => {
                     name: 'my-local-extension',
                     version: '1.1.0',
                 });
+                await extensionManager.loadExtensions();
                 if (isUpdate) {
                     await extensionManager.installOrUpdateExtension({
                         source: sourceExtDir,
@@ -709,10 +763,13 @@ describe('extension tests', () => {
                     },
                 },
             });
+            await extensionManager.loadExtensions();
             await expect(extensionManager.installOrUpdateExtension({
                 source: sourceExtDir,
                 type: 'local',
-            })).resolves.toBe('my-local-extension');
+            })).resolves.toMatchObject({
+                name: 'my-local-extension',
+            });
             expect(mockRequestConsent).toHaveBeenCalledWith(`Installing extension "my-local-extension".
 ${INSTALL_WARNING_MESSAGE}
 This extension will run the following MCP servers:
@@ -731,10 +788,11 @@ This extension will run the following MCP servers:
                     },
                 },
             });
+            await extensionManager.loadExtensions();
             await expect(extensionManager.installOrUpdateExtension({
                 source: sourceExtDir,
                 type: 'local',
-            })).resolves.toBe('my-local-extension');
+            })).resolves.toMatchObject({ name: 'my-local-extension' });
         });
         it('should cancel installation if user declines prompt for local extension with mcp servers', async () => {
             const sourceExtDir = createExtension({
@@ -749,6 +807,7 @@ This extension will run the following MCP servers:
                 },
             });
             mockRequestConsent.mockResolvedValue(false);
+            await extensionManager.loadExtensions();
             await expect(extensionManager.installOrUpdateExtension({
                 source: sourceExtDir,
                 type: 'local',
@@ -762,6 +821,7 @@ This extension will run the following MCP servers:
             });
             const targetExtDir = path.join(userExtensionsDir, 'my-local-extension');
             const metadataPath = path.join(targetExtDir, INSTALL_METADATA_FILENAME);
+            await extensionManager.loadExtensions();
             await extensionManager.installOrUpdateExtension({
                 source: sourceExtDir,
                 type: 'local',
@@ -789,6 +849,7 @@ This extension will run the following MCP servers:
                     },
                 },
             });
+            await extensionManager.loadExtensions();
             // Install it with hard coded consent first.
             await extensionManager.installOrUpdateExtension({
                 source: sourceExtDir,
@@ -798,7 +859,7 @@ This extension will run the following MCP servers:
             // Now update it without changing anything.
             await expect(extensionManager.installOrUpdateExtension({ source: sourceExtDir, type: 'local' }, 
             // Provide its own existing config as the previous config.
-            await extensionManager.loadExtensionConfig(sourceExtDir))).resolves.toBe('my-local-extension');
+            await extensionManager.loadExtensionConfig(sourceExtDir))).resolves.toMatchObject({ name: 'my-local-extension' });
             // Still only called once
             expect(mockRequestConsent).toHaveBeenCalledOnce();
         });
@@ -815,6 +876,7 @@ This extension will run the following MCP servers:
                     },
                 ],
             });
+            await extensionManager.loadExtensions();
             await extensionManager.installOrUpdateExtension({
                 source: sourceExtDir,
                 type: 'local',
@@ -838,8 +900,9 @@ This extension will run the following MCP servers:
                 workspaceDir: tempWorkspaceDir,
                 requestConsent: mockRequestConsent,
                 requestSetting: null,
-                loadedSettings: loadSettings(tempWorkspaceDir),
+                settings: loadSettings(tempWorkspaceDir).merged,
             });
+            await extensionManager.loadExtensions();
             await extensionManager.installOrUpdateExtension({
                 source: sourceExtDir,
                 type: 'local',
@@ -860,6 +923,7 @@ This extension will run the following MCP servers:
                 ],
             });
             mockPromptForSettings.mockResolvedValueOnce('old-api-key');
+            await extensionManager.loadExtensions();
             // Install it so it exists in the userExtensionsDir
             await extensionManager.installOrUpdateExtension({
                 source: oldSourceExtDir,
@@ -913,6 +977,7 @@ This extension will run the following MCP servers:
                     },
                 ],
             });
+            await extensionManager.loadExtensions();
             await extensionManager.installOrUpdateExtension({
                 source: oldSourceExtDir,
                 type: 'local',
@@ -977,6 +1042,7 @@ This extension will run the following MCP servers:
                     version: '1.0.0',
                 });
                 vi.spyOn(ExtensionStorage, 'createTmpDir').mockResolvedValue(join(tempDir, extensionName));
+                await extensionManager.loadExtensions();
                 await extensionManager.installOrUpdateExtension({
                     source: gitUrl,
                     type: 'github-release',
@@ -998,6 +1064,7 @@ This extension will run the following MCP servers:
                     errorMessage: 'download failed',
                     type: 'github-release',
                 });
+                await extensionManager.loadExtensions();
                 await extensionManager.installOrUpdateExtension({ source: gitUrl, type: 'github-release' });
                 // It gets called once to ask for a git clone, and once to consent to
                 // the actual extension features.
@@ -1015,6 +1082,7 @@ This extension will run the following MCP servers:
                     type: 'github-release',
                 });
                 mockRequestConsent.mockResolvedValue(false);
+                await extensionManager.loadExtensions();
                 await expect(extensionManager.installOrUpdateExtension({
                     source: gitUrl,
                     type: 'github-release',
@@ -1028,6 +1096,7 @@ This extension will run the following MCP servers:
                     failureReason: 'no release data',
                     type: 'github-release',
                 });
+                await extensionManager.loadExtensions();
                 await extensionManager.installOrUpdateExtension({
                     source: gitUrl,
                     type: 'git',
@@ -1047,6 +1116,7 @@ This extension will run the following MCP servers:
                     errorMessage: 'No release data found',
                     type: 'github-release',
                 });
+                await extensionManager.loadExtensions();
                 await extensionManager.installOrUpdateExtension({ source: gitUrl, type: 'github-release' });
                 expect(mockRequestConsent).toHaveBeenCalledWith(expect.stringContaining('Would you like to attempt to install via "git clone" instead?'));
                 expect(mockGit.clone).toHaveBeenCalled();
@@ -1060,6 +1130,7 @@ This extension will run the following MCP servers:
                 name: 'my-local-extension',
                 version: '1.0.0',
             });
+            await extensionManager.loadExtensions();
             await extensionManager.uninstallExtension('my-local-extension', false);
             expect(fs.existsSync(sourceExtDir)).toBe(false);
         });
@@ -1074,12 +1145,14 @@ This extension will run the following MCP servers:
                 name: 'other-extension',
                 version: '1.0.0',
             });
+            await extensionManager.loadExtensions();
             await extensionManager.uninstallExtension('my-local-extension', false);
             expect(fs.existsSync(sourceExtDir)).toBe(false);
-            expect(extensionManager.loadExtensions()).toHaveLength(1);
+            expect(extensionManager.getExtensions()).toHaveLength(1);
             expect(fs.existsSync(otherExtDir)).toBe(true);
         });
         it('should throw an error if the extension does not exist', async () => {
+            await extensionManager.loadExtensions();
             await expect(extensionManager.uninstallExtension('nonexistent-extension', false)).rejects.toThrow('Extension not found.');
         });
         describe.each([true, false])('with isUpdate: %s', (isUpdate) => {
@@ -1093,6 +1166,7 @@ This extension will run the following MCP servers:
                         type: 'local',
                     },
                 });
+                await extensionManager.loadExtensions();
                 await extensionManager.uninstallExtension('my-local-extension', isUpdate);
                 if (isUpdate) {
                     expect(mockLogExtensionUninstall).not.toHaveBeenCalled();
@@ -1111,6 +1185,7 @@ This extension will run the following MCP servers:
                 });
                 const enablementManager = new ExtensionEnablementManager();
                 enablementManager.enable('test-extension', true, '/some/scope');
+                await extensionManager.loadExtensions();
                 await extensionManager.uninstallExtension('test-extension', isUpdate);
                 const config = enablementManager.readConfig()['test-extension'];
                 if (isUpdate) {
@@ -1133,6 +1208,7 @@ This extension will run the following MCP servers:
                     type: 'git',
                 },
             });
+            await extensionManager.loadExtensions();
             await extensionManager.uninstallExtension(gitUrl, false);
             expect(fs.existsSync(sourceExtDir)).toBe(false);
             expect(mockLogExtensionUninstall).toHaveBeenCalled();
@@ -1145,28 +1221,31 @@ This extension will run the following MCP servers:
                 version: '1.0.0',
                 // No installMetadata provided
             });
+            await extensionManager.loadExtensions();
             await expect(extensionManager.uninstallExtension('https://github.com/google/no-metadata-extension', false)).rejects.toThrow('Extension not found.');
         });
     });
     describe('disableExtension', () => {
-        it('should disable an extension at the user scope', () => {
+        it('should disable an extension at the user scope', async () => {
             createExtension({
                 extensionsDir: userExtensionsDir,
                 name: 'my-extension',
                 version: '1.0.0',
             });
+            await extensionManager.loadExtensions();
             extensionManager.disableExtension('my-extension', SettingScope.User);
             expect(isEnabled({
                 name: 'my-extension',
                 enabledForPath: tempWorkspaceDir,
             })).toBe(false);
         });
-        it('should disable an extension at the workspace scope', () => {
+        it('should disable an extension at the workspace scope', async () => {
             createExtension({
                 extensionsDir: userExtensionsDir,
                 name: 'my-extension',
                 version: '1.0.0',
             });
+            await extensionManager.loadExtensions();
             extensionManager.disableExtension('my-extension', SettingScope.Workspace);
             expect(isEnabled({
                 name: 'my-extension',
@@ -1177,12 +1256,13 @@ This extension will run the following MCP servers:
                 enabledForPath: tempWorkspaceDir,
             })).toBe(false);
         });
-        it('should handle disabling the same extension twice', () => {
+        it('should handle disabling the same extension twice', async () => {
             createExtension({
                 extensionsDir: userExtensionsDir,
                 name: 'my-extension',
                 version: '1.0.0',
             });
+            await extensionManager.loadExtensions();
             extensionManager.disableExtension('my-extension', SettingScope.User);
             extensionManager.disableExtension('my-extension', SettingScope.User);
             expect(isEnabled({
@@ -1190,10 +1270,10 @@ This extension will run the following MCP servers:
                 enabledForPath: tempWorkspaceDir,
             })).toBe(false);
         });
-        it('should throw an error if you request system scope', () => {
-            expect(() => extensionManager.disableExtension('my-extension', SettingScope.System)).toThrow('System and SystemDefaults scopes are not supported.');
+        it('should throw an error if you request system scope', async () => {
+            await expect(async () => await extensionManager.disableExtension('my-extension', SettingScope.System)).rejects.toThrow('System and SystemDefaults scopes are not supported.');
         });
-        it('should log a disable event', () => {
+        it('should log a disable event', async () => {
             createExtension({
                 extensionsDir: userExtensionsDir,
                 name: 'ext1',
@@ -1203,6 +1283,7 @@ This extension will run the following MCP servers:
                     type: 'local',
                 },
             });
+            await extensionManager.loadExtensions();
             extensionManager.disableExtension('ext1', SettingScope.Workspace);
             expect(mockLogExtensionDisable).toHaveBeenCalled();
             expect(ExtensionDisableEvent).toHaveBeenCalledWith(hashValue('ext1'), hashValue(userExtensionsDir), SettingScope.Workspace);
@@ -1213,38 +1294,40 @@ This extension will run the following MCP servers:
             vi.restoreAllMocks();
         });
         const getActiveExtensions = () => {
-            const extensions = extensionManager.loadExtensions();
+            const extensions = extensionManager.getExtensions();
             return extensions.filter((e) => e.isActive);
         };
-        it('should enable an extension at the user scope', () => {
+        it('should enable an extension at the user scope', async () => {
             createExtension({
                 extensionsDir: userExtensionsDir,
                 name: 'ext1',
                 version: '1.0.0',
             });
+            await extensionManager.loadExtensions();
             extensionManager.disableExtension('ext1', SettingScope.User);
             let activeExtensions = getActiveExtensions();
             expect(activeExtensions).toHaveLength(0);
-            extensionManager.enableExtension('ext1', SettingScope.User);
-            activeExtensions = getActiveExtensions();
+            await extensionManager.enableExtension('ext1', SettingScope.User);
+            activeExtensions = await getActiveExtensions();
             expect(activeExtensions).toHaveLength(1);
             expect(activeExtensions[0].name).toBe('ext1');
         });
-        it('should enable an extension at the workspace scope', () => {
+        it('should enable an extension at the workspace scope', async () => {
             createExtension({
                 extensionsDir: userExtensionsDir,
                 name: 'ext1',
                 version: '1.0.0',
             });
+            await extensionManager.loadExtensions();
             extensionManager.disableExtension('ext1', SettingScope.Workspace);
             let activeExtensions = getActiveExtensions();
             expect(activeExtensions).toHaveLength(0);
-            extensionManager.enableExtension('ext1', SettingScope.Workspace);
-            activeExtensions = getActiveExtensions();
+            await extensionManager.enableExtension('ext1', SettingScope.Workspace);
+            activeExtensions = await getActiveExtensions();
             expect(activeExtensions).toHaveLength(1);
             expect(activeExtensions[0].name).toBe('ext1');
         });
-        it('should log an enable event', () => {
+        it('should log an enable event', async () => {
             createExtension({
                 extensionsDir: userExtensionsDir,
                 name: 'ext1',
@@ -1254,6 +1337,7 @@ This extension will run the following MCP servers:
                     type: 'local',
                 },
             });
+            await extensionManager.loadExtensions();
             extensionManager.disableExtension('ext1', SettingScope.Workspace);
             extensionManager.enableExtension('ext1', SettingScope.Workspace);
             expect(mockLogExtensionEnable).toHaveBeenCalled();