@google/gemini-cli 0.24.0-preview.0 → 0.25.0-nightly.20260112.15891721a

package/dist/src/utils/activityLogger.js

@@ -0,0 +1,297 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable @typescript-eslint/no-unnecessary-type-assertion */
+/* eslint-disable @typescript-eslint/no-this-alias */
+import http from 'node:http';
+import https from 'node:https';
+import zlib from 'node:zlib';
+import fs from 'node:fs';
+import path from 'node:path';
+import { EventEmitter } from 'node:events';
+import { CoreEvent, coreEvents, debugLogger } from '@google/gemini-cli-core';
+const ACTIVITY_ID_HEADER = 'x-activity-request-id';
+/**
+ * Capture utility for session activities (network and console).
+ * Provides a stream of events that can be persisted for analysis or inspection.
+ */
+export class ActivityLogger extends EventEmitter {
+    static instance;
+    isInterceptionEnabled = false;
+    requestStartTimes = new Map();
+    static getInstance() {
+        if (!ActivityLogger.instance) {
+            ActivityLogger.instance = new ActivityLogger();
+        }
+        return ActivityLogger.instance;
+    }
+    stringifyHeaders(headers) {
+        const result = {};
+        if (!headers)
+            return result;
+        if (headers instanceof Headers) {
+            headers.forEach((v, k) => {
+                result[k.toLowerCase()] = v;
+            });
+        }
+        else if (typeof headers === 'object' && headers !== null) {
+            for (const [key, val] of Object.entries(headers)) {
+                result[key.toLowerCase()] = Array.isArray(val)
+                    ? val.join(', ')
+                    : String(val);
+            }
+        }
+        return result;
+    }
+    sanitizeNetworkLog(log) {
+        if (!log || typeof log !== 'object')
+            return log;
+        const sanitized = { ...log };
+        // Sanitize request headers
+        if (sanitized.headers) {
+            const headers = { ...sanitized.headers };
+            for (const key of Object.keys(headers)) {
+                if (['authorization', 'cookie', 'x-goog-api-key'].includes(key.toLowerCase())) {
+                    headers[key] = '[REDACTED]';
+                }
+            }
+            sanitized.headers = headers;
+        }
+        // Sanitize response headers
+        if (sanitized.response?.headers) {
+            const resHeaders = { ...sanitized.response.headers };
+            for (const key of Object.keys(resHeaders)) {
+                if (['set-cookie'].includes(key.toLowerCase())) {
+                    resHeaders[key] = '[REDACTED]';
+                }
+            }
+            sanitized.response = { ...sanitized.response, headers: resHeaders };
+        }
+        return sanitized;
+    }
+    safeEmitNetwork(payload) {
+        this.emit('network', this.sanitizeNetworkLog(payload));
+    }
+    enable() {
+        if (this.isInterceptionEnabled)
+            return;
+        this.isInterceptionEnabled = true;
+        this.patchGlobalFetch();
+        this.patchNodeHttp();
+    }
+    patchGlobalFetch() {
+        if (!global.fetch)
+            return;
+        const originalFetch = global.fetch;
+        global.fetch = async (input, init) => {
+            const url = typeof input === 'string'
+                ? input
+                : input instanceof URL
+                    ? input.toString()
+                    : input.url;
+            if (url.includes('127.0.0.1'))
+                return originalFetch(input, init);
+            const id = Math.random().toString(36).substring(7);
+            const method = (init?.method || 'GET').toUpperCase();
+            const newInit = { ...init };
+            const headers = new Headers(init?.headers || {});
+            headers.set(ACTIVITY_ID_HEADER, id);
+            newInit.headers = headers;
+            let reqBody = '';
+            if (init?.body) {
+                if (typeof init.body === 'string')
+                    reqBody = init.body;
+                else if (init.body instanceof URLSearchParams)
+                    reqBody = init.body.toString();
+            }
+            this.requestStartTimes.set(id, Date.now());
+            this.safeEmitNetwork({
+                id,
+                timestamp: Date.now(),
+                method,
+                url,
+                headers: this.stringifyHeaders(newInit.headers),
+                body: reqBody,
+                pending: true,
+            });
+            try {
+                const response = await originalFetch(input, newInit);
+                const clonedRes = response.clone();
+                clonedRes
+                    .text()
+                    .then((text) => {
+                    const startTime = this.requestStartTimes.get(id);
+                    const durationMs = startTime ? Date.now() - startTime : 0;
+                    this.requestStartTimes.delete(id);
+                    this.safeEmitNetwork({
+                        id,
+                        pending: false,
+                        response: {
+                            status: response.status,
+                            headers: this.stringifyHeaders(response.headers),
+                            body: text,
+                            durationMs,
+                        },
+                    });
+                })
+                    .catch((err) => {
+                    const message = err instanceof Error ? err.message : String(err);
+                    this.safeEmitNetwork({
+                        id,
+                        pending: false,
+                        error: `Failed to read response body: ${message}`,
+                    });
+                });
+                return response;
+            }
+            catch (err) {
+                this.requestStartTimes.delete(id);
+                const message = err instanceof Error ? err.message : String(err);
+                this.safeEmitNetwork({ id, pending: false, error: message });
+                throw err;
+            }
+        };
+    }
+    patchNodeHttp() {
+        const self = this;
+        const originalRequest = http.request;
+        const originalHttpsRequest = https.request;
+        const wrapRequest = (originalFn, args, protocol) => {
+            const options = args[0];
+            const url = typeof options === 'string'
+                ? options
+                : options.href ||
+                    `${protocol}//${options.hostname || options.host || 'localhost'}${options.path || '/'}`;
+            if (url.includes('127.0.0.1'))
+                return originalFn.apply(http, args);
+            const headers = typeof options === 'object' && typeof options !== 'function'
+                ? options.headers
+                : {};
+            if (headers && headers[ACTIVITY_ID_HEADER]) {
+                delete headers[ACTIVITY_ID_HEADER];
+                return originalFn.apply(http, args);
+            }
+            const id = Math.random().toString(36).substring(7);
+            self.requestStartTimes.set(id, Date.now());
+            const req = originalFn.apply(http, args);
+            const requestChunks = [];
+            const oldWrite = req.write;
+            const oldEnd = req.end;
+            req.write = function (chunk, ...etc) {
+                if (chunk) {
+                    const encoding = typeof etc[0] === 'string' ? etc[0] : undefined;
+                    requestChunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk, encoding));
+                }
+                return oldWrite.apply(this, [chunk, ...etc]);
+            };
+            req.end = function (chunk, ...etc) {
+                if (chunk && typeof chunk !== 'function') {
+                    const encoding = typeof etc[0] === 'string' ? etc[0] : undefined;
+                    requestChunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk, encoding));
+                }
+                const body = Buffer.concat(requestChunks).toString('utf8');
+                self.safeEmitNetwork({
+                    id,
+                    timestamp: Date.now(),
+                    method: req.method || 'GET',
+                    url,
+                    headers: self.stringifyHeaders(req.getHeaders()),
+                    body,
+                    pending: true,
+                });
+                return oldEnd.apply(this, [chunk, ...etc]);
+            };
+            req.on('response', (res) => {
+                const responseChunks = [];
+                res.on('data', (chunk) => responseChunks.push(Buffer.from(chunk)));
+                res.on('end', () => {
+                    const buffer = Buffer.concat(responseChunks);
+                    const encoding = res.headers['content-encoding'];
+                    const processBuffer = (finalBuffer) => {
+                        const resBody = finalBuffer.toString('utf8');
+                        const startTime = self.requestStartTimes.get(id);
+                        const durationMs = startTime ? Date.now() - startTime : 0;
+                        self.requestStartTimes.delete(id);
+                        self.safeEmitNetwork({
+                            id,
+                            pending: false,
+                            response: {
+                                status: res.statusCode,
+                                headers: self.stringifyHeaders(res.headers),
+                                body: resBody,
+                                durationMs,
+                            },
+                        });
+                    };
+                    if (encoding === 'gzip') {
+                        zlib.gunzip(buffer, (err, decompressed) => {
+                            processBuffer(err ? buffer : decompressed);
+                        });
+                    }
+                    else if (encoding === 'deflate') {
+                        zlib.inflate(buffer, (err, decompressed) => {
+                            processBuffer(err ? buffer : decompressed);
+                        });
+                    }
+                    else {
+                        processBuffer(buffer);
+                    }
+                });
+            });
+            req.on('error', (err) => {
+                self.requestStartTimes.delete(id);
+                const message = err instanceof Error ? err.message : String(err);
+                self.safeEmitNetwork({ id, pending: false, error: message });
+            });
+            return req;
+        };
+        http.request = (...args) => wrapRequest(originalRequest, args, 'http:');
+        https.request = (...args) => wrapRequest(originalHttpsRequest, args, 'https:');
+    }
+    logConsole(payload) {
+        this.emit('console', payload);
+    }
+}
+/**
+ * Registers the activity logger if debug mode and interactive session are enabled.
+ * Captures network and console logs to a session-specific JSONL file.
+ *
+ * @param config The CLI configuration
+ */
+export function registerActivityLogger(config) {
+    if (config.isInteractive() && config.storage && config.getDebugMode()) {
+        const capture = ActivityLogger.getInstance();
+        capture.enable();
+        const logsDir = config.storage.getProjectTempLogsDir();
+        if (!fs.existsSync(logsDir)) {
+            fs.mkdirSync(logsDir, { recursive: true });
+        }
+        const logFile = path.join(logsDir, `session-${config.getSessionId()}.jsonl`);
+        const writeToLog = (type, payload) => {
+            try {
+                const entry = JSON.stringify({
+                    type,
+                    payload,
+                    timestamp: Date.now(),
+                }) + '\n';
+                // Use asynchronous fire-and-forget to avoid blocking the event loop
+                fs.promises.appendFile(logFile, entry).catch((err) => {
+                    debugLogger.error('Failed to write to activity log:', err);
+                });
+            }
+            catch (err) {
+                debugLogger.error('Failed to prepare activity log entry:', err);
+            }
+        };
+        capture.on('console', (payload) => writeToLog('console', payload));
+        capture.on('network', (payload) => writeToLog('network', payload));
+        // Bridge CoreEvents to local capture
+        coreEvents.on(CoreEvent.ConsoleLog, (payload) => {
+            capture.logConsole(payload);
+        });
+    }
+}
+//# sourceMappingURL=activityLogger.js.map

