Create ExtensionManager class which manages all high level extension tasks (#11667)

packages/cli/src/config/extensions/consent.ts

@@ -0,0 +1,162 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { debugLogger } from '@google/gemini-cli-core';
+
+import type { ConfirmationRequest } from '../../ui/types.js';
+import { escapeAnsiCtrlCodes } from '../../ui/utils/textUtils.js';
+import type { ExtensionConfig } from '../extension.js';
+
+export const INSTALL_WARNING_MESSAGE =
+  '**The extension you are about to install may have been created by a third-party developer and sourced from a public repository. Google does not vet, endorse, or guarantee the functionality or security of extensions. Please carefully inspect any extension and its source code before installing to understand the permissions it requires and the actions it may perform.**';
+
+/**
+ * Requests consent from the user to perform an action, by reading a Y/n
+ * character from stdin.
+ *
+ * This should not be called from interactive mode as it will break the CLI.
+ *
+ * @param consentDescription The description of the thing they will be consenting to.
+ * @returns boolean, whether they consented or not.
+ */
+export async function requestConsentNonInteractive(
+  consentDescription: string,
+): Promise<boolean> {
+  debugLogger.log(consentDescription);
+  const result = await promptForConsentNonInteractive(
+    'Do you want to continue? [Y/n]: ',
+  );
+  return result;
+}
+
+/**
+ * Requests consent from the user to perform an action, in interactive mode.
+ *
+ * This should not be called from non-interactive mode as it will not work.
+ *
+ * @param consentDescription The description of the thing they will be consenting to.
+ * @param setExtensionUpdateConfirmationRequest A function to actually add a prompt to the UI.
+ * @returns boolean, whether they consented or not.
+ */
+export async function requestConsentInteractive(
+  consentDescription: string,
+  addExtensionUpdateConfirmationRequest: (value: ConfirmationRequest) => void,
+): Promise<boolean> {
+  return await promptForConsentInteractive(
+    consentDescription + '\n\nDo you want to continue?',
+    addExtensionUpdateConfirmationRequest,
+  );
+}
+
+/**
+ * Asks users a prompt and awaits for a y/n response on stdin.
+ *
+ * This should not be called from interactive mode as it will break the CLI.
+ *
+ * @param prompt A yes/no prompt to ask the user
+ * @returns Whether or not the user answers 'y' (yes). Defaults to 'yes' on enter.
+ */
+async function promptForConsentNonInteractive(
+  prompt: string,
+): Promise<boolean> {
+  const readline = await import('node:readline');
+  const rl = readline.createInterface({
+    input: process.stdin,
+    output: process.stdout,
+  });
+
+  return new Promise((resolve) => {
+    rl.question(prompt, (answer) => {
+      rl.close();
+      resolve(['y', ''].includes(answer.trim().toLowerCase()));
+    });
+  });
+}
+
+/**
+ * Asks users an interactive yes/no prompt.
+ *
+ * This should not be called from non-interactive mode as it will break the CLI.
+ *
+ * @param prompt A markdown prompt to ask the user
+ * @param setExtensionUpdateConfirmationRequest Function to update the UI state with the confirmation request.
+ * @returns Whether or not the user answers yes.
+ */
+async function promptForConsentInteractive(
+  prompt: string,
+  addExtensionUpdateConfirmationRequest: (value: ConfirmationRequest) => void,
+): Promise<boolean> {
+  return await new Promise<boolean>((resolve) => {
+    addExtensionUpdateConfirmationRequest({
+      prompt,
+      onConfirm: (resolvedConfirmed) => {
+        resolve(resolvedConfirmed);
+      },
+    });
+  });
+}
+
+/**
+ * Builds a consent string for installing an extension based on it's
+ * extensionConfig.
+ */
+function extensionConsentString(extensionConfig: ExtensionConfig): string {
+  const sanitizedConfig = escapeAnsiCtrlCodes(extensionConfig);
+  const output: string[] = [];
+  const mcpServerEntries = Object.entries(sanitizedConfig.mcpServers || {});
+  output.push(`Installing extension "${sanitizedConfig.name}".`);
+  output.push(INSTALL_WARNING_MESSAGE);
+
+  if (mcpServerEntries.length) {
+    output.push('This extension will run the following MCP servers:');
+    for (const [key, mcpServer] of mcpServerEntries) {
+      const isLocal = !!mcpServer.command;
+      const source =
+        mcpServer.httpUrl ??
+        `${mcpServer.command || ''}${mcpServer.args ? ' ' + mcpServer.args.join(' ') : ''}`;
+      output.push(`  * ${key} (${isLocal ? 'local' : 'remote'}): ${source}`);
+    }
+  }
+  if (sanitizedConfig.contextFileName) {
+    output.push(
+      `This extension will append info to your gemini.md context using ${sanitizedConfig.contextFileName}`,
+    );
+  }
+  if (sanitizedConfig.excludeTools) {
+    output.push(
+      `This extension will exclude the following core tools: ${sanitizedConfig.excludeTools}`,
+    );
+  }
+  return output.join('\n');
+}
+
+/**
+ * Requests consent from the user to install an extension (extensionConfig), if
+ * there is any difference between the consent string for `extensionConfig` and
+ * `previousExtensionConfig`.
+ *
+ * Always requests consent if previousExtensionConfig is null.
+ *
+ * Throws if the user does not consent.
+ */
+export async function maybeRequestConsentOrFail(
+  extensionConfig: ExtensionConfig,
+  requestConsent: (consent: string) => Promise<boolean>,
+  previousExtensionConfig?: ExtensionConfig,
+) {
+  const extensionConsent = extensionConsentString(extensionConfig);
+  if (previousExtensionConfig) {
+    const previousExtensionConsent = extensionConsentString(
+      previousExtensionConfig,
+    );
+    if (previousExtensionConsent === extensionConsent) {
+      return;
+    }
+  }
+  if (!(await requestConsent(extensionConsent))) {
+    throw new Error(`Installation cancelled for "${extensionConfig.name}".`);
+  }
+}

packages/cli/src/config/extensions/extensionEnablement.ts

@@ -7,7 +7,7 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import type { GeminiCLIExtension } from '@google/gemini-cli-core';
-import { ExtensionStorage } from '../extension.js';
+import { ExtensionStorage } from './storage.js';
 
 export interface ExtensionEnablementConfig {
   overrides: string[];

packages/cli/src/config/extensions/extensionSettings.test.ts

@@ -13,7 +13,7 @@ import {
   type ExtensionSetting,
 } from './extensionSettings.js';
 import type { ExtensionConfig } from '../extension.js';
-import { ExtensionStorage } from '../extension.js';
+import { ExtensionStorage } from './storage.js';
 import prompts from 'prompts';
 import * as fsPromises from 'node:fs/promises';
 import * as fs from 'node:fs';

packages/cli/src/config/extensions/extensionSettings.ts

@@ -8,7 +8,7 @@ import * as fs from 'node:fs/promises';
 import * as fsSync from 'node:fs';
 import * as dotenv from 'dotenv';
 
-import { ExtensionStorage } from '../extension.js';
+import { ExtensionStorage } from './storage.js';
 import type { ExtensionConfig } from '../extension.js';
 
 import prompts from 'prompts';

packages/cli/src/config/extensions/github.test.ts

@@ -4,7 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import {
+  afterEach,
+  beforeEach,
+  describe,
+  expect,
+  it,
+  vi,
+  type MockedFunction,
+} from 'vitest';
 import {
   checkForExtensionUpdate,
   cloneFromGit,
@@ -22,7 +30,9 @@ import * as path from 'node:path';
 import * as tar from 'tar';
 import * as archiver from 'archiver';
 import type { GeminiCLIExtension } from '@google/gemini-cli-core';
-import { ExtensionEnablementManager } from './extensionEnablement.js';
+import { ExtensionManager } from '../extension-manager.js';
+import { loadSettings } from '../settings.js';
+import type { ExtensionSetting } from './extensionSettings.js';
 
 const mockPlatform = vi.hoisted(() => vi.fn());
 const mockArch = vi.hoisted(() => vi.fn());
@@ -134,8 +144,34 @@ describe('git extension helpers', () => {
       revparse: vi.fn(),
     };
 
+    let extensionManager: ExtensionManager;
+    let mockRequestConsent: MockedFunction<
+      (consent: string) => Promise<boolean>
+    >;
+    let mockPromptForSettings: MockedFunction<
+      (setting: ExtensionSetting) => Promise<string>
+    >;
+    let tempHomeDir: string;
+    let tempWorkspaceDir: string;
+
     beforeEach(() => {
+      tempHomeDir = fsSync.mkdtempSync(
+        path.join(os.tmpdir(), 'gemini-cli-test-home-'),
+      );
+      tempWorkspaceDir = fsSync.mkdtempSync(
+        path.join(tempHomeDir, 'gemini-cli-test-workspace-'),
+      );
       vi.mocked(simpleGit).mockReturnValue(mockGit as unknown as SimpleGit);
+      mockRequestConsent = vi.fn();
+      mockRequestConsent.mockResolvedValue(true);
+      mockPromptForSettings = vi.fn();
+      mockPromptForSettings.mockResolvedValue('');
+      extensionManager = new ExtensionManager({
+        workspaceDir: tempWorkspaceDir,
+        requestConsent: mockRequestConsent,
+        requestSetting: mockPromptForSettings,
+        loadedSettings: loadSettings(tempWorkspaceDir),
+      });
     });
 
     it('should return NOT_UPDATABLE for non-git extensions', async () => {
@@ -151,10 +187,7 @@ describe('git extension helpers', () => {
         },
         contextFiles: [],
       };
-      const result = await checkForExtensionUpdate(
-        extension,
-        new ExtensionEnablementManager(),
-      );
+      const result = await checkForExtensionUpdate(extension, extensionManager);
       expect(result).toBe(ExtensionUpdateState.NOT_UPDATABLE);
     });
 
@@ -172,10 +205,7 @@ describe('git extension helpers', () => {
         contextFiles: [],
       };
       mockGit.getRemotes.mockResolvedValue([]);
-      const result = await checkForExtensionUpdate(
-        extension,
-        new ExtensionEnablementManager(),
-      );
+      const result = await checkForExtensionUpdate(extension, extensionManager);
       expect(result).toBe(ExtensionUpdateState.ERROR);
     });
 
@@ -198,10 +228,7 @@ describe('git extension helpers', () => {
       mockGit.listRemote.mockResolvedValue('remote-hash\tHEAD');
       mockGit.revparse.mockResolvedValue('local-hash');
 
-      const result = await checkForExtensionUpdate(
-        extension,
-        new ExtensionEnablementManager(),
-      );
+      const result = await checkForExtensionUpdate(extension, extensionManager);
       expect(result).toBe(ExtensionUpdateState.UPDATE_AVAILABLE);
     });
 
@@ -224,10 +251,7 @@ describe('git extension helpers', () => {
       mockGit.listRemote.mockResolvedValue('same-hash\tHEAD');
       mockGit.revparse.mockResolvedValue('same-hash');
 
-      const result = await checkForExtensionUpdate(
-        extension,
-        new ExtensionEnablementManager(),
-      );
+      const result = await checkForExtensionUpdate(extension, extensionManager);
       expect(result).toBe(ExtensionUpdateState.UP_TO_DATE);
     });
 
@@ -246,10 +270,7 @@ describe('git extension helpers', () => {
       };
       mockGit.getRemotes.mockRejectedValue(new Error('git error'));
 
-      const result = await checkForExtensionUpdate(
-        extension,
-        new ExtensionEnablementManager(),
-      );
+      const result = await checkForExtensionUpdate(extension, extensionManager);
       expect(result).toBe(ExtensionUpdateState.ERROR);
     });
   });

