@google/gemini-cli 0.24.0-preview.3 → 0.25.0-preview.0

package/dist/src/config/extension-manager-scope.test.js

@@ -0,0 +1,155 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+import * as fs from 'node:fs';
+import * as path from 'node:path';
+import * as os from 'node:os';
+import { ExtensionManager } from './extension-manager.js';
+import { loadAgentsFromDirectory, loadSkillsFromDir, } from '@google/gemini-cli-core';
+let currentTempHome = '';
+vi.mock('@google/gemini-cli-core', async (importOriginal) => {
+    const actual = await importOriginal();
+    return {
+        ...actual,
+        homedir: () => currentTempHome,
+        debugLogger: {
+            log: vi.fn(),
+            error: vi.fn(),
+            warn: vi.fn(),
+        },
+        loadAgentsFromDirectory: vi.fn().mockImplementation(async () => ({
+            agents: [],
+            errors: [],
+        })),
+        loadSkillsFromDir: vi.fn().mockImplementation(async () => []),
+    };
+});
+describe('ExtensionManager Settings Scope', () => {
+    const extensionName = 'test-extension';
+    let tempWorkspace;
+    let extensionsDir;
+    let extensionDir;
+    beforeEach(async () => {
+        vi.mocked(loadAgentsFromDirectory).mockResolvedValue({
+            agents: [],
+            errors: [],
+        });
+        vi.mocked(loadSkillsFromDir).mockResolvedValue([]);
+        currentTempHome = fs.mkdtempSync(path.join(os.tmpdir(), 'gemini-cli-test-home-'));
+        tempWorkspace = fs.mkdtempSync(path.join(os.tmpdir(), 'gemini-cli-test-workspace-'));
+        extensionsDir = path.join(currentTempHome, '.gemini', 'extensions');
+        extensionDir = path.join(extensionsDir, extensionName);
+        fs.mkdirSync(extensionDir, { recursive: true });
+        // Create gemini-extension.json
+        const extensionConfig = {
+            name: extensionName,
+            version: '1.0.0',
+            settings: [
+                {
+                    name: 'Test Setting',
+                    envVar: 'TEST_SETTING',
+                    description: 'A test setting',
+                },
+            ],
+        };
+        fs.writeFileSync(path.join(extensionDir, 'gemini-extension.json'), JSON.stringify(extensionConfig));
+        // Create install metadata
+        const installMetadata = {
+            source: extensionDir,
+            type: 'local',
+        };
+        fs.writeFileSync(path.join(extensionDir, 'install-metadata.json'), JSON.stringify(installMetadata));
+    });
+    afterEach(() => {
+        // Clean up files if needed, or rely on temp dir cleanup
+        vi.clearAllMocks();
+    });
+    it('should prioritize workspace settings over user settings and report correct scope', async () => {
+        // 1. Set User Setting
+        const userSettingsPath = path.join(extensionDir, '.env');
+        fs.writeFileSync(userSettingsPath, 'TEST_SETTING=user-value');
+        // 2. Set Workspace Setting
+        const workspaceSettingsPath = path.join(tempWorkspace, '.env');
+        fs.writeFileSync(workspaceSettingsPath, 'TEST_SETTING=workspace-value');
+        const extensionManager = new ExtensionManager({
+            workspaceDir: tempWorkspace,
+            requestConsent: async () => true,
+            requestSetting: async () => '',
+            settings: {
+                telemetry: {
+                    enabled: false,
+                },
+            },
+        });
+        const extensions = await extensionManager.loadExtensions();
+        const extension = extensions.find((e) => e.name === extensionName);
+        expect(extension).toBeDefined();
+        // Verify resolved settings
+        const setting = extension?.resolvedSettings?.find((s) => s.envVar === 'TEST_SETTING');
+        expect(setting).toBeDefined();
+        expect(setting?.value).toBe('workspace-value');
+        expect(setting?.scope).toBe('workspace');
+        expect(setting?.source).toBe(workspaceSettingsPath);
+        // Verify output string contains (Workspace - <path>)
+        const output = extensionManager.toOutputString(extension);
+        expect(output).toContain(`Test Setting: workspace-value (Workspace - ${workspaceSettingsPath})`);
+    });
+    it('should fallback to user settings if workspace setting is missing', async () => {
+        // 1. Set User Setting
+        const userSettingsPath = path.join(extensionDir, '.env');
+        fs.writeFileSync(userSettingsPath, 'TEST_SETTING=user-value');
+        // 2. No Workspace Setting
+        const extensionManager = new ExtensionManager({
+            workspaceDir: tempWorkspace,
+            requestConsent: async () => true,
+            requestSetting: async () => '',
+            settings: {
+                telemetry: {
+                    enabled: false,
+                },
+            },
+        });
+        const extensions = await extensionManager.loadExtensions();
+        const extension = extensions.find((e) => e.name === extensionName);
+        expect(extension).toBeDefined();
+        // Verify resolved settings
+        const setting = extension?.resolvedSettings?.find((s) => s.envVar === 'TEST_SETTING');
+        expect(setting).toBeDefined();
+        expect(setting?.value).toBe('user-value');
+        expect(setting?.scope).toBe('user');
+        expect(setting?.source?.endsWith(path.join(extensionName, '.env'))).toBe(true);
+        // Verify output string contains (User - <path>)
+        const output = extensionManager.toOutputString(extension);
+        expect(output).toContain(`Test Setting: user-value (User - ${userSettingsPath})`);
+    });
+    it('should report unset if neither is present', async () => {
+        // No settings files
+        const extensionManager = new ExtensionManager({
+            workspaceDir: tempWorkspace,
+            requestConsent: async () => true,
+            requestSetting: async () => '',
+            settings: {
+                telemetry: {
+                    enabled: false,
+                },
+            },
+        });
+        const extensions = await extensionManager.loadExtensions();
+        const extension = extensions.find((e) => e.name === extensionName);
+        expect(extension).toBeDefined();
+        // Verify resolved settings
+        const setting = extension?.resolvedSettings?.find((s) => s.envVar === 'TEST_SETTING');
+        expect(setting).toBeDefined();
+        expect(setting?.value).toBe('[not set]');
+        expect(setting?.scope).toBeUndefined();
+        // Verify output string does not contain scope
+        const output = extensionManager.toOutputString(extension);
+        expect(output).toContain('Test Setting: [not set]');
+        expect(output).not.toContain('Test Setting: [not set] (User)');
+        expect(output).not.toContain('Test Setting: [not set] (Workspace)');
+    });
+});
+//# sourceMappingURL=extension-manager-scope.test.js.map

