remove support for workspace extensions and migrations (#11324)

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

@@ -6,12 +6,20 @@
 
 import * as path from 'node:path';
 import fs from 'node:fs';
-import os from 'node:os';
-import { afterEach, beforeEach, describe, expect, it } from 'vitest';
+import * as os from 'node:os';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import { ExtensionEnablementManager, Override } from './extensionEnablement.js';
 
 import { GEMINI_DIR, type GeminiCLIExtension } from '@google/gemini-cli-core';
 
+vi.mock('os', async (importOriginal) => {
+  const mockedOs = await importOriginal<typeof os>();
+  return {
+    ...mockedOs,
+    homedir: vi.fn(),
+  };
+});
+
 // Helper to create a temporary directory for testing
 function createTestDir() {
   const dirPath = fs.mkdtempSync(path.join(os.tmpdir(), 'gemini-test-'));
@@ -22,14 +30,13 @@ function createTestDir() {
 }
 
 let testDir: { path: string; cleanup: () => void };
-let configDir: string;
 let manager: ExtensionEnablementManager;
 
 describe('ExtensionEnablementManager', () => {
   beforeEach(() => {
     testDir = createTestDir();
-    configDir = path.join(testDir.path, GEMINI_DIR);
-    manager = new ExtensionEnablementManager(configDir);
+    vi.mocked(os.homedir).mockReturnValue(path.join(testDir.path, GEMINI_DIR));
+    manager = new ExtensionEnablementManager();
   });
 
   afterEach(() => {
@@ -230,7 +237,7 @@ describe('ExtensionEnablementManager', () => {
 
   describe('extension overrides (-e <name>)', () => {
     beforeEach(() => {
-      manager = new ExtensionEnablementManager(configDir, ['ext-test']);
+      manager = new ExtensionEnablementManager(['ext-test']);
     });
 
     it('can enable extensions, case-insensitive', () => {
@@ -238,29 +245,29 @@ describe('ExtensionEnablementManager', () => {
       expect(manager.isEnabled('ext-test', '/')).toBe(true);
       expect(manager.isEnabled('Ext-Test', '/')).toBe(true);
       // Double check that it would have been disabled otherwise
-      expect(
-        new ExtensionEnablementManager(configDir).isEnabled('ext-test', '/'),
-      ).toBe(false);
+      expect(new ExtensionEnablementManager().isEnabled('ext-test', '/')).toBe(
+        false,
+      );
     });
 
     it('disable all other extensions', () => {
-      manager = new ExtensionEnablementManager(configDir, ['ext-test']);
+      manager = new ExtensionEnablementManager(['ext-test']);
       manager.enable('ext-test-2', true, '/');
       expect(manager.isEnabled('ext-test-2', '/')).toBe(false);
       // Double check that it would have been enabled otherwise
       expect(
-        new ExtensionEnablementManager(configDir).isEnabled('ext-test-2', '/'),
+        new ExtensionEnablementManager().isEnabled('ext-test-2', '/'),
       ).toBe(true);
     });
 
     it('none disables all extensions', () => {
-      manager = new ExtensionEnablementManager(configDir, ['none']);
+      manager = new ExtensionEnablementManager(['none']);
       manager.enable('ext-test', true, '/');
       expect(manager.isEnabled('ext-test', '/path/to/dir')).toBe(false);
       // Double check that it would have been enabled otherwise
-      expect(
-        new ExtensionEnablementManager(configDir).isEnabled('ext-test', '/'),
-      ).toBe(true);
+      expect(new ExtensionEnablementManager().isEnabled('ext-test', '/')).toBe(
+        true,
+      );
     });
   });
 
@@ -276,16 +283,13 @@ describe('ExtensionEnablementManager', () => {
     });
 
     it('should not log an error if enabledExtensionNamesOverride is empty', () => {
-      const manager = new ExtensionEnablementManager(configDir, []);
+      const manager = new ExtensionEnablementManager([]);
       manager.validateExtensionOverrides([]);
       expect(consoleErrorSpy).not.toHaveBeenCalled();
     });
 
     it('should not log an error if all enabledExtensionNamesOverride are valid', () => {
-      const manager = new ExtensionEnablementManager(configDir, [
-        'ext-one',
-        'ext-two',
-      ]);
+      const manager = new ExtensionEnablementManager(['ext-one', 'ext-two']);
       const extensions = [
         { name: 'ext-one' },
         { name: 'ext-two' },
@@ -295,7 +299,7 @@ describe('ExtensionEnablementManager', () => {
     });
 
     it('should log an error for each invalid extension name in enabledExtensionNamesOverride', () => {
-      const manager = new ExtensionEnablementManager(configDir, [
+      const manager = new ExtensionEnablementManager([
         'ext-one',
         'ext-invalid',
         'ext-another-invalid',
@@ -315,7 +319,7 @@ describe('ExtensionEnablementManager', () => {
     });
 
     it('should not log an error if "none" is in enabledExtensionNamesOverride', () => {
-      const manager = new ExtensionEnablementManager(configDir, ['none']);
+      const manager = new ExtensionEnablementManager(['none']);
       manager.validateExtensionOverrides([]);
       expect(consoleErrorSpy).not.toHaveBeenCalled();
     });

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

@@ -7,6 +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';
 
 export interface ExtensionEnablementConfig {
   overrides: string[];
@@ -112,9 +113,12 @@ export class ExtensionEnablementManager {
   // only the ones in this list.
   private enabledExtensionNamesOverride: string[];
 
-  constructor(configDir: string, enabledExtensionNames?: string[]) {
-    this.configDir = configDir;
-    this.configFilePath = path.join(configDir, 'extension-enablement.json');
+  constructor(enabledExtensionNames?: string[]) {
+    this.configDir = ExtensionStorage.getUserExtensionsDir();
+    this.configFilePath = path.join(
+      this.configDir,
+      'extension-enablement.json',
+    );
     this.enabledExtensionNamesOverride =
       enabledExtensionNames?.map((name) => name.toLowerCase()) ?? [];
   }

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

@@ -10,7 +10,6 @@ import * as os from 'node:os';
 import * as path from 'node:path';
 import {
   EXTENSIONS_CONFIG_FILENAME,
-  ExtensionStorage,
   INSTALL_METADATA_FILENAME,
   annotateActiveExtensions,
   loadExtension,
@@ -137,7 +136,7 @@ describe('update tests', () => {
           })!,
         ],
         process.cwd(),
-        new ExtensionEnablementManager(ExtensionStorage.getUserExtensionsDir()),
+        new ExtensionEnablementManager(),
       )[0];
       const updateInfo = await updateExtension(
         extension,
@@ -194,7 +193,7 @@ describe('update tests', () => {
           })!,
         ],
         process.cwd(),
-        new ExtensionEnablementManager(ExtensionStorage.getUserExtensionsDir()),
+        new ExtensionEnablementManager(),
       )[0];
       await updateExtension(
         extension,
@@ -244,7 +243,7 @@ describe('update tests', () => {
           })!,
         ],
         process.cwd(),
-        new ExtensionEnablementManager(ExtensionStorage.getUserExtensionsDir()),
+        new ExtensionEnablementManager(),
       )[0];
       await expect(
         updateExtension(
@@ -292,7 +291,7 @@ describe('update tests', () => {
           })!,
         ],
         process.cwd(),
-        new ExtensionEnablementManager(ExtensionStorage.getUserExtensionsDir()),
+        new ExtensionEnablementManager(),
       )[0];
 
       mockGit.getRemotes.mockResolvedValue([
@@ -334,7 +333,7 @@ describe('update tests', () => {
           })!,
         ],
         process.cwd(),
-        new ExtensionEnablementManager(ExtensionStorage.getUserExtensionsDir()),
+        new ExtensionEnablementManager(),
       )[0];
 
       mockGit.getRemotes.mockResolvedValue([
@@ -380,7 +379,7 @@ describe('update tests', () => {
           })!,
         ],
         process.cwd(),
-        new ExtensionEnablementManager(ExtensionStorage.getUserExtensionsDir()),
+        new ExtensionEnablementManager(),
       )[0];
       const dispatch = vi.fn();
       await checkForAllExtensionUpdates(
@@ -419,7 +418,7 @@ describe('update tests', () => {
           })!,
         ],
         process.cwd(),
-        new ExtensionEnablementManager(ExtensionStorage.getUserExtensionsDir()),
+        new ExtensionEnablementManager(),
       )[0];
       const dispatch = vi.fn();
       await checkForAllExtensionUpdates(
@@ -454,7 +453,7 @@ describe('update tests', () => {
           })!,
         ],
         process.cwd(),
-        new ExtensionEnablementManager(ExtensionStorage.getUserExtensionsDir()),
+        new ExtensionEnablementManager(),
       )[0];
 
       mockGit.getRemotes.mockRejectedValue(new Error('Git error'));