packages/cli/src/config/extensions/github.ts

@@ -16,11 +16,11 @@ import * as os from 'node:os';
 import * as https from 'node:https';
 import * as fs from 'node:fs';
 import * as path from 'node:path';
-import { EXTENSIONS_CONFIG_FILENAME, loadExtension } from '../extension.js';
 import * as tar from 'tar';
 import extract from 'extract-zip';
 import { fetchJson, getGitHubToken } from './github_fetch.js';
-import { type ExtensionEnablementManager } from './extensionEnablement.js';
+import type { ExtensionManager } from '../extension-manager.js';
+import { EXTENSIONS_CONFIG_FILENAME } from './variables.js';
 
 /**
  * Clones a Git repository to a specified local path.
@@ -153,16 +153,11 @@ export async function fetchReleaseFromGithub(
 
 export async function checkForExtensionUpdate(
   extension: GeminiCLIExtension,
-  extensionEnablementManager: ExtensionEnablementManager,
-  cwd: string = process.cwd(),
+  extensionManager: ExtensionManager,
 ): Promise<ExtensionUpdateState> {
   const installMetadata = extension.installMetadata;
   if (installMetadata?.type === 'local') {
-    const newExtension = loadExtension({
-      extensionDir: installMetadata.source,
-      workspaceDir: cwd,
-      extensionEnablementManager,
-    });
+    const newExtension = extensionManager.loadExtension(installMetadata.source);
     if (!newExtension) {
       debugLogger.error(
         `Failed to check for update for local extension "${extension.name}". Could not load extension from source path: ${installMetadata.source}`,

packages/cli/src/config/extensions/storage.ts

@@ -0,0 +1,47 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as path from 'node:path';
+import * as fs from 'node:fs';
+import * as os from 'node:os';
+import {
+  EXTENSION_SETTINGS_FILENAME,
+  EXTENSIONS_CONFIG_FILENAME,
+} from './variables.js';
+import { Storage } from '@google/gemini-cli-core';
+
+export class ExtensionStorage {
+  private readonly extensionName: string;
+
+  constructor(extensionName: string) {
+    this.extensionName = extensionName;
+  }
+
+  getExtensionDir(): string {
+    return path.join(
+      ExtensionStorage.getUserExtensionsDir(),
+      this.extensionName,
+    );
+  }
+
+  getConfigPath(): string {
+    return path.join(this.getExtensionDir(), EXTENSIONS_CONFIG_FILENAME);
+  }
+
+  getEnvFilePath(): string {
+    return path.join(this.getExtensionDir(), EXTENSION_SETTINGS_FILENAME);
+  }
+
+  static getUserExtensionsDir(): string {
+    return new Storage(os.homedir()).getExtensionsDir();
+  }
+
+  static async createTmpDir(): Promise<string> {
+    return await fs.promises.mkdtemp(
+      path.join(os.tmpdir(), 'gemini-extension'),
+    );
+  }
+}

packages/cli/src/config/extensions/update.test.ts

@@ -4,21 +4,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { vi } from 'vitest';
+import { vi, type MockedFunction } from 'vitest';
 import * as fs from 'node:fs';
 import * as os from 'node:os';
 import * as path from 'node:path';
-import {
-  EXTENSIONS_CONFIG_FILENAME,
-  INSTALL_METADATA_FILENAME,
-  loadExtension,
-} from '../extension.js';
 import { checkForAllExtensionUpdates, updateExtension } from './update.js';
 import { GEMINI_DIR } from '@google/gemini-cli-core';
 import { isWorkspaceTrusted } from '../trustedFolders.js';
 import { ExtensionUpdateState } from '../../ui/state/extensions.js';
 import { createExtension } from '../../test-utils/createExtension.js';
-import { ExtensionEnablementManager } from './extensionEnablement.js';
+import {
+  EXTENSIONS_CONFIG_FILENAME,
+  INSTALL_METADATA_FILENAME,
+} from './variables.js';
+import { ExtensionManager } from '../extension-manager.js';
+import { loadSettings } from '../settings.js';
+import type { ExtensionSetting } from './extensionSettings.js';
 
 const mockGit = {
   clone: vi.fn(),
@@ -74,6 +75,11 @@ describe('update tests', () => {
   let tempHomeDir: string;
   let tempWorkspaceDir: string;
   let userExtensionsDir: string;
+  let extensionManager: ExtensionManager;
+  let mockRequestConsent: MockedFunction<(consent: string) => Promise<boolean>>;
+  let mockPromptForSettings: MockedFunction<
+    (setting: ExtensionSetting) => Promise<string>
+  >;
 
   beforeEach(() => {
     tempHomeDir = fs.mkdtempSync(
@@ -93,6 +99,16 @@ describe('update tests', () => {
     });
     vi.spyOn(process, 'cwd').mockReturnValue(tempWorkspaceDir);
     Object.values(mockGit).forEach((fn) => fn.mockReset());
+    mockRequestConsent = vi.fn();
+    mockRequestConsent.mockResolvedValue(true);
+    mockPromptForSettings = vi.fn();
+    mockPromptForSettings.mockResolvedValue('');
+    extensionManager = new ExtensionManager({
+      workspaceDir: tempWorkspaceDir,
+      requestConsent: mockRequestConsent,
+      requestSetting: mockPromptForSettings,
+      loadedSettings: loadSettings(tempWorkspaceDir),
+    });
   });
 
   afterEach(() => {
@@ -127,17 +143,10 @@ describe('update tests', () => {
         );
       });
       mockGit.getRemotes.mockResolvedValue([{ name: 'origin' }]);
-      const extensionEnablementManager = new ExtensionEnablementManager();
-      const extension = loadExtension({
-        extensionDir: targetExtDir,
-        workspaceDir: tempWorkspaceDir,
-        extensionEnablementManager,
-      })!;
+      const extension = extensionManager.loadExtension(targetExtDir)!;
       const updateInfo = await updateExtension(
         extension,
-        extensionEnablementManager,
-        tempHomeDir,
-        async (_) => true,
+        extensionManager,
         ExtensionUpdateState.UPDATE_AVAILABLE,
         () => {},
       );
@@ -181,17 +190,10 @@ describe('update tests', () => {
       mockGit.getRemotes.mockResolvedValue([{ name: 'origin' }]);
 
       const dispatch = vi.fn();
-      const extensionEnablementManager = new ExtensionEnablementManager();
-      const extension = loadExtension({
-        extensionDir,
-        workspaceDir: tempWorkspaceDir,
-        extensionEnablementManager,
-      })!;
+      const extension = extensionManager.loadExtension(extensionDir)!;
       await updateExtension(
         extension,
-        extensionEnablementManager,
-        tempHomeDir,
-        async (_) => true,
+        extensionManager,
         ExtensionUpdateState.UPDATE_AVAILABLE,
         dispatch,
       );
@@ -228,18 +230,11 @@ describe('update tests', () => {
       mockGit.getRemotes.mockResolvedValue([{ name: 'origin' }]);
 
       const dispatch = vi.fn();
-      const extensionEnablementManager = new ExtensionEnablementManager();
-      const extension = loadExtension({
-        extensionDir,
-        workspaceDir: tempWorkspaceDir,
-        extensionEnablementManager,
-      })!;
+      const extension = extensionManager.loadExtension(extensionDir)!;
       await expect(
         updateExtension(
           extension,
-          extensionEnablementManager,
-          tempHomeDir,
-          async (_) => true,
+          extensionManager,
           ExtensionUpdateState.UPDATE_AVAILABLE,
           dispatch,
         ),
@@ -273,12 +268,7 @@ describe('update tests', () => {
           type: 'git',
         },
       });
-      const extensionEnablementManager = new ExtensionEnablementManager();
-      const extension = loadExtension({
-        extensionDir,
-        workspaceDir: tempWorkspaceDir,
-        extensionEnablementManager,
-      })!;
+      const extension = extensionManager.loadExtension(extensionDir)!;
 
       mockGit.getRemotes.mockResolvedValue([
         { name: 'origin', refs: { fetch: 'https://some.git/repo' } },
@@ -289,9 +279,8 @@ describe('update tests', () => {
       const dispatch = vi.fn();
       await checkForAllExtensionUpdates(
         [extension],
-        extensionEnablementManager,
+        extensionManager,
         dispatch,
-        tempWorkspaceDir,
       );
       expect(dispatch).toHaveBeenCalledWith({
         type: 'SET_STATE',
@@ -312,12 +301,7 @@ describe('update tests', () => {
           type: 'git',
         },
       });
-      const extensionEnablementManager = new ExtensionEnablementManager();
-      const extension = loadExtension({
-        extensionDir,
-        workspaceDir: tempWorkspaceDir,
-        extensionEnablementManager,
-      })!;
+      const extension = extensionManager.loadExtension(extensionDir)!;
 
       mockGit.getRemotes.mockResolvedValue([
         { name: 'origin', refs: { fetch: 'https://some.git/repo' } },
@@ -328,9 +312,8 @@ describe('update tests', () => {
       const dispatch = vi.fn();
       await checkForAllExtensionUpdates(
         [extension],
-        extensionEnablementManager,
+        extensionManager,
         dispatch,
-        tempWorkspaceDir,
       );
       expect(dispatch).toHaveBeenCalledWith({
         type: 'SET_STATE',
@@ -355,18 +338,12 @@ describe('update tests', () => {
         version: '1.0.0',
         installMetadata: { source: sourceExtensionDir, type: 'local' },
       });
-      const extensionEnablementManager = new ExtensionEnablementManager();
-      const extension = loadExtension({
-        extensionDir: installedExtensionDir,
-        workspaceDir: tempWorkspaceDir,
-        extensionEnablementManager,
-      })!;
+      const extension = extensionManager.loadExtension(installedExtensionDir)!;
       const dispatch = vi.fn();
       await checkForAllExtensionUpdates(
         [extension],
-        extensionEnablementManager,
+        extensionManager,
         dispatch,
-        tempWorkspaceDir,
       );
       expect(dispatch).toHaveBeenCalledWith({
         type: 'SET_STATE',
@@ -391,18 +368,12 @@ describe('update tests', () => {
         version: '1.0.0',
         installMetadata: { source: sourceExtensionDir, type: 'local' },
       });
-      const extensionEnablementManager = new ExtensionEnablementManager();
-      const extension = loadExtension({
-        extensionDir: installedExtensionDir,
-        workspaceDir: tempWorkspaceDir,
-        extensionEnablementManager,
-      })!;
+      const extension = extensionManager.loadExtension(installedExtensionDir)!;
       const dispatch = vi.fn();
       await checkForAllExtensionUpdates(
         [extension],
-        extensionEnablementManager,
+        extensionManager,
         dispatch,
-        tempWorkspaceDir,
       );
       expect(dispatch).toHaveBeenCalledWith({
         type: 'SET_STATE',
@@ -423,21 +394,15 @@ describe('update tests', () => {
           type: 'git',
         },
       });
-      const extensionEnablementManager = new ExtensionEnablementManager();
-      const extension = loadExtension({
-        extensionDir,
-        workspaceDir: tempWorkspaceDir,
-        extensionEnablementManager,
-      })!;
+      const extension = extensionManager.loadExtension(extensionDir)!;
 
       mockGit.getRemotes.mockRejectedValue(new Error('Git error'));
 
       const dispatch = vi.fn();
       await checkForAllExtensionUpdates(
         [extension],
-        extensionEnablementManager,
+        extensionManager,
         dispatch,
-        tempWorkspaceDir,
       );
       expect(dispatch).toHaveBeenCalledWith({
         type: 'SET_STATE',

packages/cli/src/config/extensions/update.ts

@@ -9,20 +9,13 @@ import {
   ExtensionUpdateState,
   type ExtensionUpdateStatus,
 } from '../../ui/state/extensions.js';
-import {
-  copyExtension,
-  installOrUpdateExtension,
-  loadExtension,
-  loadInstallMetadata,
-  ExtensionStorage,
-  loadExtensionConfig,
-} from '../extension.js';
+import { loadInstallMetadata } from '../extension.js';
 import { checkForExtensionUpdate } from './github.js';
 import { debugLogger, type GeminiCLIExtension } from '@google/gemini-cli-core';
 import * as fs from 'node:fs';
 import { getErrorMessage } from '../../utils/errors.js';
-import { type ExtensionEnablementManager } from './extensionEnablement.js';
-import { promptForSetting } from './extensionSettings.js';
+import { copyExtension, type ExtensionManager } from '../extension-manager.js';
+import { ExtensionStorage } from './storage.js';
 
 export interface ExtensionUpdateInfo {
   name: string;
@@ -32,9 +25,7 @@ export interface ExtensionUpdateInfo {
 
 export async function updateExtension(
   extension: GeminiCLIExtension,
-  extensionEnablementManager: ExtensionEnablementManager,
-  cwd: string = process.cwd(),
-  requestConsent: (consent: string) => Promise<boolean>,
+  extensionManager: ExtensionManager,
   currentState: ExtensionUpdateState,
   dispatchExtensionStateUpdate: (action: ExtensionUpdateAction) => void,
 ): Promise<ExtensionUpdateInfo | undefined> {
@@ -67,25 +58,17 @@ export async function updateExtension(
 
   const tempDir = await ExtensionStorage.createTmpDir();
   try {
-    const previousExtensionConfig = loadExtensionConfig({
-      extensionDir: extension.path,
-      workspaceDir: cwd,
-      extensionEnablementManager,
-    });
-
-    await installOrUpdateExtension(
+    const previousExtensionConfig = await extensionManager.loadExtensionConfig(
+      extension.path,
+    );
+    await extensionManager.installOrUpdateExtension(
       installMetadata,
-      requestConsent,
-      cwd,
       previousExtensionConfig,
-      promptForSetting,
     );
     const updatedExtensionStorage = new ExtensionStorage(extension.name);
-    const updatedExtension = loadExtension({
-      extensionDir: updatedExtensionStorage.getExtensionDir(),
-      workspaceDir: cwd,
-      extensionEnablementManager,
-    });
+    const updatedExtension = extensionManager.loadExtension(
+      updatedExtensionStorage.getExtensionDir(),
+    );
     if (!updatedExtension) {
       dispatchExtensionStateUpdate({
         type: 'SET_STATE',
@@ -122,11 +105,9 @@ export async function updateExtension(
 }
 
 export async function updateAllUpdatableExtensions(
-  cwd: string = process.cwd(),
-  requestConsent: (consent: string) => Promise<boolean>,
   extensions: GeminiCLIExtension[],
   extensionsState: Map<string, ExtensionUpdateStatus>,
-  extensionEnablementManager: ExtensionEnablementManager,
+  extensionManager: ExtensionManager,
   dispatch: (action: ExtensionUpdateAction) => void,
 ): Promise<ExtensionUpdateInfo[]> {
   return (
@@ -140,9 +121,7 @@ export async function updateAllUpdatableExtensions(
         .map((extension) =>
           updateExtension(
             extension,
-            extensionEnablementManager,
-            cwd,
-            requestConsent,
+            extensionManager,
             extensionsState.get(extension.name)!.status,
             dispatch,
           ),
@@ -158,9 +137,8 @@ export interface ExtensionUpdateCheckResult {
 
 export async function checkForAllExtensionUpdates(
   extensions: GeminiCLIExtension[],
-  extensionEnablementManager: ExtensionEnablementManager,
+  extensionManager: ExtensionManager,
   dispatch: (action: ExtensionUpdateAction) => void,
-  cwd: string = process.cwd(),
 ): Promise<void> {
   dispatch({ type: 'BATCH_CHECK_START' });
   const promises: Array<Promise<void>> = [];
@@ -183,12 +161,11 @@ export async function checkForAllExtensionUpdates(
       },
     });
     promises.push(
-      checkForExtensionUpdate(extension, extensionEnablementManager, cwd).then(
-        (state) =>
-          dispatch({
-            type: 'SET_STATE',
-            payload: { name: extension.name, state },
-          }),
+      checkForExtensionUpdate(extension, extensionManager).then((state) =>
+        dispatch({
+          type: 'SET_STATE',
+          payload: { name: extension.name, state },
+        }),
       ),
     );
   }

packages/cli/src/config/extensions/variableSchema.ts

@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { ExtensionEnablementManager } from './extensionEnablement.js';
-
 export interface VariableDefinition {
   type: 'string';
   description: string;
@@ -17,12 +15,6 @@ export interface VariableSchema {
   [key: string]: VariableDefinition;
 }
 
-export interface LoadExtensionContext {
-  extensionDir: string;
-  workspaceDir: string;
-  extensionEnablementManager: ExtensionEnablementManager;
-}
-
 const PATH_SEPARATOR_DEFINITION = {
   type: 'string',
   description: 'The path separator.',

packages/cli/src/config/extensions/variables.ts

@@ -4,7 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import * as path from 'node:path';
 import { type VariableSchema, VARIABLE_SCHEMA } from './variableSchema.js';
+import { GEMINI_DIR } from '@google/gemini-cli-core';
+
+export const EXTENSIONS_DIRECTORY_NAME = path.join(GEMINI_DIR, 'extensions');
+export const EXTENSIONS_CONFIG_FILENAME = 'gemini-extension.json';
+export const INSTALL_METADATA_FILENAME = '.gemini-extension-install.json';
+export const EXTENSION_SETTINGS_FILENAME = '.env';
 
 export type JsonObject = { [key: string]: JsonValue };
 export type JsonArray = JsonValue[];