package/dist/src/utils/activityLogger.js.map

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

package/dist/src/utils/cleanup.d.ts

@@ -6,6 +6,11 @@
 import type { Config } from '@google/gemini-cli-core';
 export declare function registerCleanup(fn: (() => void) | (() => Promise<void>)): void;
 export declare function registerSyncCleanup(fn: () => void): void;
+/**
+ * Resets the internal cleanup state for testing purposes.
+ * This allows tests to run in isolation without vi.resetModules().
+ */
+export declare function resetCleanupForTesting(): void;
 export declare function runSyncCleanup(): void;
 /**
  * Register the config instance for telemetry shutdown.

package/dist/src/utils/cleanup.js

@@ -15,6 +15,15 @@ export function registerCleanup(fn) {
 export function registerSyncCleanup(fn) {
     syncCleanupFunctions.push(fn);
 }
+/**
+ * Resets the internal cleanup state for testing purposes.
+ * This allows tests to run in isolation without vi.resetModules().
+ */
+export function resetCleanupForTesting() {
+    cleanupFunctions.length = 0;
+    syncCleanupFunctions.length = 0;
+    configForTelemetry = null;
+}
 export function runSyncCleanup() {
     for (const fn of syncCleanupFunctions) {
         try {
@@ -44,6 +53,14 @@ export async function runExitCleanup() {
         }
     }
     cleanupFunctions.length = 0; // Clear the array
+    if (configForTelemetry) {
+        try {
+            await configForTelemetry.dispose();
+        }
+        catch (_) {
+            // Ignore errors during disposal
+        }
+    }
     // IMPORTANT: Shutdown telemetry AFTER all other cleanup functions have run
     // This ensures SessionEnd hooks and other telemetry are properly flushed
     if (configForTelemetry && isTelemetrySdkInitialized()) {

package/dist/src/utils/cleanup.js.map

@@ -1 +1 @@
-{"version":3,"file":"cleanup.js","sourceRoot":"","sources":["../../../src/utils/cleanup.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,IAAI,EAAE,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EACL,OAAO,EACP,iBAAiB,EACjB,yBAAyB,GAC1B,MAAM,yBAAyB,CAAC;AAGjC,MAAM,gBAAgB,GAAgD,EAAE,CAAC;AACzE,MAAM,oBAAoB,GAAsB,EAAE,CAAC;AACnD,IAAI,kBAAkB,GAAkB,IAAI,CAAC;AAE7C,MAAM,UAAU,eAAe,CAAC,EAAwC;IACtE,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AAC5B,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,EAAc;IAChD,oBAAoB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AAChC,CAAC;AAED,MAAM,UAAU,cAAc;IAC5B,KAAK,MAAM,EAAE,IAAI,oBAAoB,EAAE,CAAC;QACtC,IAAI,CAAC;YACH,EAAE,EAAE,CAAC;QACP,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,gCAAgC;QAClC,CAAC;IACH,CAAC;IACD,oBAAoB,CAAC,MAAM,GAAG,CAAC,CAAC;AAClC,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,uBAAuB,CAAC,MAAc;IACpD,kBAAkB,GAAG,MAAM,CAAC;AAC9B,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,cAAc;IAClC,cAAc,EAAE,CAAC;IACjB,KAAK,MAAM,EAAE,IAAI,gBAAgB,EAAE,CAAC;QAClC,IAAI,CAAC;YACH,MAAM,EAAE,EAAE,CAAC;QACb,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,gCAAgC;QAClC,CAAC;IACH,CAAC;IACD,gBAAgB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,kBAAkB;IAE/C,2EAA2E;IAC3E,yEAAyE;IACzE,IAAI,kBAAkB,IAAI,yBAAyB,EAAE,EAAE,CAAC;QACtD,IAAI,CAAC;YACH,MAAM,iBAAiB,CAAC,kBAAkB,CAAC,CAAC;QAC9C,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,0CAA0C;QAC5C,CAAC;IACH,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB;IACtC,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IAC3C,MAAM,OAAO,GAAG,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAC5C,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IACpD,IAAI,CAAC;QACH,MAAM,EAAE,CAAC,EAAE,CAAC,cAAc,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAChE,CAAC;IAAC,MAAM,CAAC;QACP,mEAAmE;IACrE,CAAC;AACH,CAAC"}
+{"version":3,"file":"cleanup.js","sourceRoot":"","sources":["../../../src/utils/cleanup.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,IAAI,EAAE,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EACL,OAAO,EACP,iBAAiB,EACjB,yBAAyB,GAC1B,MAAM,yBAAyB,CAAC;AAGjC,MAAM,gBAAgB,GAAgD,EAAE,CAAC;AACzE,MAAM,oBAAoB,GAAsB,EAAE,CAAC;AACnD,IAAI,kBAAkB,GAAkB,IAAI,CAAC;AAE7C,MAAM,UAAU,eAAe,CAAC,EAAwC;IACtE,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AAC5B,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,EAAc;IAChD,oBAAoB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AAChC,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,sBAAsB;IACpC,gBAAgB,CAAC,MAAM,GAAG,CAAC,CAAC;IAC5B,oBAAoB,CAAC,MAAM,GAAG,CAAC,CAAC;IAChC,kBAAkB,GAAG,IAAI,CAAC;AAC5B,CAAC;AAED,MAAM,UAAU,cAAc;IAC5B,KAAK,MAAM,EAAE,IAAI,oBAAoB,EAAE,CAAC;QACtC,IAAI,CAAC;YACH,EAAE,EAAE,CAAC;QACP,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,gCAAgC;QAClC,CAAC;IACH,CAAC;IACD,oBAAoB,CAAC,MAAM,GAAG,CAAC,CAAC;AAClC,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,uBAAuB,CAAC,MAAc;IACpD,kBAAkB,GAAG,MAAM,CAAC;AAC9B,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,cAAc;IAClC,cAAc,EAAE,CAAC;IACjB,KAAK,MAAM,EAAE,IAAI,gBAAgB,EAAE,CAAC;QAClC,IAAI,CAAC;YACH,MAAM,EAAE,EAAE,CAAC;QACb,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,gCAAgC;QAClC,CAAC;IACH,CAAC;IACD,gBAAgB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,kBAAkB;IAE/C,IAAI,kBAAkB,EAAE,CAAC;QACvB,IAAI,CAAC;YACH,MAAM,kBAAkB,CAAC,OAAO,EAAE,CAAC;QACrC,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,gCAAgC;QAClC,CAAC;IACH,CAAC;IAED,2EAA2E;IAC3E,yEAAyE;IACzE,IAAI,kBAAkB,IAAI,yBAAyB,EAAE,EAAE,CAAC;QACtD,IAAI,CAAC;YACH,MAAM,iBAAiB,CAAC,kBAAkB,CAAC,CAAC;QAC9C,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,0CAA0C;QAC5C,CAAC;IACH,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB;IACtC,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IAC3C,MAAM,OAAO,GAAG,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAC5C,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IACpD,IAAI,CAAC;QACH,MAAM,EAAE,CAAC,EAAE,CAAC,cAAc,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAChE,CAAC;IAAC,MAAM,CAAC;QACP,mEAAmE;IACrE,CAAC;AACH,CAAC"}

package/dist/src/utils/cleanup.test.js

@@ -10,92 +10,82 @@ vi.mock('@google/gemini-cli-core', () => ({
     Storage: vi.fn().mockImplementation(() => ({
         getProjectTempDir: vi.fn().mockReturnValue('/tmp/project'),
     })),
+    shutdownTelemetry: vi.fn(),
+    isTelemetrySdkInitialized: vi.fn().mockReturnValue(false),
 }));
 vi.mock('node:fs', () => ({
     promises: {
         rm: vi.fn(),
     },
 }));
+import { registerCleanup, runExitCleanup, registerSyncCleanup, runSyncCleanup, cleanupCheckpoints, resetCleanupForTesting, } from './cleanup.js';
 describe('cleanup', () => {
     beforeEach(async () => {
-        vi.resetModules();
         vi.clearAllMocks();
-        // No need to re-assign, we can use the imported functions directly
-        // because we are using vi.resetModules() and re-importing if necessary,
-        // but actually, since we are mocking dependencies, we might not need to re-import cleanup.js
-        // unless it has internal state that needs resetting. It does (cleanupFunctions array).
-        // So we DO need to re-import it to get fresh state.
+        resetCleanupForTesting();
     });
     it('should run a registered synchronous function', async () => {
-        const cleanupModule = await import('./cleanup.js');
         const cleanupFn = vi.fn();
-        cleanupModule.registerCleanup(cleanupFn);
-        await cleanupModule.runExitCleanup();
+        registerCleanup(cleanupFn);
+        await runExitCleanup();
         expect(cleanupFn).toHaveBeenCalledTimes(1);
     });
     it('should run a registered asynchronous function', async () => {
-        const cleanupModule = await import('./cleanup.js');
         const cleanupFn = vi.fn().mockResolvedValue(undefined);
-        cleanupModule.registerCleanup(cleanupFn);
-        await cleanupModule.runExitCleanup();
+        registerCleanup(cleanupFn);
+        await runExitCleanup();
         expect(cleanupFn).toHaveBeenCalledTimes(1);
     });
     it('should run multiple registered functions', async () => {
-        const cleanupModule = await import('./cleanup.js');
         const syncFn = vi.fn();
         const asyncFn = vi.fn().mockResolvedValue(undefined);
-        cleanupModule.registerCleanup(syncFn);
-        cleanupModule.registerCleanup(asyncFn);
-        await cleanupModule.runExitCleanup();
+        registerCleanup(syncFn);
+        registerCleanup(asyncFn);
+        await runExitCleanup();
         expect(syncFn).toHaveBeenCalledTimes(1);
         expect(asyncFn).toHaveBeenCalledTimes(1);
     });
     it('should continue running cleanup functions even if one throws an error', async () => {
-        const cleanupModule = await import('./cleanup.js');
         const errorFn = vi.fn().mockImplementation(() => {
             throw new Error('test error');
         });
         const successFn = vi.fn();
-        cleanupModule.registerCleanup(errorFn);
-        cleanupModule.registerCleanup(successFn);
-        await expect(cleanupModule.runExitCleanup()).resolves.not.toThrow();
+        registerCleanup(errorFn);
+        registerCleanup(successFn);
+        await expect(runExitCleanup()).resolves.not.toThrow();
         expect(errorFn).toHaveBeenCalledTimes(1);
         expect(successFn).toHaveBeenCalledTimes(1);
     });
     describe('sync cleanup', () => {
         it('should run registered sync functions', async () => {
-            const cleanupModule = await import('./cleanup.js');
             const syncFn = vi.fn();
-            cleanupModule.registerSyncCleanup(syncFn);
-            cleanupModule.runSyncCleanup();
+            registerSyncCleanup(syncFn);
+            runSyncCleanup();
             expect(syncFn).toHaveBeenCalledTimes(1);
         });
         it('should continue running sync cleanup functions even if one throws', async () => {
-            const cleanupModule = await import('./cleanup.js');
             const errorFn = vi.fn().mockImplementation(() => {
                 throw new Error('test error');
             });
             const successFn = vi.fn();
-            cleanupModule.registerSyncCleanup(errorFn);
-            cleanupModule.registerSyncCleanup(successFn);
-            expect(() => cleanupModule.runSyncCleanup()).not.toThrow();
+            registerSyncCleanup(errorFn);
+            registerSyncCleanup(successFn);
+            expect(() => runSyncCleanup()).not.toThrow();
             expect(errorFn).toHaveBeenCalledTimes(1);
             expect(successFn).toHaveBeenCalledTimes(1);
         });
     });
     describe('cleanupCheckpoints', () => {
         it('should remove checkpoints directory', async () => {
-            const cleanupModule = await import('./cleanup.js');
-            await cleanupModule.cleanupCheckpoints();
+            await cleanupCheckpoints();
             expect(fs.rm).toHaveBeenCalledWith(path.join('/tmp/project', 'checkpoints'), {
                 recursive: true,
                 force: true,
             });
         });
         it('should ignore errors during checkpoint removal', async () => {
-            const cleanupModule = await import('./cleanup.js');
             vi.mocked(fs.rm).mockRejectedValue(new Error('Failed to remove'));
-            await expect(cleanupModule.cleanupCheckpoints()).resolves.not.toThrow();
+            await expect(cleanupCheckpoints()).resolves.not.toThrow();
         });
     });
 });

package/dist/src/utils/cleanup.test.js.map

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

package/dist/src/utils/resolvePath.js

@@ -3,18 +3,18 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import * as os from 'node:os';
 import * as path from 'node:path';
+import { homedir } from '@google/gemini-cli-core';
 export function resolvePath(p) {
     if (!p) {
         return '';
     }
     let expandedPath = p;
     if (p.toLowerCase().startsWith('%userprofile%')) {
-        expandedPath = os.homedir() + p.substring('%userprofile%'.length);
+        expandedPath = homedir() + p.substring('%userprofile%'.length);
     }
     else if (p === '~' || p.startsWith('~/')) {
-        expandedPath = os.homedir() + p.substring(1);
+        expandedPath = homedir() + p.substring(1);
     }
     return path.normalize(expandedPath);
 }

package/dist/src/utils/resolvePath.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolvePath.js","sourceRoot":"","sources":["../../../src/utils/resolvePath.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAElC,MAAM,UAAU,WAAW,CAAC,CAAS;IACnC,IAAI,CAAC,CAAC,EAAE,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,IAAI,YAAY,GAAG,CAAC,CAAC;IACrB,IAAI,CAAC,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE,CAAC;QAChD,YAAY,GAAG,EAAE,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,SAAS,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;IACpE,CAAC;SAAM,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;QAC3C,YAAY,GAAG,EAAE,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IAC/C,CAAC;IACD,OAAO,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;AACtC,CAAC"}
+{"version":3,"file":"resolvePath.js","sourceRoot":"","sources":["../../../src/utils/resolvePath.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAElD,MAAM,UAAU,WAAW,CAAC,CAAS;IACnC,IAAI,CAAC,CAAC,EAAE,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,IAAI,YAAY,GAAG,CAAC,CAAC;IACrB,IAAI,CAAC,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE,CAAC;QAChD,YAAY,GAAG,OAAO,EAAE,GAAG,CAAC,CAAC,SAAS,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;IACjE,CAAC;SAAM,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;QAC3C,YAAY,GAAG,OAAO,EAAE,GAAG,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IAC5C,CAAC;IACD,OAAO,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;AACtC,CAAC"}

package/dist/src/utils/resolvePath.test.js

@@ -10,6 +10,9 @@ import { resolvePath } from './resolvePath.js';
 vi.mock('node:os', () => ({
     homedir: vi.fn(),
 }));
+vi.mock('@google/gemini-cli-core', () => ({
+    homedir: () => os.homedir(),
+}));
 describe('resolvePath', () => {
     beforeEach(() => {
         vi.mocked(os.homedir).mockReturnValue('/home/user');

package/dist/src/utils/resolvePath.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolvePath.test.js","sourceRoot":"","sources":["../../../src/utils/resolvePath.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAC9D,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,EAAE,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC;IACxB,OAAO,EAAE,EAAE,CAAC,EAAE,EAAE;CACjB,CAAC,CAAC,CAAC;AAEJ,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;IAC3B,UAAU,CAAC,GAAG,EAAE;QACd,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC;IACtD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,IAAI,CAAC;QACN,CAAC,EAAE,EAAE,EAAE,CAAC;QACR,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;QACxC,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;QACzC,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;QACnC,CAAC,mBAAmB,EAAE,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;QACrD,CAAC,mBAAmB,EAAE,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;KACtD,CAAC,CAAC,kCAAkC,EAAE,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE;QACzD,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC5C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kCAAkC,EAAE,GAAG,EAAE;QAC1C,MAAM,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC;IAC3E,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"resolvePath.test.js","sourceRoot":"","sources":["../../../src/utils/resolvePath.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAC9D,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,EAAE,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC;IACxB,OAAO,EAAE,EAAE,CAAC,EAAE,EAAE;CACjB,CAAC,CAAC,CAAC;AAEJ,EAAE,CAAC,IAAI,CAAC,yBAAyB,EAAE,GAAG,EAAE,CAAC,CAAC;IACxC,OAAO,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE;CAC5B,CAAC,CAAC,CAAC;AAEJ,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;IAC3B,UAAU,CAAC,GAAG,EAAE;QACd,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC;IACtD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,IAAI,CAAC;QACN,CAAC,EAAE,EAAE,EAAE,CAAC;QACR,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;QACxC,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;QACzC,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;QACnC,CAAC,mBAAmB,EAAE,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;QACrD,CAAC,mBAAmB,EAAE,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;KACtD,CAAC,CAAC,kCAAkC,EAAE,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE;QACzD,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC5C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kCAAkC,EAAE,GAAG,EAAE;QAC1C,MAAM,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC;IAC3E,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/src/utils/sandbox.js

@@ -4,14 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { exec, execSync, spawn } from 'node:child_process';
-import os from 'node:os';
 import path from 'node:path';
 import fs from 'node:fs';
+import os from 'node:os';
 import { fileURLToPath } from 'node:url';
 import { quote, parse } from 'shell-quote';
-import { USER_SETTINGS_DIR } from '../config/settings.js';
 import { promisify } from 'node:util';
-import { coreEvents, debugLogger, FatalSandboxError, GEMINI_DIR, } from '@google/gemini-cli-core';
+import { coreEvents, debugLogger, FatalSandboxError, GEMINI_DIR, homedir, } from '@google/gemini-cli-core';
 import { ConsolePatcher } from '../ui/utils/ConsolePatcher.js';
 import { randomBytes } from 'node:crypto';
 import { getContainerPath, shouldUseCurrentUserInSandbox, parseImageName, ports, entrypoint, LOCAL_DEV_SANDBOX_IMAGE_NAME, SANDBOX_NETWORK_NAME, SANDBOX_PROXY_NAME, BUILTIN_SEATBELT_PROFILES, } from './sandboxUtils.js';
@@ -49,7 +48,7 @@ export async function start_sandbox(config, nodeArgs = [], cliConfig, cliArgs =
                 '-D',
                 `TMP_DIR=${fs.realpathSync(os.tmpdir())}`,
                 '-D',
-                `HOME_DIR=${fs.realpathSync(os.homedir())}`,
+                `HOME_DIR=${fs.realpathSync(homedir())}`,
                 '-D',
                 `CACHE_DIR=${fs.realpathSync((await execAsync('getconf DARWIN_USER_CACHE_DIR')).stdout.trim())}`,
             ];
@@ -206,19 +205,27 @@ export async function start_sandbox(config, nodeArgs = [], cliConfig, cliArgs =
         args.push('--volume', `${workdir}:${containerWorkdir}`);
         // mount user settings directory inside container, after creating if missing
         // note user/home changes inside sandbox and we mount at BOTH paths for consistency
-        const userSettingsDirOnHost = USER_SETTINGS_DIR;
+        const userHomeDirOnHost = homedir();
         const userSettingsDirInSandbox = getContainerPath(`/home/node/${GEMINI_DIR}`);
+        if (!fs.existsSync(userHomeDirOnHost)) {
+            fs.mkdirSync(userHomeDirOnHost, { recursive: true });
+        }
+        const userSettingsDirOnHost = path.join(userHomeDirOnHost, GEMINI_DIR);
         if (!fs.existsSync(userSettingsDirOnHost)) {
-            fs.mkdirSync(userSettingsDirOnHost);
+            fs.mkdirSync(userSettingsDirOnHost, { recursive: true });
         }
         args.push('--volume', `${userSettingsDirOnHost}:${userSettingsDirInSandbox}`);
-        if (userSettingsDirInSandbox !== userSettingsDirOnHost) {
+        if (userSettingsDirInSandbox !== getContainerPath(userSettingsDirOnHost)) {
             args.push('--volume', `${userSettingsDirOnHost}:${getContainerPath(userSettingsDirOnHost)}`);
         }
         // mount os.tmpdir() as os.tmpdir() inside container
         args.push('--volume', `${os.tmpdir()}:${getContainerPath(os.tmpdir())}`);
+        // mount homedir() as homedir() inside container
+        if (userHomeDirOnHost !== os.homedir()) {
+            args.push('--volume', `${userHomeDirOnHost}:${getContainerPath(userHomeDirOnHost)}`);
+        }
         // mount gcloud config directory if it exists
-        const gcloudConfigDir = path.join(os.homedir(), '.config', 'gcloud');
+        const gcloudConfigDir = path.join(homedir(), '.config', 'gcloud');
         if (fs.existsSync(gcloudConfigDir)) {
             args.push('--volume', `${gcloudConfigDir}:${getContainerPath(gcloudConfigDir)}:ro`);
         }
@@ -424,7 +431,7 @@ export async function start_sandbox(config, nodeArgs = [], cliConfig, cliArgs =
             // necessary on Linux to ensure the user exists within the
             // container's /etc/passwd file, which is required by os.userInfo().
             const username = 'gemini';
-            const homeDir = getContainerPath(os.homedir());
+            const homeDir = getContainerPath(homedir());
             const setupUserCommands = [
                 // Use -f with groupadd to avoid errors if the group already exists.
                 `groupadd -f -g ${gid} ${username}`,
@@ -440,7 +447,7 @@ export async function start_sandbox(config, nodeArgs = [], cliConfig, cliArgs =
             // We still need userFlag for the simpler proxy container, which does not have this issue.
             userFlag = `--user ${uid}:${gid}`;
             // When forcing a UID in the sandbox, $HOME can be reset to '/', so we copy $HOME as well.
-            args.push('--env', `HOME=${os.homedir()}`);
+            args.push('--env', `HOME=${homedir()}`);
         }
         // push container image name
         args.push(image);