@machina.ai/cell-cli 1.10.0-rc1 → 1.13.0-rc1

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

@@ -0,0 +1,169 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect, vi, afterEach, beforeEach } from 'vitest';
+import * as https from 'node:https';
+import { EventEmitter } from 'node:events';
+import { fetchJson, getGitHubToken } from './github_fetch.js';
+vi.mock('node:https');
+describe('getGitHubToken', () => {
+    const originalToken = process.env['GITHUB_TOKEN'];
+    afterEach(() => {
+        if (originalToken) {
+            process.env['GITHUB_TOKEN'] = originalToken;
+        }
+        else {
+            delete process.env['GITHUB_TOKEN'];
+        }
+    });
+    it('should return the token if GITHUB_TOKEN is set', () => {
+        process.env['GITHUB_TOKEN'] = 'test-token';
+        expect(getGitHubToken()).toBe('test-token');
+    });
+    it('should return undefined if GITHUB_TOKEN is not set', () => {
+        delete process.env['GITHUB_TOKEN'];
+        expect(getGitHubToken()).toBeUndefined();
+    });
+});
+describe('fetchJson', () => {
+    const getMock = vi.mocked(https.get);
+    afterEach(() => {
+        vi.resetAllMocks();
+    });
+    it('should fetch and parse JSON successfully', async () => {
+        getMock.mockImplementationOnce((_url, _options, callback) => {
+            const res = new EventEmitter();
+            res.statusCode = 200;
+            callback(res);
+            res.emit('data', Buffer.from('{"foo":'));
+            res.emit('data', Buffer.from('"bar"}'));
+            res.emit('end');
+            return new EventEmitter();
+        });
+        await expect(fetchJson('https://example.com/data.json')).resolves.toEqual({
+            foo: 'bar',
+        });
+    });
+    it('should handle redirects (301 and 302)', async () => {
+        // Test 302
+        getMock.mockImplementationOnce((_url, _options, callback) => {
+            const res = new EventEmitter();
+            res.statusCode = 302;
+            res.headers = { location: 'https://example.com/final' };
+            callback(res);
+            res.emit('end');
+            return new EventEmitter();
+        });
+        getMock.mockImplementationOnce((url, _options, callback) => {
+            expect(url).toBe('https://example.com/final');
+            const res = new EventEmitter();
+            res.statusCode = 200;
+            callback(res);
+            res.emit('data', Buffer.from('{"success": true}'));
+            res.emit('end');
+            return new EventEmitter();
+        });
+        await expect(fetchJson('https://example.com/redirect')).resolves.toEqual({
+            success: true,
+        });
+        // Test 301
+        getMock.mockImplementationOnce((_url, _options, callback) => {
+            const res = new EventEmitter();
+            res.statusCode = 301;
+            res.headers = { location: 'https://example.com/final-permanent' };
+            callback(res);
+            res.emit('end');
+            return new EventEmitter();
+        });
+        getMock.mockImplementationOnce((url, _options, callback) => {
+            expect(url).toBe('https://example.com/final-permanent');
+            const res = new EventEmitter();
+            res.statusCode = 200;
+            callback(res);
+            res.emit('data', Buffer.from('{"permanent": true}'));
+            res.emit('end');
+            return new EventEmitter();
+        });
+        await expect(fetchJson('https://example.com/redirect-perm')).resolves.toEqual({ permanent: true });
+    });
+    it('should reject on non-200/30x status code', async () => {
+        getMock.mockImplementationOnce((_url, _options, callback) => {
+            const res = new EventEmitter();
+            res.statusCode = 404;
+            callback(res);
+            res.emit('end');
+            return new EventEmitter();
+        });
+        await expect(fetchJson('https://example.com/error')).rejects.toThrow('Request failed with status code 404');
+    });
+    it('should reject on request error', async () => {
+        const error = new Error('Network error');
+        getMock.mockImplementationOnce(() => {
+            const req = new EventEmitter();
+            req.emit('error', error);
+            return req;
+        });
+        await expect(fetchJson('https://example.com/error')).rejects.toThrow('Network error');
+    });
+    describe('with GITHUB_TOKEN', () => {
+        const originalToken = process.env['GITHUB_TOKEN'];
+        beforeEach(() => {
+            process.env['GITHUB_TOKEN'] = 'my-secret-token';
+        });
+        afterEach(() => {
+            if (originalToken) {
+                process.env['GITHUB_TOKEN'] = originalToken;
+            }
+            else {
+                delete process.env['GITHUB_TOKEN'];
+            }
+        });
+        it('should include Authorization header if token is present', async () => {
+            getMock.mockImplementationOnce((_url, options, callback) => {
+                expect(options.headers).toEqual({
+                    'User-Agent': 'gemini-cli',
+                    Authorization: 'token my-secret-token',
+                });
+                const res = new EventEmitter();
+                res.statusCode = 200;
+                callback(res);
+                res.emit('data', Buffer.from('{"foo": "bar"}'));
+                res.emit('end');
+                return new EventEmitter();
+            });
+            await expect(fetchJson('https://api.github.com/user')).resolves.toEqual({
+                foo: 'bar',
+            });
+        });
+    });
+    describe('without GITHUB_TOKEN', () => {
+        const originalToken = process.env['GITHUB_TOKEN'];
+        beforeEach(() => {
+            delete process.env['GITHUB_TOKEN'];
+        });
+        afterEach(() => {
+            if (originalToken) {
+                process.env['GITHUB_TOKEN'] = originalToken;
+            }
+        });
+        it('should not include Authorization header if token is not present', async () => {
+            getMock.mockImplementationOnce((_url, options, callback) => {
+                expect(options.headers).toEqual({
+                    'User-Agent': 'gemini-cli',
+                });
+                const res = new EventEmitter();
+                res.statusCode = 200;
+                callback(res);
+                res.emit('data', Buffer.from('{"foo": "bar"}'));
+                res.emit('end');
+                return new EventEmitter();
+            });
+            await expect(fetchJson('https://api.github.com/user')).resolves.toEqual({
+                foo: 'bar',
+            });
+        });
+    });
+});
+//# sourceMappingURL=github_fetch.test.js.map

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

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

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