package/dist/src/config/extension-manager-scope.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"extension-manager-scope.test.js","sourceRoot":"","sources":["../../../src/config/extension-manager-scope.test.ts"],"names":[],"mappings":"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"}

package/dist/src/config/extension-manager-skills.test.js

@@ -3,96 +3,148 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 import * as fs from 'node:fs';
 import * as path from 'node:path';
 import * as os from 'node:os';
 import { ExtensionManager } from './extension-manager.js';
-import { loadSettings } from './settings.js';
+import { debugLogger, coreEvents } from '@google/gemini-cli-core';
+import {} from './settings.js';
 import { createExtension } from '../test-utils/createExtension.js';
 import { EXTENSIONS_DIRECTORY_NAME } from './extensions/variables.js';
-import { coreEvents } from '@google/gemini-cli-core';
-const mockHomedir = vi.hoisted(() => vi.fn());
-vi.mock('os', async (importOriginal) => {
-    const mockedOs = await importOriginal();
+const mockHomedir = vi.hoisted(() => vi.fn(() => '/tmp/mock-home'));
+vi.mock('node:os', async (importOriginal) => {
+    const actual = await importOriginal();
     return {
-        ...mockedOs,
+        ...actual,
         homedir: mockHomedir,
     };
 });
+// Mock @google/gemini-cli-core
+vi.mock('@google/gemini-cli-core', async (importOriginal) => {
+    const actual = await importOriginal();
+    return {
+        ...actual,
+        homedir: mockHomedir,
+        loadAgentsFromDirectory: vi
+            .fn()
+            .mockImplementation(async () => ({ agents: [], errors: [] })),
+        loadSkillsFromDir: (await importOriginal()).loadSkillsFromDir,
+    };
+});
 describe('ExtensionManager skills validation', () => {
-    let tempHomeDir;
-    let tempWorkspaceDir;
-    let userExtensionsDir;
     let extensionManager;
+    let tempDir;
+    let extensionsDir;
     beforeEach(() => {
-        tempHomeDir = fs.mkdtempSync(path.join(os.tmpdir(), 'gemini-cli-skills-test-home-'));
-        tempWorkspaceDir = fs.mkdtempSync(path.join(tempHomeDir, 'gemini-cli-skills-test-workspace-'));
-        userExtensionsDir = path.join(tempHomeDir, EXTENSIONS_DIRECTORY_NAME);
-        fs.mkdirSync(userExtensionsDir, { recursive: true });
-        mockHomedir.mockReturnValue(tempHomeDir);
+        vi.clearAllMocks();
+        vi.spyOn(coreEvents, 'emitFeedback');
+        vi.spyOn(debugLogger, 'debug').mockImplementation(() => { });
+        tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'gemini-test-'));
+        mockHomedir.mockReturnValue(tempDir);
+        // Create the extensions directory that ExtensionManager expects
+        extensionsDir = path.join(tempDir, '.gemini', EXTENSIONS_DIRECTORY_NAME);
+        fs.mkdirSync(extensionsDir, { recursive: true });
         extensionManager = new ExtensionManager({
-            workspaceDir: tempWorkspaceDir,
+            settings: {
+                telemetry: { enabled: false },
+                trustedFolders: [tempDir],
+            },
             requestConsent: vi.fn().mockResolvedValue(true),
-            requestSetting: vi.fn().mockResolvedValue(''),
-            settings: loadSettings(tempWorkspaceDir).merged,
+            requestSetting: vi.fn(),
+            workspaceDir: tempDir,
         });
-        vi.spyOn(coreEvents, 'emitFeedback');
     });
     afterEach(() => {
-        fs.rmSync(tempHomeDir, { recursive: true, force: true });
-        vi.restoreAllMocks();
+        try {
+            fs.rmSync(tempDir, { recursive: true, force: true });
+        }
+        catch {
+            // ignore
+        }
     });
     it('should emit a warning during install if skills directory is not empty but no skills are loaded', async () => {
-        const sourceExtDir = createExtension({
-            extensionsDir: tempHomeDir,
+        // Create a source extension
+        const sourceDir = path.join(tempDir, 'source-ext');
+        createExtension({
+            extensionsDir: sourceDir, // createExtension appends name
             name: 'skills-ext',
             version: '1.0.0',
+            installMetadata: {
+                type: 'local',
+                source: path.join(sourceDir, 'skills-ext'),
+            },
         });
-        const skillsDir = path.join(sourceExtDir, 'skills');
+        const extensionPath = path.join(sourceDir, 'skills-ext');
+        // Add invalid skills content
+        const skillsDir = path.join(extensionPath, 'skills');
         fs.mkdirSync(skillsDir);
         fs.writeFileSync(path.join(skillsDir, 'not-a-skill.txt'), 'hello');
         await extensionManager.loadExtensions();
-        const extension = await extensionManager.installOrUpdateExtension({
-            source: sourceExtDir,
+        await extensionManager.installOrUpdateExtension({
             type: 'local',
+            source: extensionPath,
         });
-        expect(extension.name).toBe('skills-ext');
-        expect(coreEvents.emitFeedback).toHaveBeenCalledWith('warning', expect.stringContaining('Failed to load skills from'));
+        expect(debugLogger.debug).toHaveBeenCalledWith(expect.stringContaining('Failed to load skills from'));
     });
     it('should emit a warning during load if skills directory is not empty but no skills are loaded', async () => {
-        const extDir = createExtension({
-            extensionsDir: userExtensionsDir,
-            name: 'load-skills-ext',
+        // 1. Create a source extension
+        const sourceDir = path.join(tempDir, 'source-ext-load');
+        createExtension({
+            extensionsDir: sourceDir,
+            name: 'skills-ext-load',
             version: '1.0.0',
         });
-        const skillsDir = path.join(extDir, 'skills');
+        const sourceExtPath = path.join(sourceDir, 'skills-ext-load');
+        // Add invalid skills content
+        const skillsDir = path.join(sourceExtPath, 'skills');
         fs.mkdirSync(skillsDir);
         fs.writeFileSync(path.join(skillsDir, 'not-a-skill.txt'), 'hello');
+        // 2. Install it to ensure correct disk state
         await extensionManager.loadExtensions();
-        expect(coreEvents.emitFeedback).toHaveBeenCalledWith('warning', expect.stringContaining('Failed to load skills from'));
-        expect(coreEvents.emitFeedback).toHaveBeenCalledWith('warning', expect.stringContaining('The directory is not empty but no valid skills were discovered'));
+        await extensionManager.installOrUpdateExtension({
+            type: 'local',
+            source: sourceExtPath,
+        });
+        // Clear the spy
+        vi.mocked(debugLogger.debug).mockClear();
+        // 3. Create a fresh ExtensionManager to force loading from disk
+        const newExtensionManager = new ExtensionManager({
+            settings: {
+                telemetry: { enabled: false },
+                trustedFolders: [tempDir],
+            },
+            requestConsent: vi.fn().mockResolvedValue(true),
+            requestSetting: vi.fn(),
+            workspaceDir: tempDir,
+        });
+        // 4. Load extensions
+        await newExtensionManager.loadExtensions();
+        expect(debugLogger.debug).toHaveBeenCalledWith(expect.stringContaining('Failed to load skills from'));
     });
     it('should succeed if skills are correctly loaded', async () => {
-        const sourceExtDir = createExtension({
-            extensionsDir: tempHomeDir,
+        const sourceDir = path.join(tempDir, 'source-ext-good');
+        createExtension({
+            extensionsDir: sourceDir,
             name: 'good-skills-ext',
             version: '1.0.0',
+            installMetadata: {
+                type: 'local',
+                source: path.join(sourceDir, 'good-skills-ext'),
+            },
         });
-        const skillsDir = path.join(sourceExtDir, 'skills');
+        const extensionPath = path.join(sourceDir, 'good-skills-ext');
+        const skillsDir = path.join(extensionPath, 'skills');
         const skillSubdir = path.join(skillsDir, 'test-skill');
         fs.mkdirSync(skillSubdir, { recursive: true });
         fs.writeFileSync(path.join(skillSubdir, 'SKILL.md'), '---\nname: test-skill\ndescription: test desc\n---\nbody');
         await extensionManager.loadExtensions();
         const extension = await extensionManager.installOrUpdateExtension({
-            source: sourceExtDir,
             type: 'local',
+            source: extensionPath,
         });
-        expect(extension.skills).toHaveLength(1);
-        expect(extension.skills[0].name).toBe('test-skill');
-        // It might be called for other reasons during startup, but shouldn't be called for our skills loading success
-        // Actually, it shouldn't be called with our warning message
-        expect(coreEvents.emitFeedback).not.toHaveBeenCalledWith('warning', expect.stringContaining('Failed to load skills from'));
+        expect(extension.name).toBe('good-skills-ext');
+        expect(debugLogger.debug).not.toHaveBeenCalledWith(expect.stringContaining('Failed to load skills from'));
     });
 });
 //# sourceMappingURL=extension-manager-skills.test.js.map

package/dist/src/config/extension-manager-skills.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"extension-manager-skills.test.js","sourceRoot":"","sources":["../../../src/config/extension-manager-skills.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"extension-manager-skills.test.js","sourceRoot":"","sources":["../../../src/config/extension-manager-skills.test.ts"],"names":[],"mappings":"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"}

package/dist/src/config/extension-manager.js

@@ -5,7 +5,6 @@
  */
 import * as fs from 'node:fs';
 import * as path from 'node:path';
-import * as os from 'node:os';
 import { stat } from 'node:fs/promises';
 import chalk from 'chalk';
 import { ExtensionEnablementManager } from './extensions/extensionEnablement.js';
@@ -14,12 +13,12 @@ import { createHash, randomUUID } from 'node:crypto';
 import { loadInstallMetadata } from './extension.js';
 import { isWorkspaceTrusted, loadTrustedFolders, TrustLevel, } from './trustedFolders.js';
 import { cloneFromGit, downloadFromGitHubRelease, tryParseGithubUrl, } from './extensions/github.js';
-import { Config, debugLogger, ExtensionDisableEvent, ExtensionEnableEvent, ExtensionInstallEvent, ExtensionLoader, ExtensionUninstallEvent, ExtensionUpdateEvent, getErrorMessage, logExtensionDisable, logExtensionEnable, logExtensionInstallEvent, logExtensionUninstall, logExtensionUpdateEvent, loadSkillsFromDir, coreEvents, } from '@google/gemini-cli-core';
+import { Config, debugLogger, ExtensionDisableEvent, ExtensionEnableEvent, ExtensionInstallEvent, ExtensionLoader, ExtensionUninstallEvent, ExtensionUpdateEvent, getErrorMessage, logExtensionDisable, logExtensionEnable, logExtensionInstallEvent, logExtensionUninstall, logExtensionUpdateEvent, loadSkillsFromDir, loadAgentsFromDirectory, homedir, coreEvents, } from '@google/gemini-cli-core';
 import { maybeRequestConsentOrFail } from './extensions/consent.js';
 import { resolveEnvVarsInObject } from '../utils/envVarResolver.js';
 import { ExtensionStorage } from './extensions/storage.js';
 import { EXTENSIONS_CONFIG_FILENAME, INSTALL_METADATA_FILENAME, recursivelyHydrateStrings, } from './extensions/variables.js';
-import { getEnvContents, maybePromptForSettings, getMissingSettings, } from './extensions/extensionSettings.js';
+import { getEnvContents, getEnvFilePath, maybePromptForSettings, getMissingSettings, getScopedEnvContents, ExtensionSettingScope, } from './extensions/extensionSettings.js';
 import { getEnableHooks } from './settingsSchema.js';
 /**
  * Actual implementation of an ExtensionLoader.
@@ -151,7 +150,7 @@ Would you like to attempt to install via "git clone" instead?`))) {
                 const destinationPath = new ExtensionStorage(newExtensionName).getExtensionDir();
                 let previousSettings;
                 if (isUpdate) {
-                    previousSettings = await getEnvContents(previousExtensionConfig, extensionId);
+                    previousSettings = await getEnvContents(previousExtensionConfig, extensionId, this.workspaceDir);
                     await this.uninstallExtension(newExtensionName, isUpdate);
                 }
                 await fs.promises.mkdir(destinationPath, { recursive: true });
@@ -163,11 +162,11 @@ Would you like to attempt to install via "git clone" instead?`))) {
                         await maybePromptForSettings(newExtensionConfig, extensionId, this.requestSetting);
                     }
                 }
-                const missingSettings = await getMissingSettings(newExtensionConfig, extensionId);
+                const missingSettings = await getMissingSettings(newExtensionConfig, extensionId, this.workspaceDir);
                 if (missingSettings.length > 0) {
                     const message = `Extension "${newExtensionConfig.name}" has missing settings: ${missingSettings
                         .map((s) => s.name)
-                        .join(', ')}. Please run "gemini extensions settings ${newExtensionConfig.name} <setting-name>" to configure them.`;
+                        .join(', ')}. Please run "gemini extensions config ${newExtensionConfig.name} [setting-name]" to configure them.`;
                     debugLogger.warn(message);
                     coreEvents.emitFeedback('warning', message);
                 }
@@ -254,6 +253,10 @@ Would you like to attempt to install via "git clone" instead?`))) {
         if (this.loadedExtensions) {
             throw new Error('Extensions already loaded, only load extensions once.');
         }
+        if (this.settings.admin?.extensions?.enabled === false) {
+            this.loadedExtensions = [];
+            return this.loadedExtensions;
+        }
         const extensionsDir = ExtensionStorage.getUserExtensionsDir();
         this.loadedExtensions = [];
         if (!fs.existsSync(extensionsDir)) {
@@ -288,12 +291,36 @@ Would you like to attempt to install via "git clone" instead?`))) {
             if (this.getExtensions().find((extension) => extension.name === config.name)) {
                 throw new Error(`Extension with name ${config.name} already was loaded.`);
             }
-            const customEnv = await getEnvContents(config, getExtensionId(config, installMetadata));
+            const extensionId = getExtensionId(config, installMetadata);
+            const userSettings = await getScopedEnvContents(config, extensionId, ExtensionSettingScope.USER);
+            const workspaceSettings = await getScopedEnvContents(config, extensionId, ExtensionSettingScope.WORKSPACE, this.workspaceDir);
+            const customEnv = { ...userSettings, ...workspaceSettings };
             config = resolveEnvVarsInObject(config, customEnv);
             const resolvedSettings = [];
             if (config.settings) {
                 for (const setting of config.settings) {
                     const value = customEnv[setting.envVar];
+                    let scope;
+                    let source;
+                    // Note: strict check for undefined, as empty string is a valid value
+                    if (workspaceSettings[setting.envVar] !== undefined) {
+                        scope = 'workspace';
+                        if (setting.sensitive) {
+                            source = 'Keychain';
+                        }
+                        else {
+                            source = getEnvFilePath(config.name, ExtensionSettingScope.WORKSPACE, this.workspaceDir);
+                        }
+                    }
+                    else if (userSettings[setting.envVar] !== undefined) {
+                        scope = 'user';
+                        if (setting.sensitive) {
+                            source = 'Keychain';
+                        }
+                        else {
+                            source = getEnvFilePath(config.name, ExtensionSettingScope.USER);
+                        }
+                    }
                     resolvedSettings.push({
                         name: setting.name,
                         envVar: setting.envVar,
@@ -303,14 +330,21 @@ Would you like to attempt to install via "git clone" instead?`))) {
                                 ? '***'
                                 : value,
                         sensitive: setting.sensitive ?? false,
+                        scope,
+                        source,
                     });
                 }
             }
             if (config.mcpServers) {
-                config.mcpServers = Object.fromEntries(Object.entries(config.mcpServers).map(([key, value]) => [
-                    key,
-                    filterMcpConfig(value),
-                ]));
+                if (this.settings.admin?.mcp?.enabled === false) {
+                    config.mcpServers = undefined;
+                }
+                else {
+                    config.mcpServers = Object.fromEntries(Object.entries(config.mcpServers).map(([key, value]) => [
+                        key,
+                        filterMcpConfig(value),
+                    ]));
+                }
             }
             const contextFiles = getContextFileNames(config)
                 .map((contextFileName) => path.join(effectiveExtensionPath, contextFileName))
@@ -323,6 +357,11 @@ Would you like to attempt to install via "git clone" instead?`))) {
                 });
             }
             const skills = await loadSkillsFromDir(path.join(effectiveExtensionPath, 'skills'));
+            const agentLoadResult = await loadAgentsFromDirectory(path.join(effectiveExtensionPath, 'agents'));
+            // Log errors but don't fail the entire extension load
+            for (const error of agentLoadResult.errors) {
+                debugLogger.warn(`[ExtensionManager] Error loading agent from ${config.name}: ${error.message}`);
+            }
             const extension = {
                 name: config.name,
                 version: config.version,
@@ -337,6 +376,7 @@ Would you like to attempt to install via "git clone" instead?`))) {
                 settings: config.settings,
                 resolvedSettings,
                 skills,
+                agents: agentLoadResult.agents,
             };
             this.loadedExtensions = [...this.loadedExtensions, extension];
             await this.maybeStartExtension(extension);
@@ -409,7 +449,7 @@ Would you like to attempt to install via "git clone" instead?`))) {
         }
     }
     toOutputString(extension) {
-        const userEnabled = this.extensionEnablementManager.isEnabled(extension.name, os.homedir());
+        const userEnabled = this.extensionEnablementManager.isEnabled(extension.name, homedir());
         const workspaceEnabled = this.extensionEnablementManager.isEnabled(extension.name, this.workspaceDir);
         const status = workspaceEnabled ? chalk.green('✓') : chalk.red('✗');
         let output = `${status} ${extension.name} (${extension.version})`;
@@ -455,7 +495,15 @@ Would you like to attempt to install via "git clone" instead?`))) {
         if (resolvedSettings && resolvedSettings.length > 0) {
             output += `\n Settings:`;
             resolvedSettings.forEach((setting) => {
-                output += `\n  ${setting.name}: ${setting.value}`;
+                let scope = '';
+                if (setting.scope) {
+                    scope = setting.scope === 'workspace' ? '(Workspace' : '(User';
+                    if (setting.source) {
+                        scope += ` - ${setting.source}`;
+                    }
+                    scope += ')';
+                }
+                output += `\n  ${setting.name}: ${setting.value} ${scope}`;
             });
         }
         return output;
@@ -470,7 +518,7 @@ Would you like to attempt to install via "git clone" instead?`))) {
             throw new Error(`Extension with name ${name} does not exist.`);
         }
         if (scope !== SettingScope.Session) {
-            const scopePath = scope === SettingScope.Workspace ? this.workspaceDir : os.homedir();
+            const scopePath = scope === SettingScope.Workspace ? this.workspaceDir : homedir();
             this.extensionEnablementManager.disable(name, true, scopePath);
         }
         await logExtensionDisable(this.telemetryConfig, new ExtensionDisableEvent(name, hashValue(name), extension.id, scope));
@@ -495,7 +543,7 @@ Would you like to attempt to install via "git clone" instead?`))) {
             throw new Error(`Extension with name ${name} does not exist.`);
         }
         if (scope !== SettingScope.Session) {
-            const scopePath = scope === SettingScope.Workspace ? this.workspaceDir : os.homedir();
+            const scopePath = scope === SettingScope.Workspace ? this.workspaceDir : homedir();
             this.extensionEnablementManager.enable(name, true, scopePath);
         }
         await logExtensionEnable(this.telemetryConfig, new ExtensionEnableEvent(name, hashValue(name), extension.id, scope));