@google/gemini-cli 0.21.0-nightly.20251207.025e450ac → 0.21.0-nightly.20251209.ec9a8c7a7

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@google/gemini-cli",
-    "version": "0.21.0-nightly.20251207.025e450ac",
+    "version": "0.21.0-nightly.20251209.ec9a8c7a7",
     "description": "Gemini CLI",
     "repository": {
         "type": "git",
@@ -25,7 +25,7 @@
         "dist"
     ],
     "config": {
-        "sandboxImageUri": "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.21.0-nightly.20251207.025e450ac"
+        "sandboxImageUri": "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.21.0-nightly.20251209.ec9a8c7a7"
     },
     "dependencies": {
         "@google/gemini-cli-core": "file:../core",

package/dist/src/commands/extensions/settings.js

@@ -3,12 +3,12 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { getEnvContents, updateSetting, promptForSetting, } from '../../config/extensions/extensionSettings.js';
+import { updateSetting, promptForSetting, ExtensionSettingScope, getScopedEnvContents, } from '../../config/extensions/extensionSettings.js';
 import { getExtensionAndManager } from './utils.js';
 import { debugLogger } from '@google/gemini-cli-core';
 import { exitCli } from '../utils.js';
 const setCommand = {
-    command: 'set <name> <setting>',
+    command: 'set [--scope] <name> <setting>',
     describe: 'Set a specific setting for an extension.',
     builder: (yargs) => yargs
         .positional('name', {
@@ -20,9 +20,15 @@ const setCommand = {
         describe: 'The setting to configure (name or env var).',
         type: 'string',
         demandOption: true,
+    })
+        .option('scope', {
+        describe: 'The scope to set the setting in.',
+        type: 'string',
+        choices: ['user', 'workspace'],
+        default: 'user',
     }),
     handler: async (args) => {
-        const { name, setting } = args;
+        const { name, setting, scope } = args;
         const { extension, extensionManager } = await getExtensionAndManager(name);
         if (!extension || !extensionManager) {
             return;
@@ -32,7 +38,7 @@ const setCommand = {
             debugLogger.error(`Could not find configuration for extension "${name}".`);
             return;
         }
-        await updateSetting(extensionConfig, extension.id, setting, promptForSetting);
+        await updateSetting(extensionConfig, extension.id, setting, promptForSetting, scope);
         await exitCli();
     },
 };
@@ -57,11 +63,20 @@ const listCommand = {
             debugLogger.log(`Extension "${name}" has no settings to configure.`);
             return;
         }
-        const currentSettings = await getEnvContents(extensionConfig, extension.id);
+        const userSettings = await getScopedEnvContents(extensionConfig, extension.id, ExtensionSettingScope.USER);
+        const workspaceSettings = await getScopedEnvContents(extensionConfig, extension.id, ExtensionSettingScope.WORKSPACE);
+        const mergedSettings = { ...userSettings, ...workspaceSettings };
         debugLogger.log(`Settings for "${name}":`);
         for (const setting of extensionConfig.settings) {
-            const value = currentSettings[setting.envVar];
+            const value = mergedSettings[setting.envVar];
             let displayValue;
+            let scopeInfo = '';
+            if (workspaceSettings[setting.envVar] !== undefined) {
+                scopeInfo = ' (workspace)';
+            }
+            else if (userSettings[setting.envVar] !== undefined) {
+                scopeInfo = ' (user)';
+            }
             if (value === undefined) {
                 displayValue = '[not set]';
             }
@@ -74,7 +89,7 @@ const listCommand = {
             debugLogger.log(`
 - ${setting.name} (${setting.envVar})`);
             debugLogger.log(`  Description: ${setting.description}`);
-            debugLogger.log(`  Value: ${displayValue}`);
+            debugLogger.log(`  Value: ${displayValue}${scopeInfo}`);
         }
         await exitCli();
     },

package/dist/src/commands/extensions/settings.js.map

@@ -1 +1 @@
-{"version":3,"file":"settings.js","sourceRoot":"","sources":["../../../../src/commands/extensions/settings.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"settings.js","sourceRoot":"","sources":["../../../../src/commands/extensions/settings.ts"],"names":[],"mappings":"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"}

package/dist/src/config/extensions/extensionSettings.d.ts

@@ -4,6 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import type { ExtensionConfig } from '../extension.js';
+export declare enum ExtensionSettingScope {
+    USER = "user",
+    WORKSPACE = "workspace"
+}
 export interface ExtensionSetting {
     name: string;
     description: string;
@@ -12,5 +16,6 @@ export interface ExtensionSetting {
 }
 export declare function maybePromptForSettings(extensionConfig: ExtensionConfig, extensionId: string, requestSetting: (setting: ExtensionSetting) => Promise<string>, previousExtensionConfig?: ExtensionConfig, previousSettings?: Record<string, string>): Promise<void>;
 export declare function promptForSetting(setting: ExtensionSetting): Promise<string>;
+export declare function getScopedEnvContents(extensionConfig: ExtensionConfig, extensionId: string, scope: ExtensionSettingScope): Promise<Record<string, string>>;
 export declare function getEnvContents(extensionConfig: ExtensionConfig, extensionId: string): Promise<Record<string, string>>;
-export declare function updateSetting(extensionConfig: ExtensionConfig, extensionId: string, settingKey: string, requestSetting: (setting: ExtensionSetting) => Promise<string>): Promise<void>;
+export declare function updateSetting(extensionConfig: ExtensionConfig, extensionId: string, settingKey: string, requestSetting: (setting: ExtensionSetting) => Promise<string>, scope: ExtensionSettingScope): Promise<void>;

package/dist/src/config/extensions/extensionSettings.js

@@ -6,10 +6,29 @@
 import * as fs from 'node:fs/promises';
 import * as fsSync from 'node:fs';
 import * as dotenv from 'dotenv';
+import * as path from 'node:path';
 import { ExtensionStorage } from './storage.js';
 import prompts from 'prompts';
 import { debugLogger, KeychainTokenStorage } from '@google/gemini-cli-core';
-const getKeychainStorageName = (extensionName, extensionId) => `Gemini CLI Extensions ${extensionName} ${extensionId}`;
+import { EXTENSION_SETTINGS_FILENAME } from './variables.js';
+export var ExtensionSettingScope;
+(function (ExtensionSettingScope) {
+    ExtensionSettingScope["USER"] = "user";
+    ExtensionSettingScope["WORKSPACE"] = "workspace";
+})(ExtensionSettingScope || (ExtensionSettingScope = {}));
+const getKeychainStorageName = (extensionName, extensionId, scope) => {
+    const base = `Gemini CLI Extensions ${extensionName} ${extensionId}`;
+    if (scope === ExtensionSettingScope.WORKSPACE) {
+        return `${base} ${process.cwd()}`;
+    }
+    return base;
+};
+const getEnvFilePath = (extensionName, scope) => {
+    if (scope === ExtensionSettingScope.WORKSPACE) {
+        return path.join(process.cwd(), EXTENSION_SETTINGS_FILENAME);
+    }
+    return new ExtensionStorage(extensionName).getEnvFilePath();
+};
 export async function maybePromptForSettings(extensionConfig, extensionId, requestSetting, previousExtensionConfig, previousSettings) {
     const { name: extensionName, settings } = extensionConfig;
     if ((!settings || settings.length === 0) &&
@@ -17,8 +36,11 @@ export async function maybePromptForSettings(extensionConfig, extensionId, reque
             previousExtensionConfig.settings.length === 0)) {
         return;
     }
-    const envFilePath = new ExtensionStorage(extensionName).getEnvFilePath();
-    const keychain = new KeychainTokenStorage(getKeychainStorageName(extensionName, extensionId));
+    // We assume user scope here because we don't have a way to ask the user for scope during the initial setup.
+    // The user can change the scope later using the `settings set` command.
+    const scope = ExtensionSettingScope.USER;
+    const envFilePath = getEnvFilePath(extensionName, scope);
+    const keychain = new KeychainTokenStorage(getKeychainStorageName(extensionName, extensionId, scope));
     if (!settings || settings.length === 0) {
         await clearSettings(envFilePath, keychain);
         return;
@@ -67,15 +89,13 @@ export async function promptForSetting(setting) {
     });
     return response.value;
 }
-export async function getEnvContents(extensionConfig, extensionId) {
-    if (!extensionConfig.settings || extensionConfig.settings.length === 0) {
-        return Promise.resolve({});
-    }
-    const extensionStorage = new ExtensionStorage(extensionConfig.name);
-    const keychain = new KeychainTokenStorage(getKeychainStorageName(extensionConfig.name, extensionId));
+export async function getScopedEnvContents(extensionConfig, extensionId, scope) {
+    const { name: extensionName } = extensionConfig;
+    const keychain = new KeychainTokenStorage(getKeychainStorageName(extensionName, extensionId, scope));
+    const envFilePath = getEnvFilePath(extensionName, scope);
     let customEnv = {};
-    if (fsSync.existsSync(extensionStorage.getEnvFilePath())) {
-        const envFile = fsSync.readFileSync(extensionStorage.getEnvFilePath(), 'utf-8');
+    if (fsSync.existsSync(envFilePath)) {
+        const envFile = fsSync.readFileSync(envFilePath, 'utf-8');
         customEnv = dotenv.parse(envFile);
     }
     if (extensionConfig.settings) {
@@ -90,7 +110,15 @@ export async function getEnvContents(extensionConfig, extensionId) {
     }
     return customEnv;
 }
-export async function updateSetting(extensionConfig, extensionId, settingKey, requestSetting) {
+export async function getEnvContents(extensionConfig, extensionId) {
+    if (!extensionConfig.settings || extensionConfig.settings.length === 0) {
+        return Promise.resolve({});
+    }
+    const userSettings = await getScopedEnvContents(extensionConfig, extensionId, ExtensionSettingScope.USER);
+    const workspaceSettings = await getScopedEnvContents(extensionConfig, extensionId, ExtensionSettingScope.WORKSPACE);
+    return { ...userSettings, ...workspaceSettings };
+}
+export async function updateSetting(extensionConfig, extensionId, settingKey, requestSetting, scope) {
     const { name: extensionName, settings } = extensionConfig;
     if (!settings || settings.length === 0) {
         debugLogger.log('This extension does not have any settings.');
@@ -102,29 +130,30 @@ export async function updateSetting(extensionConfig, extensionId, settingKey, re
         return;
     }
     const newValue = await requestSetting(settingToUpdate);
-    const keychain = new KeychainTokenStorage(getKeychainStorageName(extensionName, extensionId));
+    const keychain = new KeychainTokenStorage(getKeychainStorageName(extensionName, extensionId, scope));
     if (settingToUpdate.sensitive) {
         await keychain.setSecret(settingToUpdate.envVar, newValue);
         return;
     }
     // For non-sensitive settings, we need to read the existing .env file,
-    // update the value, and write it back.
-    const allSettings = await getEnvContents(extensionConfig, extensionId);
-    allSettings[settingToUpdate.envVar] = newValue;
-    const envFilePath = new ExtensionStorage(extensionName).getEnvFilePath();
+    // update the value, and write it back, preserving any other values.
+    const envFilePath = getEnvFilePath(extensionName, scope);
+    let envContent = '';
+    if (fsSync.existsSync(envFilePath)) {
+        envContent = await fs.readFile(envFilePath, 'utf-8');
+    }
+    const parsedEnv = dotenv.parse(envContent);
+    parsedEnv[settingToUpdate.envVar] = newValue;
+    // We only want to write back the variables that are not sensitive.
     const nonSensitiveSettings = {};
-    for (const setting of settings) {
-        // We only care about non-sensitive settings for the .env file.
-        if (setting.sensitive) {
-            continue;
-        }
-        const value = allSettings[setting.envVar];
-        if (value !== undefined) {
-            nonSensitiveSettings[setting.envVar] = value;
+    const sensitiveEnvVars = new Set(settings.filter((s) => s.sensitive).map((s) => s.envVar));
+    for (const [key, value] of Object.entries(parsedEnv)) {
+        if (!sensitiveEnvVars.has(key)) {
+            nonSensitiveSettings[key] = value;
         }
     }
-    const envContent = formatEnvContent(nonSensitiveSettings);
-    await fs.writeFile(envFilePath, envContent);
+    const newEnvContent = formatEnvContent(nonSensitiveSettings);
+    await fs.writeFile(envFilePath, newEnvContent);
 }
 function getSettingsChanges(settings, oldSettings) {
     const isSameSetting = (a, b) => a.envVar === b.envVar && (a.sensitive ?? false) === (b.sensitive ?? false);

package/dist/src/config/extensions/extensionSettings.js.map

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

package/dist/src/config/extensions/extensionSettings.test.js

@@ -6,12 +6,13 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import * as path from 'node:path';
 import * as os from 'node:os';
-import { getEnvContents, maybePromptForSettings, promptForSetting, updateSetting, } from './extensionSettings.js';
+import { getEnvContents, maybePromptForSettings, promptForSetting, updateSetting, ExtensionSettingScope, getScopedEnvContents, } from './extensionSettings.js';
 import { ExtensionStorage } from './storage.js';
 import prompts from 'prompts';
 import * as fsPromises from 'node:fs/promises';
 import * as fs from 'node:fs';
 import { KeychainTokenStorage } from '@google/gemini-cli-core';
+import { EXTENSION_SETTINGS_FILENAME } from './variables.js';
 vi.mock('prompts');
 vi.mock('os', async (importOriginal) => {
     const mockedOs = await importOriginal();
@@ -24,51 +25,54 @@ vi.mock('@google/gemini-cli-core', async (importOriginal) => {
     const actual = await importOriginal();
     return {
         ...actual,
-        KeychainTokenStorage: vi.fn().mockImplementation(() => ({
-            getSecret: vi.fn(),
-            setSecret: vi.fn(),
-            deleteSecret: vi.fn(),
-            listSecrets: vi.fn(),
-            isAvailable: vi.fn().mockResolvedValue(true),
-        })),
+        KeychainTokenStorage: vi.fn(),
     };
 });
 describe('extensionSettings', () => {
     let tempHomeDir;
+    let tempWorkspaceDir;
     let extensionDir;
-    let mockKeychainStorage;
-    let keychainData;
+    let mockKeychainData;
     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);
+        mockKeychainData = {};
+        vi.mocked(KeychainTokenStorage).mockImplementation((serviceName) => {
+            if (!mockKeychainData[serviceName]) {
+                mockKeychainData[serviceName] = {};
+            }
+            const keychainData = mockKeychainData[serviceName];
+            return {
+                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),
+            };
+        });
         tempHomeDir = os.tmpdir() + path.sep + `gemini-cli-test-home-${Date.now()}`;
+        tempWorkspaceDir = path.join(os.tmpdir(), `gemini-cli-test-workspace-${Date.now()}`);
         extensionDir = path.join(tempHomeDir, '.gemini', 'extensions', 'test-ext');
         // Spy and mock the method, but also create the directory so we can write to it.
         vi.spyOn(ExtensionStorage.prototype, 'getExtensionDir').mockReturnValue(extensionDir);
         fs.mkdirSync(extensionDir, { recursive: true });
+        fs.mkdirSync(tempWorkspaceDir, { recursive: true });
         vi.mocked(os.homedir).mockReturnValue(tempHomeDir);
+        vi.spyOn(process, 'cwd').mockReturnValue(tempWorkspaceDir);
         vi.mocked(prompts).mockClear();
     });
     afterEach(() => {
         fs.rmSync(tempHomeDir, { recursive: true, force: true });
+        fs.rmSync(tempWorkspaceDir, { recursive: true, force: true });
         vi.restoreAllMocks();
     });
     describe('maybePromptForSettings', () => {
@@ -150,14 +154,15 @@ describe('extensionSettings', () => {
                 VAR1: 'previous-VAR1',
                 SENSITIVE_VAR: 'secret',
             };
-            keychainData['SENSITIVE_VAR'] = 'secret';
+            const userKeychain = new KeychainTokenStorage(`Gemini CLI Extensions test-ext 12345`);
+            await userKeychain.setSecret('SENSITIVE_VAR', 'secret');
             const envPath = path.join(extensionDir, '.env');
             await fsPromises.writeFile(envPath, 'VAR1=previous-VAR1');
             await maybePromptForSettings(newConfig, '12345', mockRequestSetting, previousConfig, previousSettings);
             expect(mockRequestSetting).not.toHaveBeenCalled();
             const actualContent = await fsPromises.readFile(envPath, 'utf-8');
             expect(actualContent).toBe('');
-            expect(mockKeychainStorage.deleteSecret).toHaveBeenCalledWith('SENSITIVE_VAR');
+            expect(await userKeychain.getSecret('SENSITIVE_VAR')).toBeNull();
         });
         it('should remove sensitive settings from keychain', async () => {
             const previousConfig = {
@@ -178,9 +183,10 @@ describe('extensionSettings', () => {
                 settings: [],
             };
             const previousSettings = { SENSITIVE_VAR: 'secret' };
-            keychainData['SENSITIVE_VAR'] = 'secret';
+            const userKeychain = new KeychainTokenStorage(`Gemini CLI Extensions test-ext 12345`);
+            await userKeychain.setSecret('SENSITIVE_VAR', 'secret');
             await maybePromptForSettings(newConfig, '12345', mockRequestSetting, previousConfig, previousSettings);
-            expect(mockKeychainStorage.deleteSecret).toHaveBeenCalledWith('SENSITIVE_VAR');
+            expect(await userKeychain.getSecret('SENSITIVE_VAR')).toBeNull();
         });
         it('should remove settings that are no longer in the config', async () => {
             const previousConfig = {
@@ -326,7 +332,7 @@ describe('extensionSettings', () => {
             expect(result).toBeUndefined();
         });
     });
-    describe('getEnvContents', () => {
+    describe('getScopedEnvContents', () => {
         const config = {
             name: 'test-ext',
             version: '1.0.0',
@@ -340,30 +346,58 @@ describe('extensionSettings', () => {
                 },
             ],
         };
-        it('should return combined contents from .env and keychain', async () => {
-            const envPath = path.join(extensionDir, '.env');
-            await fsPromises.writeFile(envPath, 'VAR1=value1');
-            keychainData['SENSITIVE_VAR'] = 'secret';
-            const contents = await getEnvContents(config, '12345');
+        const extensionId = '12345';
+        it('should return combined contents from user .env and keychain for USER scope', async () => {
+            const userEnvPath = path.join(extensionDir, EXTENSION_SETTINGS_FILENAME);
+            await fsPromises.writeFile(userEnvPath, 'VAR1=user-value1');
+            const userKeychain = new KeychainTokenStorage(`Gemini CLI Extensions test-ext 12345`);
+            await userKeychain.setSecret('SENSITIVE_VAR', 'user-secret');
+            const contents = await getScopedEnvContents(config, extensionId, ExtensionSettingScope.USER);
             expect(contents).toEqual({
-                VAR1: 'value1',
-                SENSITIVE_VAR: 'secret',
+                VAR1: 'user-value1',
+                SENSITIVE_VAR: 'user-secret',
             });
         });
-        it('should return an empty object if no settings are defined', async () => {
-            const contents = await getEnvContents({ name: 'test-ext', version: '1.0.0' }, '12345');
-            expect(contents).toEqual({});
-        });
-        it('should return only keychain contents if .env file does not exist', async () => {
-            keychainData['SENSITIVE_VAR'] = 'secret';
-            const contents = await getEnvContents(config, '12345');
-            expect(contents).toEqual({ SENSITIVE_VAR: 'secret' });
+        it('should return combined contents from workspace .env and keychain for WORKSPACE scope', async () => {
+            const workspaceEnvPath = path.join(tempWorkspaceDir, EXTENSION_SETTINGS_FILENAME);
+            await fsPromises.writeFile(workspaceEnvPath, 'VAR1=workspace-value1');
+            const workspaceKeychain = new KeychainTokenStorage(`Gemini CLI Extensions test-ext 12345 ${tempWorkspaceDir}`);
+            await workspaceKeychain.setSecret('SENSITIVE_VAR', 'workspace-secret');
+            const contents = await getScopedEnvContents(config, extensionId, ExtensionSettingScope.WORKSPACE);
+            expect(contents).toEqual({
+                VAR1: 'workspace-value1',
+                SENSITIVE_VAR: 'workspace-secret',
+            });
         });
-        it('should return only .env contents if keychain is empty', async () => {
-            const envPath = path.join(extensionDir, '.env');
-            await fsPromises.writeFile(envPath, 'VAR1=value1');
-            const contents = await getEnvContents(config, '12345');
-            expect(contents).toEqual({ VAR1: 'value1' });
+    });
+    describe('getEnvContents (merged)', () => {
+        const config = {
+            name: 'test-ext',
+            version: '1.0.0',
+            settings: [
+                { name: 's1', description: 'd1', envVar: 'VAR1' },
+                { name: 's2', description: 'd2', envVar: 'VAR2', sensitive: true },
+                { name: 's3', description: 'd3', envVar: 'VAR3' },
+            ],
+        };
+        const extensionId = '12345';
+        it('should merge user and workspace settings, with workspace taking precedence', async () => {
+            // User settings
+            const userEnvPath = path.join(extensionDir, EXTENSION_SETTINGS_FILENAME);
+            await fsPromises.writeFile(userEnvPath, 'VAR1=user-value1\nVAR3=user-value3');
+            const userKeychain = new KeychainTokenStorage(`Gemini CLI Extensions test-ext ${extensionId}`);
+            await userKeychain.setSecret('VAR2', 'user-secret2');
+            // Workspace settings
+            const workspaceEnvPath = path.join(tempWorkspaceDir, EXTENSION_SETTINGS_FILENAME);
+            await fsPromises.writeFile(workspaceEnvPath, 'VAR1=workspace-value1');
+            const workspaceKeychain = new KeychainTokenStorage(`Gemini CLI Extensions test-ext ${extensionId} ${tempWorkspaceDir}`);
+            await workspaceKeychain.setSecret('VAR2', 'workspace-secret2');
+            const contents = await getEnvContents(config, extensionId);
+            expect(contents).toEqual({
+                VAR1: 'workspace-value1',
+                VAR2: 'workspace-secret2',
+                VAR3: 'user-value3',
+            });
         });
     });
     describe('updateSetting', () => {
@@ -377,64 +411,55 @@ describe('extensionSettings', () => {
         };
         const mockRequestSetting = vi.fn();
         beforeEach(async () => {
-            // Pre-populate settings
-            const envContent = 'VAR1=value1\n';
-            const envPath = path.join(extensionDir, '.env');
-            await fsPromises.writeFile(envPath, envContent);
-            keychainData['VAR2'] = 'value2';
+            const userEnvPath = path.join(extensionDir, '.env');
+            await fsPromises.writeFile(userEnvPath, 'VAR1=value1\n');
+            const userKeychain = new KeychainTokenStorage(`Gemini CLI Extensions test-ext 12345`);
+            await userKeychain.setSecret('VAR2', 'value2');
             mockRequestSetting.mockClear();
         });
-        it('should update a non-sensitive setting', async () => {
+        it('should update a non-sensitive setting in USER scope', async () => {
             mockRequestSetting.mockResolvedValue('new-value1');
-            await updateSetting(config, '12345', 'VAR1', mockRequestSetting);
-            expect(mockRequestSetting).toHaveBeenCalledWith(config.settings[0]);
+            await updateSetting(config, '12345', 'VAR1', mockRequestSetting, ExtensionSettingScope.USER);
             const expectedEnvPath = path.join(extensionDir, '.env');
             const actualContent = await fsPromises.readFile(expectedEnvPath, 'utf-8');
             expect(actualContent).toContain('VAR1=new-value1');
-            expect(mockKeychainStorage.setSecret).not.toHaveBeenCalled();
         });
-        it('should update a non-sensitive setting by name', async () => {
-            mockRequestSetting.mockResolvedValue('new-value-by-name');
-            await updateSetting(config, '12345', 's1', mockRequestSetting);
-            expect(mockRequestSetting).toHaveBeenCalledWith(config.settings[0]);
-            const expectedEnvPath = path.join(extensionDir, '.env');
+        it('should update a non-sensitive setting in WORKSPACE scope', async () => {
+            mockRequestSetting.mockResolvedValue('new-workspace-value');
+            await updateSetting(config, '12345', 'VAR1', mockRequestSetting, ExtensionSettingScope.WORKSPACE);
+            const expectedEnvPath = path.join(tempWorkspaceDir, '.env');
             const actualContent = await fsPromises.readFile(expectedEnvPath, 'utf-8');
-            expect(actualContent).toContain('VAR1=new-value-by-name');
-            expect(mockKeychainStorage.setSecret).not.toHaveBeenCalled();
+            expect(actualContent).toContain('VAR1=new-workspace-value');
         });
-        it('should update a sensitive setting', async () => {
+        it('should update a sensitive setting in USER scope', async () => {
             mockRequestSetting.mockResolvedValue('new-value2');
-            await updateSetting(config, '12345', 'VAR2', mockRequestSetting);
-            expect(mockRequestSetting).toHaveBeenCalledWith(config.settings[1]);
-            expect(mockKeychainStorage.setSecret).toHaveBeenCalledWith('VAR2', 'new-value2');
-            const expectedEnvPath = path.join(extensionDir, '.env');
-            const actualContent = await fsPromises.readFile(expectedEnvPath, 'utf-8');
-            expect(actualContent).not.toContain('VAR2=new-value2');
+            await updateSetting(config, '12345', 'VAR2', mockRequestSetting, ExtensionSettingScope.USER);
+            const userKeychain = new KeychainTokenStorage(`Gemini CLI Extensions test-ext 12345`);
+            expect(await userKeychain.getSecret('VAR2')).toBe('new-value2');
         });
-        it('should update a sensitive setting by name', async () => {
-            mockRequestSetting.mockResolvedValue('new-sensitive-by-name');
-            await updateSetting(config, '12345', 's2', mockRequestSetting);
-            expect(mockRequestSetting).toHaveBeenCalledWith(config.settings[1]);
-            expect(mockKeychainStorage.setSecret).toHaveBeenCalledWith('VAR2', 'new-sensitive-by-name');
-        });
-        it('should do nothing if the setting does not exist', async () => {
-            await updateSetting(config, '12345', 'VAR3', mockRequestSetting);
-            expect(mockRequestSetting).not.toHaveBeenCalled();
+        it('should update a sensitive setting in WORKSPACE scope', async () => {
+            mockRequestSetting.mockResolvedValue('new-workspace-secret');
+            await updateSetting(config, '12345', 'VAR2', mockRequestSetting, ExtensionSettingScope.WORKSPACE);
+            const workspaceKeychain = new KeychainTokenStorage(`Gemini CLI Extensions test-ext 12345 ${tempWorkspaceDir}`);
+            expect(await workspaceKeychain.getSecret('VAR2')).toBe('new-workspace-secret');
         });
-        it('should do nothing if there are no settings', async () => {
-            const emptyConfig = {
-                name: 'test-ext',
-                version: '1.0.0',
-            };
-            await updateSetting(emptyConfig, '12345', 'VAR1', mockRequestSetting);
-            expect(mockRequestSetting).not.toHaveBeenCalled();
-        });
-        it('should wrap values with spaces in quotes', async () => {
-            mockRequestSetting.mockResolvedValue('a value with spaces');
-            await updateSetting(config, '12345', 'VAR1', mockRequestSetting);
-            const expectedEnvPath = path.join(extensionDir, '.env');
-            const actualContent = await fsPromises.readFile(expectedEnvPath, 'utf-8');
-            expect(actualContent).toContain('VAR1="a value with spaces"');
+        it('should leave existing, unmanaged .env variables intact when updating in WORKSPACE scope', async () => {
+            // Setup a pre-existing .env file in the workspace with unmanaged variables
+            const workspaceEnvPath = path.join(tempWorkspaceDir, '.env');
+            const originalEnvContent = 'PROJECT_VAR_1=value_1\nPROJECT_VAR_2=value_2\nVAR1=original-value'; // VAR1 is managed by extension
+            await fsPromises.writeFile(workspaceEnvPath, originalEnvContent);
+            // Simulate updating an extension-managed non-sensitive setting
+            mockRequestSetting.mockResolvedValue('updated-value');
+            await updateSetting(config, '12345', 'VAR1', mockRequestSetting, ExtensionSettingScope.WORKSPACE);
+            // Read the .env file after update
+            const actualContent = await fsPromises.readFile(workspaceEnvPath, 'utf-8');
+            // Assert that original variables are intact and extension variable is updated
+            expect(actualContent).toContain('PROJECT_VAR_1=value_1');
+            expect(actualContent).toContain('PROJECT_VAR_2=value_2');
+            expect(actualContent).toContain('VAR1=updated-value');
+            // Ensure no other unexpected changes or deletions
+            const lines = actualContent.split('\n').filter((line) => line.length > 0);
+            expect(lines).toHaveLength(3); // Should only have the three variables
         });
     });
 });