@@ -0,0 +1,14 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export declare class ExtensionStorage {
+    private readonly extensionName;
+    constructor(extensionName: string);
+    getExtensionDir(): string;
+    getConfigPath(): string;
+    getEnvFilePath(): string;
+    static getUserExtensionsDir(): string;
+    static createTmpDir(): Promise<string>;
+}

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

@@ -0,0 +1,32 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+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';
+export class ExtensionStorage {
+    extensionName;
+    constructor(extensionName) {
+        this.extensionName = extensionName;
+    }
+    getExtensionDir() {
+        return path.join(ExtensionStorage.getUserExtensionsDir(), this.extensionName);
+    }
+    getConfigPath() {
+        return path.join(this.getExtensionDir(), EXTENSIONS_CONFIG_FILENAME);
+    }
+    getEnvFilePath() {
+        return path.join(this.getExtensionDir(), EXTENSION_SETTINGS_FILENAME);
+    }
+    static getUserExtensionsDir() {
+        return new Storage(os.homedir()).getExtensionsDir();
+    }
+    static async createTmpDir() {
+        return await fs.promises.mkdtemp(path.join(os.tmpdir(), 'gemini-extension'));
+    }
+}
+//# sourceMappingURL=storage.js.map

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

@@ -0,0 +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,MAAM,EAAE,CAAC,QAAQ,CAAC,OAAO,CAC9B,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,kBAAkB,CAAC,CAC3C,CAAC;IACJ,CAAC;CACF"}

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

@@ -4,16 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { type ExtensionUpdateAction, ExtensionUpdateState, type ExtensionUpdateStatus } from '../../ui/state/extensions.js';
-import type { GeminiCLIExtension } from '@google/gemini-cli-core';
+import { type GeminiCLIExtension } from '@google/gemini-cli-core';
+import { type ExtensionManager } from '../extension-manager.js';
 export interface ExtensionUpdateInfo {
     name: string;
     originalVersion: string;
     updatedVersion: string;
 }
