@google/gemini-cli 0.24.0-nightly.20260103.30f5c4af4 → 0.25.0-nightly.20260112.15891721a

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

@@ -0,0 +1,227 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import * as path from 'node:path';
+import * as os from 'node:os';
+import * as fs from 'node:fs';
+import { getMissingSettings } from './extensionSettings.js';
+import { ExtensionStorage } from './storage.js';
+import { KeychainTokenStorage, debugLogger, coreEvents, } from '@google/gemini-cli-core';
+import { EXTENSION_SETTINGS_FILENAME } from './variables.js';
+import { ExtensionManager } from '../extension-manager.js';
+vi.mock('node:fs', async (importOriginal) => {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const actual = await importOriginal();
+    return {
+        ...actual,
+        default: {
+            ...actual.default,
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            existsSync: vi.fn((...args) => actual.existsSync(...args)),
+        },
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        existsSync: vi.fn((...args) => actual.existsSync(...args)),
+    };
+});
+vi.mock('@google/gemini-cli-core', async (importOriginal) => {
+    const actual = await importOriginal();
+    return {
+        ...actual,
+        KeychainTokenStorage: vi.fn(),
+        debugLogger: {
+            warn: vi.fn(),
+            error: vi.fn(),
+            log: vi.fn(),
+        },
+        coreEvents: {
+            emitFeedback: vi.fn(), // Mock emitFeedback
+            on: vi.fn(),
+            off: vi.fn(),
+        },
+    };
+});
+// Mock os.homedir because ExtensionStorage uses it
+vi.mock('os', async (importOriginal) => {
+    const mockedOs = await importOriginal();
+    return {
+        ...mockedOs,
+        homedir: vi.fn(),
+    };
+});
+describe('extensionUpdates', () => {
+    let tempHomeDir;
+    let tempWorkspaceDir;
+    let extensionDir;
+    let mockKeychainData;
+    beforeEach(() => {
+        vi.clearAllMocks();
+        mockKeychainData = {};
+        // Mock Keychain
+        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),
+            };
+        });
+        // Setup Temp Dirs
+        tempHomeDir = fs.mkdtempSync(path.join(os.tmpdir(), 'gemini-cli-test-home-'));
+        tempWorkspaceDir = fs.mkdtempSync(path.join(os.tmpdir(), 'gemini-cli-test-workspace-'));
+        extensionDir = path.join(tempHomeDir, '.gemini', 'extensions', 'test-ext');
+        // Mock ExtensionStorage to rely on our temp extension dir
+        vi.spyOn(ExtensionStorage.prototype, 'getExtensionDir').mockReturnValue(extensionDir);
+        // Mock getEnvFilePath is checking extensionDir/variables.env? No, it used ExtensionStorage logic.
+        // getEnvFilePath in extensionSettings.ts:
+        // if workspace, process.cwd()/.env (we need to mock process.cwd or move tempWorkspaceDir there)
+        // if user, ExtensionStorage(name).getEnvFilePath() -> joins extensionDir + '.env'
+        fs.mkdirSync(extensionDir, { recursive: true });
+        vi.mocked(os.homedir).mockReturnValue(tempHomeDir);
+        vi.spyOn(process, 'cwd').mockReturnValue(tempWorkspaceDir);
+    });
+    afterEach(() => {
+        fs.rmSync(tempHomeDir, { recursive: true, force: true });
+        fs.rmSync(tempWorkspaceDir, { recursive: true, force: true });
+        vi.restoreAllMocks();
+    });
+    describe('getMissingSettings', () => {
+        it('should return empty list if all settings are present', async () => {
+            const config = {
+                name: 'test-ext',
+                version: '1.0.0',
+                settings: [
+                    { name: 's1', description: 'd1', envVar: 'VAR1' },
+                    { name: 's2', description: 'd2', envVar: 'VAR2', sensitive: true },
+                ],
+            };
+            const extensionId = '12345';
+            // Setup User Env
+            const userEnvPath = path.join(extensionDir, EXTENSION_SETTINGS_FILENAME);
+            fs.writeFileSync(userEnvPath, 'VAR1=val1');
+            // Setup Keychain
+            const userKeychain = new KeychainTokenStorage(`Gemini CLI Extensions test-ext ${extensionId}`);
+            await userKeychain.setSecret('VAR2', 'val2');
+            const missing = await getMissingSettings(config, extensionId, tempWorkspaceDir);
+            expect(missing).toEqual([]);
+        });
+        it('should identify missing non-sensitive settings', async () => {
+            const config = {
+                name: 'test-ext',
+                version: '1.0.0',
+                settings: [{ name: 's1', description: 'd1', envVar: 'VAR1' }],
+            };
+            const extensionId = '12345';
+            const missing = await getMissingSettings(config, extensionId, tempWorkspaceDir);
+            expect(missing).toHaveLength(1);
+            expect(missing[0].name).toBe('s1');
+        });
+        it('should identify missing sensitive settings', async () => {
+            const config = {
+                name: 'test-ext',
+                version: '1.0.0',
+                settings: [
+                    { name: 's2', description: 'd2', envVar: 'VAR2', sensitive: true },
+                ],
+            };
+            const extensionId = '12345';
+            const missing = await getMissingSettings(config, extensionId, tempWorkspaceDir);
+            expect(missing).toHaveLength(1);
+            expect(missing[0].name).toBe('s2');
+        });
+        it('should respect settings present in workspace', async () => {
+            const config = {
+                name: 'test-ext',
+                version: '1.0.0',
+                settings: [{ name: 's1', description: 'd1', envVar: 'VAR1' }],
+            };
+            const extensionId = '12345';
+            // Setup Workspace Env
+            const workspaceEnvPath = path.join(tempWorkspaceDir, EXTENSION_SETTINGS_FILENAME);
+            fs.writeFileSync(workspaceEnvPath, 'VAR1=val1');
+            const missing = await getMissingSettings(config, extensionId, tempWorkspaceDir);
+            expect(missing).toEqual([]);
+        });
+    });
+    describe('ExtensionManager integration', () => {
+        it('should warn about missing settings after update', async () => {
+            // Mock ExtensionManager methods to avoid FS/Network usage
+            const newConfig = {
+                name: 'test-ext',
+                version: '1.1.0',
+                settings: [{ name: 's1', description: 'd1', envVar: 'VAR1' }],
+            };
+            const previousConfig = {
+                name: 'test-ext',
+                version: '1.0.0',
+                settings: [],
+            };
+            const installMetadata = {
+                source: extensionDir,
+                type: 'local',
+                autoUpdate: true,
+            };
+            const manager = new ExtensionManager({
+                workspaceDir: tempWorkspaceDir,
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                settings: { telemetry: {} },
+                requestConsent: vi.fn().mockResolvedValue(true),
+                requestSetting: null, // Simulate non-interactive
+            });
+            // Mock methods called by installOrUpdateExtension
+            vi.spyOn(manager, 'loadExtensionConfig').mockResolvedValue(newConfig);
+            vi.spyOn(manager, 'getExtensions').mockReturnValue([
+                {
+                    name: 'test-ext',
+                    version: '1.0.0',
+                    installMetadata,
+                    path: extensionDir,
+                    // Mocks for other required props
+                    contextFiles: [],
+                    mcpServers: {},
+                    hooks: undefined,
+                    isActive: true,
+                    id: 'test-id',
+                    settings: [],
+                    resolvedSettings: [],
+                    skills: [],
+                },
+            ]);
+            vi.spyOn(manager, 'uninstallExtension').mockResolvedValue(undefined);
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            vi.spyOn(manager, 'loadExtension').mockResolvedValue({});
+            vi.spyOn(manager, 'enableExtension').mockResolvedValue(undefined);
+            // Mock fs.promises for the operations inside installOrUpdateExtension
+            vi.spyOn(fs.promises, 'mkdir').mockResolvedValue(undefined);
+            vi.spyOn(fs.promises, 'writeFile').mockResolvedValue(undefined);
+            vi.spyOn(fs.promises, 'rm').mockResolvedValue(undefined);
+            vi.mocked(fs.existsSync).mockReturnValue(false); // No hooks
+            try {
+                await manager.installOrUpdateExtension(installMetadata, previousConfig);
+            }
+            catch (_) {
+                // Ignore errors from copyExtension or others, we just want to verify the warning
+            }
+            expect(debugLogger.warn).toHaveBeenCalledWith(expect.stringContaining('Extension "test-ext" has missing settings: s1'));
+            expect(coreEvents.emitFeedback).toHaveBeenCalledWith('warning', expect.stringContaining('Please run "gemini extensions config test-ext [setting-name]"'));
+        });
+    });
+});
+//# sourceMappingURL=extensionUpdates.test.js.map

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

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

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

