Add ExtensionLoader interface, use that on Config object (#12116)

packages/cli/src/ui/hooks/useExtensionUpdates.test.tsx

@@ -10,7 +10,7 @@ import * as os from 'node:os';
 import * as path from 'node:path';
 import { createExtension } from '../../test-utils/createExtension.js';
 import { useExtensionUpdates } from './useExtensionUpdates.js';
-import { GEMINI_DIR, type GeminiCLIExtension } from '@google/gemini-cli-core';
+import { GEMINI_DIR } from '@google/gemini-cli-core';
 import { render } from 'ink-testing-library';
 import { MessageType } from '../types.js';
 import {
@@ -57,7 +57,7 @@ describe('useExtensionUpdates', () => {
       workspaceDir: tempHomeDir,
       requestConsent: vi.fn(),
       requestSetting: vi.fn(),
-      loadedSettings: loadSettings(),
+      settings: loadSettings().merged,
     });
   });
 
@@ -66,11 +66,10 @@ describe('useExtensionUpdates', () => {
   });
 
   it('should check for updates and log a message if an update is available', async () => {
-    const extensions = [
+    vi.spyOn(extensionManager, 'getExtensions').mockReturnValue([
       {
         name: 'test-extension',
         id: 'test-extension-id',
-        type: 'git',
         version: '1.0.0',
         path: '/some/path',
         isActive: true,
@@ -81,7 +80,7 @@ describe('useExtensionUpdates', () => {
         },
         contextFiles: [],
       },
-    ];
+    ]);
     const addItem = vi.fn();
 
     vi.mocked(checkForAllExtensionUpdates).mockImplementation(
@@ -97,11 +96,7 @@ describe('useExtensionUpdates', () => {
     );
 
     function TestComponent() {
-      useExtensionUpdates(
-        extensions as GeminiCLIExtension[],
-        extensionManager,
-        addItem,
-      );
+      useExtensionUpdates(extensionManager, addItem);
       return null;
     }
 
@@ -119,7 +114,7 @@ describe('useExtensionUpdates', () => {
   });
 
   it('should check for updates and automatically update if autoUpdate is true', async () => {
-    const extensionDir = createExtension({
+    createExtension({
       extensionsDir: userExtensionsDir,
       name: 'test-extension',
       version: '1.0.0',
@@ -129,7 +124,6 @@ describe('useExtensionUpdates', () => {
         autoUpdate: true,
       },
     });
-    const extension = extensionManager.loadExtension(extensionDir)!;
 
     const addItem = vi.fn();
 
@@ -151,8 +145,9 @@ describe('useExtensionUpdates', () => {
       name: '',
     });
 
+    extensionManager.loadExtensions();
     function TestComponent() {
-      useExtensionUpdates([extension], extensionManager, addItem);
+      useExtensionUpdates(extensionManager, addItem);
       return null;
     }
 
@@ -173,7 +168,7 @@ describe('useExtensionUpdates', () => {
   });
 
   it('should batch update notifications for multiple extensions', async () => {
-    const extensionDir1 = createExtension({
+    createExtension({
       extensionsDir: userExtensionsDir,
       name: 'test-extension-1',
       version: '1.0.0',
@@ -183,7 +178,7 @@ describe('useExtensionUpdates', () => {
         autoUpdate: true,
       },
     });
-    const extensionDir2 = createExtension({
+    createExtension({
       extensionsDir: userExtensionsDir,
       name: 'test-extension-2',
       version: '2.0.0',
@@ -194,10 +189,7 @@ describe('useExtensionUpdates', () => {
       },
     });
 
-    const extensions = [
-      extensionManager.loadExtension(extensionDir1)!,
-      extensionManager.loadExtension(extensionDir2)!,
-    ];
+    extensionManager.loadExtensions();
 
     const addItem = vi.fn();
 
@@ -233,7 +225,7 @@ describe('useExtensionUpdates', () => {
       });
 
     function TestComponent() {
-      useExtensionUpdates(extensions, extensionManager, addItem);
+      useExtensionUpdates(extensionManager, addItem);
       return null;
     }
 
@@ -262,11 +254,10 @@ describe('useExtensionUpdates', () => {
   });
 
   it('should batch update notifications for multiple extensions with autoUpdate: false', async () => {
-    const extensions = [
+    vi.spyOn(extensionManager, 'getExtensions').mockReturnValue([
       {
         name: 'test-extension-1',
         id: 'test-extension-1-id',
-        type: 'git',
         version: '1.0.0',
         path: '/some/path1',
         isActive: true,
@@ -281,7 +272,6 @@ describe('useExtensionUpdates', () => {
         name: 'test-extension-2',
         id: 'test-extension-2-id',
 
-        type: 'git',
         version: '2.0.0',
         path: '/some/path2',
         isActive: true,
@@ -292,7 +282,7 @@ describe('useExtensionUpdates', () => {
         },
         contextFiles: [],
       },
-    ];
+    ]);
     const addItem = vi.fn();
 
     vi.mocked(checkForAllExtensionUpdates).mockImplementation(
@@ -318,11 +308,7 @@ describe('useExtensionUpdates', () => {
     );
 
     function TestComponent() {
-      useExtensionUpdates(
-        extensions as GeminiCLIExtension[],
-        extensionManager,
-        addItem,
-      );
+      useExtensionUpdates(extensionManager, addItem);
       return null;
     }
 

packages/cli/src/ui/hooks/useExtensionUpdates.ts

@@ -78,7 +78,6 @@ export const useConfirmUpdateRequests = () => {
 };
 
 export const useExtensionUpdates = (
-  extensions: GeminiCLIExtension[],
   extensionManager: ExtensionManager,
   addItem: UseHistoryManagerReturn['addItem'],
 ) => {
@@ -86,6 +85,7 @@ export const useExtensionUpdates = (
     extensionUpdatesReducer,
     initialExtensionUpdatesState,
   );
+  const extensions = extensionManager.getExtensions();
 
   useEffect(() => {
     const extensionsToCheck = extensions.filter((extension) => {