-export declare function updateExtension(extension: GeminiCLIExtension, cwd: string | undefined, requestConsent: (consent: string) => Promise<boolean>, currentState: ExtensionUpdateState, dispatchExtensionStateUpdate: (action: ExtensionUpdateAction) => void): Promise<ExtensionUpdateInfo | undefined>;
-export declare function updateAllUpdatableExtensions(cwd: string | undefined, requestConsent: (consent: string) => Promise<boolean>, extensions: GeminiCLIExtension[], extensionsState: Map<string, ExtensionUpdateStatus>, dispatch: (action: ExtensionUpdateAction) => void): Promise<ExtensionUpdateInfo[]>;
+export declare function updateExtension(extension: GeminiCLIExtension, extensionManager: ExtensionManager, currentState: ExtensionUpdateState, dispatchExtensionStateUpdate: (action: ExtensionUpdateAction) => void, enableExtensionReloading?: boolean): Promise<ExtensionUpdateInfo | undefined>;
+export declare function updateAllUpdatableExtensions(extensions: GeminiCLIExtension[], extensionsState: Map<string, ExtensionUpdateStatus>, extensionManager: ExtensionManager, dispatch: (action: ExtensionUpdateAction) => void, enableExtensionReloading?: boolean): Promise<ExtensionUpdateInfo[]>;
 export interface ExtensionUpdateCheckResult {
     state: ExtensionUpdateState;
     error?: string;
 }
-export declare function checkForAllExtensionUpdates(extensions: GeminiCLIExtension[], dispatch: (action: ExtensionUpdateAction) => void, cwd?: string): Promise<void>;
+export declare function checkForAllExtensionUpdates(extensions: GeminiCLIExtension[], extensionManager: ExtensionManager, dispatch: (action: ExtensionUpdateAction) => void): Promise<void>;

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

@@ -4,11 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { ExtensionUpdateState, } from '../../ui/state/extensions.js';
-import { copyExtension, installOrUpdateExtension, loadExtension, loadInstallMetadata, ExtensionStorage, loadExtensionConfig, } from '../extension.js';
+import { loadInstallMetadata } from '../extension.js';
 import { checkForExtensionUpdate } from './github.js';
+import { debugLogger } from '@google/gemini-cli-core';
 import * as fs from 'node:fs';
 import { getErrorMessage } from '../../utils/errors.js';
