@machina.ai/cell-cli 1.20.2-rc1 → 1.25.0-rc3

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

@@ -3,9 +3,13 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
+import * as fs from 'node:fs/promises';
+import * as path from 'node:path';
 import { debugLogger } from '@google/gemini-cli-core';
+import chalk from 'chalk';
 import { escapeAnsiCtrlCodes } from '../../ui/utils/textUtils.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.**';
+export const INSTALL_WARNING_MESSAGE = chalk.yellow('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.');
+export const SKILLS_WARNING_MESSAGE = chalk.yellow("Agent skills inject specialized instructions and domain-specific knowledge into the agent's system prompt. This can change how the agent interprets your requests and interacts with your environment. Review the skill definitions at the location(s) provided below to ensure they meet your security standards.");
 /**
  * Requests consent from the user to perform an action, by reading a Y/n
  * character from stdin.
@@ -26,7 +30,7 @@ export async function requestConsentNonInteractive(consentDescription) {
  * 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.
+ * @param addExtensionUpdateConfirmationRequest A function to actually add a prompt to the UI.
  * @returns boolean, whether they consented or not.
  */
 export async function requestConsentInteractive(consentDescription, addExtensionUpdateConfirmationRequest) {
@@ -59,7 +63,7 @@ async function promptForConsentNonInteractive(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.
+ * @param addExtensionUpdateConfirmationRequest Function to update the UI state with the confirmation request.
  * @returns Whether or not the user answers yes.
  */
 async function promptForConsentInteractive(prompt, addExtensionUpdateConfirmationRequest) {
@@ -76,7 +80,7 @@ async function promptForConsentInteractive(prompt, addExtensionUpdateConfirmatio
  * Builds a consent string for installing an extension based on it's
  * extensionConfig.
  */
-function extensionConsentString(extensionConfig) {
+async function extensionConsentString(extensionConfig, hasHooks, skills = []) {
     const sanitizedConfig = escapeAnsiCtrlCodes(extensionConfig);
     const output = [];
     const mcpServerEntries = Object.entries(sanitizedConfig.mcpServers || {});
@@ -97,6 +101,28 @@ function extensionConsentString(extensionConfig) {
     if (sanitizedConfig.excludeTools) {
         output.push(`This extension will exclude the following core tools: ${sanitizedConfig.excludeTools}`);
     }
+    if (hasHooks) {
+        output.push('⚠️  This extension contains Hooks which can automatically execute commands.');
+    }
+    if (skills.length > 0) {
+        output.push(`\n${chalk.bold('Agent Skills:')}`);
+        output.push(SKILLS_WARNING_MESSAGE);
+        output.push('This extension will install the following agent skills:');
+        for (const skill of skills) {
+            output.push(`  * ${chalk.bold(skill.name)}: ${skill.description}`);
+            const skillDir = path.dirname(skill.location);
+            let fileCountStr = '';
+            try {
+                const skillDirItems = await fs.readdir(skillDir);
+                fileCountStr = ` (${skillDirItems.length} items in directory)`;
+            }
+            catch {
+                fileCountStr = ` ${chalk.red('⚠️ (Could not count items in directory)')}`;
+            }
+            output.push(`    (Location: ${skill.location})${fileCountStr}`);
+        }
+        output.push('');
+    }
     return output.join('\n');
 }
 /**
@@ -108,10 +134,10 @@ function extensionConsentString(extensionConfig) {
  *
  * Throws if the user does not consent.
  */
-export async function maybeRequestConsentOrFail(extensionConfig, requestConsent, previousExtensionConfig) {
-    const extensionConsent = extensionConsentString(extensionConfig);
+export async function maybeRequestConsentOrFail(extensionConfig, requestConsent, hasHooks, previousExtensionConfig, previousHasHooks, skills = [], previousSkills = []) {
+    const extensionConsent = await extensionConsentString(extensionConfig, hasHooks, skills);
     if (previousExtensionConfig) {
-        const previousExtensionConsent = extensionConsentString(previousExtensionConfig);
+        const previousExtensionConsent = await extensionConsentString(previousExtensionConfig, previousHasHooks ?? false, previousSkills);
         if (previousExtensionConsent === extensionConsent) {
             return;
         }

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

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

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

@@ -4,7 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-import { requestConsentNonInteractive, requestConsentInteractive, maybeRequestConsentOrFail, INSTALL_WARNING_MESSAGE, } from './consent.js';
+import chalk from 'chalk';
+import * as fs from 'node:fs/promises';
+import * as path from 'node:path';
+import * as os from 'node:os';
+import { requestConsentNonInteractive, requestConsentInteractive, maybeRequestConsentOrFail, INSTALL_WARNING_MESSAGE, SKILLS_WARNING_MESSAGE, } from './consent.js';
 import { debugLogger } from '@google/gemini-cli-core';
 const mockReadline = vi.hoisted(() => ({
     createInterface: vi.fn().mockReturnValue({
@@ -12,11 +16,23 @@ const mockReadline = vi.hoisted(() => ({
         close: vi.fn(),
     }),
 }));
+const mockReaddir = vi.hoisted(() => vi.fn());
+const originalReaddir = vi.hoisted(() => ({
+    current: null,
+}));
 // Mocking readline for non-interactive prompts
 vi.mock('node:readline', () => ({
     default: mockReadline,
     createInterface: mockReadline.createInterface,
 }));
+vi.mock('node:fs/promises', async (importOriginal) => {
+    const actual = await importOriginal();
+    originalReaddir.current = actual.readdir;
+    return {
+        ...actual,
+        readdir: mockReaddir,
+    };
+});
 vi.mock('@google/gemini-cli-core', async (importOriginal) => {
     const actual = await importOriginal();
     return {
@@ -27,11 +43,20 @@ vi.mock('@google/gemini-cli-core', async (importOriginal) => {
     };
 });
 describe('consent', () => {
-    beforeEach(() => {
+    let tempDir;
+    beforeEach(async () => {
         vi.clearAllMocks();
+        if (originalReaddir.current) {
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            mockReaddir.mockImplementation(originalReaddir.current);
+        }
+        tempDir = await fs.mkdtemp(path.join(os.tmpdir(), 'consent-test-'));
     });
-    afterEach(() => {
+    afterEach(async () => {
         vi.restoreAllMocks();
+        if (tempDir) {
+            await fs.rm(tempDir, { recursive: true, force: true });
+        }
     });
     describe('requestConsentNonInteractive', () => {
         it.each([
@@ -80,17 +105,17 @@ describe('consent', () => {
         };
         it('should request consent if there is no previous config', async () => {
             const requestConsent = vi.fn().mockResolvedValue(true);
-            await maybeRequestConsentOrFail(baseConfig, requestConsent, undefined);
+            await maybeRequestConsentOrFail(baseConfig, requestConsent, false, undefined);
             expect(requestConsent).toHaveBeenCalledTimes(1);
         });
         it('should not request consent if configs are identical', async () => {
             const requestConsent = vi.fn().mockResolvedValue(true);
-            await maybeRequestConsentOrFail(baseConfig, requestConsent, baseConfig);
+            await maybeRequestConsentOrFail(baseConfig, requestConsent, false, baseConfig, false);
             expect(requestConsent).not.toHaveBeenCalled();
         });
         it('should throw an error if consent is denied', async () => {
             const requestConsent = vi.fn().mockResolvedValue(false);
-            await expect(maybeRequestConsentOrFail(baseConfig, requestConsent, undefined)).rejects.toThrow('Installation cancelled for "test-ext".');
+            await expect(maybeRequestConsentOrFail(baseConfig, requestConsent, false, undefined)).rejects.toThrow('Installation cancelled for "test-ext".');
         });
         describe('consent string generation', () => {
             it('should generate a consent string with all fields', async () => {
@@ -104,7 +129,7 @@ describe('consent', () => {
                     excludeTools: ['tool1', 'tool2'],
                 };
                 const requestConsent = vi.fn().mockResolvedValue(true);
-                await maybeRequestConsentOrFail(config, requestConsent, undefined);
+                await maybeRequestConsentOrFail(config, requestConsent, false, undefined);
                 const expectedConsentString = [
                     'Installing extension "test-ext".',
                     INSTALL_WARNING_MESSAGE,
@@ -123,7 +148,7 @@ describe('consent', () => {
                     mcpServers: { server1: { command: 'npm', args: ['start'] } },
                 };
                 const requestConsent = vi.fn().mockResolvedValue(true);
-                await maybeRequestConsentOrFail(newConfig, requestConsent, prevConfig);
+                await maybeRequestConsentOrFail(newConfig, requestConsent, false, prevConfig, false);
                 expect(requestConsent).toHaveBeenCalledTimes(1);
             });
             it('should request consent if contextFileName changes', async () => {
@@ -133,7 +158,7 @@ describe('consent', () => {
                     contextFileName: 'new-context.md',
                 };
                 const requestConsent = vi.fn().mockResolvedValue(true);
-                await maybeRequestConsentOrFail(newConfig, requestConsent, prevConfig);
+                await maybeRequestConsentOrFail(newConfig, requestConsent, false, prevConfig, false);
                 expect(requestConsent).toHaveBeenCalledTimes(1);
             });
             it('should request consent if excludeTools changes', async () => {
@@ -143,9 +168,88 @@ describe('consent', () => {
                     excludeTools: ['new-tool'],
                 };
                 const requestConsent = vi.fn().mockResolvedValue(true);
-                await maybeRequestConsentOrFail(newConfig, requestConsent, prevConfig);
+                await maybeRequestConsentOrFail(newConfig, requestConsent, false, prevConfig, false);
                 expect(requestConsent).toHaveBeenCalledTimes(1);
             });
+            it('should include warning when hooks are present', async () => {
+                const requestConsent = vi.fn().mockResolvedValue(true);
+                await maybeRequestConsentOrFail(baseConfig, requestConsent, true, undefined);
+                expect(requestConsent).toHaveBeenCalledWith(expect.stringContaining('⚠️  This extension contains Hooks which can automatically execute commands.'));
+            });
+            it('should request consent if hooks status changes', async () => {
+                const requestConsent = vi.fn().mockResolvedValue(true);
+                await maybeRequestConsentOrFail(baseConfig, requestConsent, true, baseConfig, false);
+                expect(requestConsent).toHaveBeenCalledTimes(1);
+            });
+            it('should request consent if skills change', async () => {
+                const skill1Dir = path.join(tempDir, 'skill1');
+                const skill2Dir = path.join(tempDir, 'skill2');
+                await fs.mkdir(skill1Dir, { recursive: true });
+                await fs.mkdir(skill2Dir, { recursive: true });
+                await fs.writeFile(path.join(skill1Dir, 'SKILL.md'), 'body1');
+                await fs.writeFile(path.join(skill1Dir, 'extra.txt'), 'extra');
+                await fs.writeFile(path.join(skill2Dir, 'SKILL.md'), 'body2');
+                const skill1 = {
+                    name: 'skill1',
+                    description: 'desc1',
+                    location: path.join(skill1Dir, 'SKILL.md'),
+                    body: 'body1',
+                };
+                const skill2 = {
+                    name: 'skill2',
+                    description: 'desc2',
+                    location: path.join(skill2Dir, 'SKILL.md'),
+                    body: 'body2',
+                };
+                const config = {
+                    ...baseConfig,
+                    mcpServers: {
+                        server1: { command: 'npm', args: ['start'] },
+                        server2: { httpUrl: 'https://remote.com' },
+                    },
+                    contextFileName: 'my-context.md',
+                    excludeTools: ['tool1', 'tool2'],
+                };
+                const requestConsent = vi.fn().mockResolvedValue(true);
+                await maybeRequestConsentOrFail(config, requestConsent, false, undefined, false, [skill1, skill2]);
+                const expectedConsentString = [
+                    'Installing extension "test-ext".',
+                    INSTALL_WARNING_MESSAGE,
+                    'This extension will run the following MCP servers:',
+                    '  * server1 (local): npm start',
+                    '  * server2 (remote): https://remote.com',
+                    'This extension will append info to your gemini.md context using my-context.md',
+                    'This extension will exclude the following core tools: tool1,tool2',
+                    '',
+                    chalk.bold('Agent Skills:'),
+                    SKILLS_WARNING_MESSAGE,
+                    'This extension will install the following agent skills:',
+                    `  * ${chalk.bold('skill1')}: desc1`,
+                    `    (Location: ${skill1.location}) (2 items in directory)`,
+                    `  * ${chalk.bold('skill2')}: desc2`,
+                    `    (Location: ${skill2.location}) (1 items in directory)`,
+                    '',
+                ].join('\n');
+                expect(requestConsent).toHaveBeenCalledWith(expectedConsentString);
+            });
+            it('should show a warning if the skill directory cannot be read', async () => {
+                const lockedDir = path.join(tempDir, 'locked');
+                await fs.mkdir(lockedDir, { recursive: true });
+                const skill = {
+                    name: 'locked-skill',
+                    description: 'A skill in a locked dir',
+                    location: path.join(lockedDir, 'SKILL.md'),
+                    body: 'body',
+                };
+                // Mock readdir to simulate a permission error.
+                // We do this instead of using fs.mkdir(..., { mode: 0o000 }) because
+                // directory permissions work differently on Windows and 0o000 doesn't
+                // effectively block access there, leading to test failures in Windows CI.
+                mockReaddir.mockRejectedValueOnce(new Error('EACCES: permission denied, scandir'));
+                const requestConsent = vi.fn().mockResolvedValue(true);
+                await maybeRequestConsentOrFail(baseConfig, requestConsent, false, undefined, false, [skill]);
+                expect(requestConsent).toHaveBeenCalledWith(expect.stringContaining(`    (Location: ${skill.location}) ${chalk.red('⚠️ (Could not count items in directory)')}`));
+            });
         });
     });
 });

package/dist/src/config/extensions/consent.test.js.map

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

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

@@ -4,12 +4,20 @@
  * 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;
     envVar: string;
     sensitive?: boolean;
 }
+export declare const getEnvFilePath: (extensionName: string, scope: ExtensionSettingScope, workspaceDir?: string) => string;
 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 getEnvContents(extensionConfig: ExtensionConfig, extensionId: string): Promise<Record<string, string>>;
+export declare function getScopedEnvContents(extensionConfig: ExtensionConfig, extensionId: string, scope: ExtensionSettingScope, workspaceDir?: string): Promise<Record<string, string>>;
+export declare function getEnvContents(extensionConfig: ExtensionConfig, extensionId: string, workspaceDir: string): Promise<Record<string, string>>;
+export declare function updateSetting(extensionConfig: ExtensionConfig, extensionId: string, settingKey: string, requestSetting: (setting: ExtensionSetting) => Promise<string>, scope: ExtensionSettingScope, workspaceDir?: string): Promise<void>;
+export declare function getMissingSettings(extensionConfig: ExtensionConfig, extensionId: string, workspaceDir: string): Promise<ExtensionSetting[]>;

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

@@ -6,10 +6,35 @@
 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 { KeychainTokenStorage } from '@google/gemini-cli-core';
-const getKeychainStorageName = (extensionName, extensionId) => `Cell CLI Extensions ${extensionName} ${extensionId}`;
+import { debugLogger, KeychainTokenStorage } from '@google/gemini-cli-core';
+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, workspaceDir) => {
+    const base = `Cell CLI Extensions ${extensionName} ${extensionId}`;
+    if (scope === ExtensionSettingScope.WORKSPACE) {
+        if (!workspaceDir) {
+            throw new Error('Workspace directory is required for workspace scope');
+        }
+        return `${base} ${workspaceDir}`;
+    }
+    return base;
+};
+export const getEnvFilePath = (extensionName, scope, workspaceDir) => {
+    if (scope === ExtensionSettingScope.WORKSPACE) {
+        if (!workspaceDir) {
+            throw new Error('Workspace directory is required for workspace scope');
+        }
+        return path.join(workspaceDir, 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,14 +42,17 @@ 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;
     }
     const settingsChanges = getSettingsChanges(settings, previousExtensionConfig?.settings ?? []);
-    const allSettings = { ...(previousSettings ?? {}) };
+    const allSettings = { ...previousSettings };
     for (const removedEnvSetting of settingsChanges.removeEnv) {
         delete allSettings[removedEnvSetting.envVar];
     }
@@ -48,11 +76,16 @@ export async function maybePromptForSettings(extensionConfig, extensionId, reque
             nonSensitiveSettings[setting.envVar] = value;
         }
     }
+    const envContent = formatEnvContent(nonSensitiveSettings);
+    await fs.writeFile(envFilePath, envContent);
+}
+function formatEnvContent(settings) {
     let envContent = '';
-    for (const [key, value] of Object.entries(nonSensitiveSettings)) {
-        envContent += `${key}=${value}\n`;
+    for (const [key, value] of Object.entries(settings)) {
+        const formattedValue = value.includes(' ') ? `"${value}"` : value;
+        envContent += `${key}=${formattedValue}\n`;
     }
-    await fs.writeFile(envFilePath, envContent);
+    return envContent;
 }
 export async function promptForSetting(setting) {
     const response = await prompts({
@@ -62,15 +95,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, workspaceDir) {
+    const { name: extensionName } = extensionConfig;
+    const keychain = new KeychainTokenStorage(getKeychainStorageName(extensionName, extensionId, scope, workspaceDir));
+    const envFilePath = getEnvFilePath(extensionName, scope, workspaceDir);
     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) {
@@ -85,6 +116,51 @@ export async function getEnvContents(extensionConfig, extensionId) {
     }
     return customEnv;
 }
+export async function getEnvContents(extensionConfig, extensionId, workspaceDir) {
+    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, workspaceDir);
+    return { ...userSettings, ...workspaceSettings };
+}
+export async function updateSetting(extensionConfig, extensionId, settingKey, requestSetting, scope, workspaceDir) {
+    const { name: extensionName, settings } = extensionConfig;
+    if (!settings || settings.length === 0) {
+        debugLogger.log('This extension does not have any settings.');
+        return;
+    }
+    const settingToUpdate = settings.find((s) => s.name === settingKey || s.envVar === settingKey);
+    if (!settingToUpdate) {
+        debugLogger.log(`Setting ${settingKey} not found.`);
+        return;
+    }
+    const newValue = await requestSetting(settingToUpdate);
+    const keychain = new KeychainTokenStorage(getKeychainStorageName(extensionName, extensionId, scope, workspaceDir));
+    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, preserving any other values.
+    const envFilePath = getEnvFilePath(extensionName, scope, workspaceDir);
+    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 = {};
+    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 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);
     const sensitiveOld = oldSettings.filter((s) => s.sensitive ?? false);
@@ -102,7 +178,7 @@ async function clearSettings(envFilePath, keychain) {
     if (fsSync.existsSync(envFilePath)) {
         await fs.writeFile(envFilePath, '');
     }
-    if (!keychain.isAvailable()) {
+    if (!(await keychain.isAvailable())) {
         return;
     }
     const secrets = await keychain.listSecrets();
@@ -111,4 +187,18 @@ async function clearSettings(envFilePath, keychain) {
     }
     return;
 }
+export async function getMissingSettings(extensionConfig, extensionId, workspaceDir) {
+    const { settings } = extensionConfig;
+    if (!settings || settings.length === 0) {
+        return [];
+    }
+    const existingSettings = await getEnvContents(extensionConfig, extensionId, workspaceDir);
+    const missingSettings = [];
+    for (const setting of settings) {
+        if (existingSettings[setting.envVar] === undefined) {
+            missingSettings.push(setting);
+        }
+    }
+    return missingSettings;
+}
 //# sourceMappingURL=extensionSettings.js.map

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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"}