@@ -7,7 +7,7 @@ import * as path from 'node:path';
 import * as fs from 'node:fs';
 import * as os from 'node:os';
 import { EXTENSION_SETTINGS_FILENAME, EXTENSIONS_CONFIG_FILENAME, } from './variables.js';
-import { Storage } from '@google/gemini-cli-core';
+import { Storage, homedir } from '@google/gemini-cli-core';
 export class ExtensionStorage {
     extensionName;
     constructor(extensionName) {
@@ -23,7 +23,7 @@ export class ExtensionStorage {
         return path.join(this.getExtensionDir(), EXTENSION_SETTINGS_FILENAME);
     }
     static getUserExtensionsDir() {
-        return new Storage(os.homedir()).getExtensionsDir();
+        return new Storage(homedir()).getExtensionsDir();
     }
     static async createTmpDir() {
         return fs.promises.mkdtemp(path.join(os.tmpdir(), 'gemini-extension'));

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

@@ -1 +1 @@
-{"version":3,"file":"storage.js","sourceRoot":"","sources":["../../../../src/config/extensions/storage.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,EACL,2BAA2B,EAC3B,0BAA0B,GAC3B,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAElD,MAAM,OAAO,gBAAgB;IACV,aAAa,CAAS;IAEvC,YAAY,aAAqB;QAC/B,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;IACrC,CAAC;IAED,eAAe;QACb,OAAO,IAAI,CAAC,IAAI,CACd,gBAAgB,CAAC,oBAAoB,EAAE,EACvC,IAAI,CAAC,aAAa,CACnB,CAAC;IACJ,CAAC;IAED,aAAa;QACX,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,EAAE,0BAA0B,CAAC,CAAC;IACvE,CAAC;IAED,cAAc;QACZ,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,EAAE,2BAA2B,CAAC,CAAC;IACxE,CAAC;IAED,MAAM,CAAC,oBAAoB;QACzB,OAAO,IAAI,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACtD,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,YAAY;QACvB,OAAO,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,kBAAkB,CAAC,CAAC,CAAC;IACzE,CAAC;CACF"}
+{"version":3,"file":"storage.js","sourceRoot":"","sources":["../../../../src/config/extensions/storage.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,EACL,2BAA2B,EAC3B,0BAA0B,GAC3B,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAE3D,MAAM,OAAO,gBAAgB;IACV,aAAa,CAAS;IAEvC,YAAY,aAAqB;QAC/B,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;IACrC,CAAC;IAED,eAAe;QACb,OAAO,IAAI,CAAC,IAAI,CACd,gBAAgB,CAAC,oBAAoB,EAAE,EACvC,IAAI,CAAC,aAAa,CACnB,CAAC;IACJ,CAAC;IAED,aAAa;QACX,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,EAAE,0BAA0B,CAAC,CAAC;IACvE,CAAC;IAED,cAAc;QACZ,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,EAAE,2BAA2B,CAAC,CAAC;IACxE,CAAC;IAED,MAAM,CAAC,oBAAoB;QACzB,OAAO,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACnD,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,YAAY;QACvB,OAAO,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,kBAAkB,CAAC,CAAC,CAAC;IACzE,CAAC;CACF"}

package/dist/src/config/settings.d.ts

@@ -3,8 +3,8 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { type Settings, type MemoryImportFormat } from './settingsSchema.js';
-import type { ExtensionManager } from './extension-manager.js';
+import { type GeminiCodeAssistSetting } from '@google/gemini-cli-core';
+import { type Settings, type MemoryImportFormat, type SettingsSchema } from './settingsSchema.js';
 export type { Settings, MemoryImportFormat };
 export declare const USER_SETTINGS_PATH: string;
 export declare const USER_SETTINGS_DIR: string;
@@ -59,22 +59,22 @@ export interface SettingsFile {
     path: string;
     rawJson?: string;
 }
-export declare function needsMigration(settings: Record<string, unknown>): boolean;
-export declare function migrateSettingsToV1(v2Settings: Record<string, unknown>): Record<string, unknown>;
+export declare function getDefaultsFromSchema(schema?: SettingsSchema): Settings;
 export declare class LoadedSettings {
-    constructor(system: SettingsFile, systemDefaults: SettingsFile, user: SettingsFile, workspace: SettingsFile, isTrusted: boolean, migratedInMemoryScopes: Set<SettingScope>, errors?: SettingsError[]);
+    constructor(system: SettingsFile, systemDefaults: SettingsFile, user: SettingsFile, workspace: SettingsFile, isTrusted: boolean, errors?: SettingsError[]);
     readonly system: SettingsFile;
     readonly systemDefaults: SettingsFile;
     readonly user: SettingsFile;
     readonly workspace: SettingsFile;
     readonly isTrusted: boolean;
-    readonly migratedInMemoryScopes: Set<SettingScope>;
     readonly errors: SettingsError[];
     private _merged;
+    private _remoteAdminSettings;
     get merged(): Settings;
     private computeMergedSettings;
     forScope(scope: LoadableSettingScope): SettingsFile;
     setValue(scope: LoadableSettingScope, key: string, value: unknown): void;
+    setRemoteAdminSettings(remoteSettings: GeminiCodeAssistSetting): void;
 }
 export declare function setUpCloudShellEnvironment(envFilePath: string | null): void;
 export declare function loadEnvironment(settings: Settings): void;
@@ -83,6 +83,5 @@ export declare function loadEnvironment(settings: Settings): void;
  * Project settings override user settings.
  */
 export declare function loadSettings(workspaceDir?: string): LoadedSettings;
-export declare function migrateDeprecatedSettings(loadedSettings: LoadedSettings, extensionManager: ExtensionManager): void;
 export declare function saveSettings(settingsFile: SettingsFile): void;
 export declare function saveModelChange(loadedSettings: LoadedSettings, model: string): void;