-export async function updateExtension(extension, cwd = process.cwd(), requestConsent, currentState, dispatchExtensionStateUpdate) {
+import { copyExtension } from '../extension-manager.js';
+import { ExtensionStorage } from './storage.js';
+export async function updateExtension(extension, extensionManager, currentState, dispatchExtensionStateUpdate, enableExtensionReloading) {
     if (currentState === ExtensionUpdateState.UPDATING) {
         return undefined;
     }
@@ -34,29 +37,26 @@ export async function updateExtension(extension, cwd = process.cwd(), requestCon
     const originalVersion = extension.version;
     const tempDir = await ExtensionStorage.createTmpDir();
     try {
-        const previousExtensionConfig = await loadExtensionConfig({
-            extensionDir: extension.path,
-            workspaceDir: cwd,
-        });
-        await installOrUpdateExtension(installMetadata, requestConsent, cwd, previousExtensionConfig);
-        const updatedExtensionStorage = new ExtensionStorage(extension.name);
-        const updatedExtension = loadExtension({
-            extensionDir: updatedExtensionStorage.getExtensionDir(),
-            workspaceDir: cwd,
-        });
-        if (!updatedExtension) {
+        const previousExtensionConfig = extensionManager.loadExtensionConfig(extension.path);
+        let updatedExtension;
+        try {
+            updatedExtension = await extensionManager.installOrUpdateExtension(installMetadata, previousExtensionConfig);
+        }
+        catch (e) {
             dispatchExtensionStateUpdate({
                 type: 'SET_STATE',
                 payload: { name: extension.name, state: ExtensionUpdateState.ERROR },
             });
-            throw new Error('Updated extension not found after installation.');
+            throw new Error(`Updated extension not found after installation, got error:\n${e}`);
         }
         const updatedVersion = updatedExtension.version;
         dispatchExtensionStateUpdate({
             type: 'SET_STATE',
             payload: {
                 name: extension.name,
-                state: ExtensionUpdateState.UPDATED_NEEDS_RESTART,
+                state: enableExtensionReloading
+                    ? ExtensionUpdateState.UPDATED
+                    : ExtensionUpdateState.UPDATED_NEEDS_RESTART,
             },
         });
         return {
@@ -66,7 +66,7 @@ export async function updateExtension(extension, cwd = process.cwd(), requestCon
         };
     }
     catch (e) {
-        console.error(`Error updating extension, rolling back. ${getErrorMessage(e)}`);
+        debugLogger.error(`Error updating extension, rolling back. ${getErrorMessage(e)}`);
         dispatchExtensionStateUpdate({
             type: 'SET_STATE',
             payload: { name: extension.name, state: ExtensionUpdateState.ERROR },
@@ -78,39 +78,43 @@ export async function updateExtension(extension, cwd = process.cwd(), requestCon
         await fs.promises.rm(tempDir, { recursive: true, force: true });
     }
 }
-export async function updateAllUpdatableExtensions(cwd = process.cwd(), requestConsent, extensions, extensionsState, dispatch) {
+export async function updateAllUpdatableExtensions(extensions, extensionsState, extensionManager, dispatch, enableExtensionReloading) {
     return (await Promise.all(extensions
         .filter((extension) => extensionsState.get(extension.name)?.status ===
         ExtensionUpdateState.UPDATE_AVAILABLE)
-        .map((extension) => updateExtension(extension, cwd, requestConsent, extensionsState.get(extension.name).status, dispatch)))).filter((updateInfo) => !!updateInfo);
+        .map((extension) => updateExtension(extension, extensionManager, extensionsState.get(extension.name).status, dispatch, enableExtensionReloading)))).filter((updateInfo) => !!updateInfo);
 }
-export async function checkForAllExtensionUpdates(extensions, dispatch, cwd = process.cwd()) {
+export async function checkForAllExtensionUpdates(extensions, extensionManager, dispatch) {
     dispatch({ type: 'BATCH_CHECK_START' });
-    const promises = [];
-    for (const extension of extensions) {
-        if (!extension.installMetadata) {
+    try {
+        const promises = [];
+        for (const extension of extensions) {
+            if (!extension.installMetadata) {
+                dispatch({
+                    type: 'SET_STATE',
+                    payload: {
+                        name: extension.name,
+                        state: ExtensionUpdateState.NOT_UPDATABLE,
+                    },
+                });
+                continue;
+            }
             dispatch({
                 type: 'SET_STATE',
                 payload: {
                     name: extension.name,
-                    state: ExtensionUpdateState.NOT_UPDATABLE,
+                    state: ExtensionUpdateState.CHECKING_FOR_UPDATES,
                 },
             });
-            continue;
+            promises.push(checkForExtensionUpdate(extension, extensionManager).then((state) => dispatch({
+                type: 'SET_STATE',
+                payload: { name: extension.name, state },
+            })));
         }
-        dispatch({
-            type: 'SET_STATE',
-            payload: {
-                name: extension.name,
-                state: ExtensionUpdateState.CHECKING_FOR_UPDATES,
-            },
-        });
-        promises.push(checkForExtensionUpdate(extension, cwd).then((state) => dispatch({
-            type: 'SET_STATE',
-            payload: { name: extension.name, state },
-        })));
+        await Promise.all(promises);
+    }
+    finally {
+        dispatch({ type: 'BATCH_CHECK_END' });
     }
-    await Promise.all(promises);
-    dispatch({ type: 'BATCH_CHECK_END' });
 }
 //# sourceMappingURL=update.js.map

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

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