@google/gemini-cli 0.7.1 → 0.8.0-nightly.20250926.2defdcff

package/dist/src/ui/utils/textUtils.test.js

@@ -0,0 +1,132 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect } from 'vitest';
+import { escapeAnsiCtrlCodes } from './textUtils.js';
+describe('textUtils', () => {
+    describe('escapeAnsiCtrlCodes', () => {
+        describe('escapeAnsiCtrlCodes string case study', () => {
+            it('should replace ANSI escape codes with a visible representation', () => {
+                const text = '\u001b[31mHello\u001b[0m';
+                const expected = '\\u001b[31mHello\\u001b[0m';
+                expect(escapeAnsiCtrlCodes(text)).toBe(expected);
+                const text2 = "sh -e 'good && bad# \u001b[9D\u001b[K && good";
+                const expected2 = "sh -e 'good && bad# \\u001b[9D\\u001b[K && good";
+                expect(escapeAnsiCtrlCodes(text2)).toBe(expected2);
+            });
+            it('should not change a string with no ANSI codes', () => {
+                const text = 'Hello, world!';
+                expect(escapeAnsiCtrlCodes(text)).toBe(text);
+            });
+            it('should handle an empty string', () => {
+                expect(escapeAnsiCtrlCodes('')).toBe('');
+            });
+            describe('toolConfirmationDetails case study', () => {
+                it('should sanitize command and rootCommand for exec type', () => {
+                    const details = {
+                        title: '\u001b[34mfake-title\u001b[0m',
+                        type: 'exec',
+                        command: '\u001b[31mmls -l\u001b[0m',
+                        rootCommand: '\u001b[32msudo apt-get update\u001b[0m',
+                        onConfirm: async () => { },
+                    };
+                    const sanitized = escapeAnsiCtrlCodes(details);
+                    if (sanitized.type === 'exec') {
+                        expect(sanitized.title).toBe('\\u001b[34mfake-title\\u001b[0m');
+                        expect(sanitized.command).toBe('\\u001b[31mmls -l\\u001b[0m');
+                        expect(sanitized.rootCommand).toBe('\\u001b[32msudo apt-get update\\u001b[0m');
+                    }
+                });
+                it('should sanitize properties for edit type', () => {
+                    const details = {
+                        type: 'edit',
+                        title: '\u001b[34mEdit File\u001b[0m',
+                        fileName: '\u001b[31mfile.txt\u001b[0m',
+                        filePath: '/path/to/\u001b[32mfile.txt\u001b[0m',
+                        fileDiff: 'diff --git a/file.txt b/file.txt\n--- a/\u001b[33mfile.txt\u001b[0m\n+++ b/file.txt',
+                        onConfirm: async () => { },
+                    };
+                    const sanitized = escapeAnsiCtrlCodes(details);
+                    if (sanitized.type === 'edit') {
+                        expect(sanitized.title).toBe('\\u001b[34mEdit File\\u001b[0m');
+                        expect(sanitized.fileName).toBe('\\u001b[31mfile.txt\\u001b[0m');
+                        expect(sanitized.filePath).toBe('/path/to/\\u001b[32mfile.txt\\u001b[0m');
+                        expect(sanitized.fileDiff).toBe('diff --git a/file.txt b/file.txt\n--- a/\\u001b[33mfile.txt\\u001b[0m\n+++ b/file.txt');
+                    }
+                });
+                it('should sanitize properties for mcp type', () => {
+                    const details = {
+                        type: 'mcp',
+                        title: '\u001b[34mCloud Run\u001b[0m',
+                        serverName: '\u001b[31mmy-server\u001b[0m',
+                        toolName: '\u001b[32mdeploy\u001b[0m',
+                        toolDisplayName: '\u001b[33mDeploy Service\u001b[0m',
+                        onConfirm: async () => { },
+                    };
+                    const sanitized = escapeAnsiCtrlCodes(details);
+                    if (sanitized.type === 'mcp') {
+                        expect(sanitized.title).toBe('\\u001b[34mCloud Run\\u001b[0m');
+                        expect(sanitized.serverName).toBe('\\u001b[31mmy-server\\u001b[0m');
+                        expect(sanitized.toolName).toBe('\\u001b[32mdeploy\\u001b[0m');
+                        expect(sanitized.toolDisplayName).toBe('\\u001b[33mDeploy Service\\u001b[0m');
+                    }
+                });
+                it('should sanitize properties for info type', () => {
+                    const details = {
+                        type: 'info',
+                        title: '\u001b[34mWeb Search\u001b[0m',
+                        prompt: '\u001b[31mSearch for cats\u001b[0m',
+                        urls: ['https://\u001b[32mgoogle.com\u001b[0m'],
+                        onConfirm: async () => { },
+                    };
+                    const sanitized = escapeAnsiCtrlCodes(details);
+                    if (sanitized.type === 'info') {
+                        expect(sanitized.title).toBe('\\u001b[34mWeb Search\\u001b[0m');
+                        expect(sanitized.prompt).toBe('\\u001b[31mSearch for cats\\u001b[0m');
+                        expect(sanitized.urls?.[0]).toBe('https://\\u001b[32mgoogle.com\\u001b[0m');
+                    }
+                });
+            });
+            it('should not change the object if no sanitization is needed', () => {
+                const details = {
+                    type: 'info',
+                    title: 'Web Search',
+                    prompt: 'Search for cats',
+                    urls: ['https://google.com'],
+                    onConfirm: async () => { },
+                };
+                const sanitized = escapeAnsiCtrlCodes(details);
+                expect(sanitized).toBe(details);
+            });
+            it('should handle nested objects and arrays', () => {
+                const details = {
+                    a: '\u001b[31mred\u001b[0m',
+                    b: {
+                        c: '\u001b[32mgreen\u001b[0m',
+                        d: ['\u001b[33myellow\u001b[0m', { e: '\u001b[34mblue\u001b[0m' }],
+                    },
+                    f: 123,
+                    g: null,
+                    h: () => '\u001b[35mpurple\u001b[0m',
+                };
+                const sanitized = escapeAnsiCtrlCodes(details);
+                expect(sanitized.a).toBe('\\u001b[31mred\\u001b[0m');
+                if (typeof sanitized.b === 'object' && sanitized.b !== null) {
+                    const b = sanitized.b;
+                    expect(b.c).toBe('\\u001b[32mgreen\\u001b[0m');
+                    expect(b.d[0]).toBe('\\u001b[33myellow\\u001b[0m');
+                    if (typeof b.d[1] === 'object' && b.d[1] !== null) {
+                        const e = b.d[1];
+                        expect(e.e).toBe('\\u001b[34mblue\\u001b[0m');
+                    }
+                }
+                expect(sanitized.f).toBe(123);
+                expect(sanitized.g).toBe(null);
+                expect(sanitized.h()).toBe('\u001b[35mpurple\u001b[0m');
+            });
+        });
+    });
+});
+//# sourceMappingURL=textUtils.test.js.map

package/dist/src/ui/utils/textUtils.test.js.map

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

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

@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { MergeStrategy } from '../config/settingsSchema.js';
-type Mergeable = string | number | boolean | null | undefined | object | Mergeable[];
-type MergeableObject = Record<string, Mergeable>;
+export type Mergeable = string | number | boolean | null | undefined | object | Mergeable[];
+export type MergeableObject = Record<string, Mergeable>;
 export declare function customDeepMerge(getMergeStrategyForPath: (path: string[]) => MergeStrategy | undefined, ...sources: MergeableObject[]): MergeableObject;
-export {};

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

@@ -0,0 +1,7 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export declare function relaunchOnExitCode(runner: () => Promise<number>): Promise<void>;
+export declare function relaunchAppInChildProcess(additionalNodeArgs: string[], additionalScriptArgs: string[]): Promise<void>;

package/dist/src/utils/relaunch.js

@@ -0,0 +1,57 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { spawn } from 'node:child_process';
+import { RELAUNCH_EXIT_CODE } from './processUtils.js';
+export async function relaunchOnExitCode(runner) {
+    while (true) {
+        try {
+            const exitCode = await runner();
+            if (exitCode !== RELAUNCH_EXIT_CODE) {
+                process.exit(exitCode);
+            }
+        }
+        catch (error) {
+            process.stdin.resume();
+            console.error('Fatal error: Failed to relaunch the CLI process.', error);
+            process.exit(1);
+        }
+    }
+}
+export async function relaunchAppInChildProcess(additionalNodeArgs, additionalScriptArgs) {
+    if (process.env['GEMINI_CLI_NO_RELAUNCH']) {
+        return;
+    }
+    const runner = () => {
+        // process.argv is [node, script, ...args]
+        // We want to construct [ ...nodeArgs, script, ...scriptArgs]
+        const script = process.argv[1];
+        const scriptArgs = process.argv.slice(2);
+        const nodeArgs = [
+            ...process.execArgv,
+            ...additionalNodeArgs,
+            script,
+            ...additionalScriptArgs,
+            ...scriptArgs,
+        ];
+        const newEnv = { ...process.env, GEMINI_CLI_NO_RELAUNCH: 'true' };
+        // The parent process should not be reading from stdin while the child is running.
+        process.stdin.pause();
+        const child = spawn(process.execPath, nodeArgs, {
+            stdio: 'inherit',
+            env: newEnv,
+        });
+        return new Promise((resolve, reject) => {
+            child.on('error', reject);
+            child.on('close', (code) => {
+                // Resume stdin before the parent process exits.
+                process.stdin.resume();
+                resolve(code ?? 1);
+            });
+        });
+    };
+    await relaunchOnExitCode(runner);
+}
+//# sourceMappingURL=relaunch.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"relaunch.js","sourceRoot":"","sources":["../../../src/utils/relaunch.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAEvD,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,MAA6B;IACpE,OAAO,IAAI,EAAE,CAAC;QACZ,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,MAAM,EAAE,CAAC;YAEhC,IAAI,QAAQ,KAAK,kBAAkB,EAAE,CAAC;gBACpC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACzB,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;YACvB,OAAO,CAAC,KAAK,CAAC,kDAAkD,EAAE,KAAK,CAAC,CAAC;YACzE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;IACH,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC7C,kBAA4B,EAC5B,oBAA8B;IAE9B,IAAI,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,EAAE,CAAC;QAC1C,OAAO;IACT,CAAC;IAED,MAAM,MAAM,GAAG,GAAG,EAAE;QAClB,0CAA0C;QAC1C,6DAA6D;QAC7D,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC/B,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAEzC,MAAM,QAAQ,GAAG;YACf,GAAG,OAAO,CAAC,QAAQ;YACnB,GAAG,kBAAkB;YACrB,MAAM;YACN,GAAG,oBAAoB;YACvB,GAAG,UAAU;SACd,CAAC;QACF,MAAM,MAAM,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,sBAAsB,EAAE,MAAM,EAAE,CAAC;QAElE,kFAAkF;QAClF,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QAEtB,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,QAAQ,EAAE;YAC9C,KAAK,EAAE,SAAS;YAChB,GAAG,EAAE,MAAM;SACZ,CAAC,CAAC;QAEH,OAAO,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC7C,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAC1B,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE;gBACzB,gDAAgD;gBAChD,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;gBACvB,OAAO,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC;YACrB,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,MAAM,kBAAkB,CAAC,MAAM,CAAC,CAAC;AACnC,CAAC"}

package/dist/src/utils/relaunch.test.d.ts

@@ -0,0 +1,6 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export {};

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

@@ -0,0 +1,273 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { vi, describe, it, expect, beforeEach, afterEach, } from 'vitest';
+import { EventEmitter } from 'node:events';
+import { RELAUNCH_EXIT_CODE } from './processUtils.js';
+import { spawn } from 'node:child_process';
+vi.mock('node:child_process', async (importOriginal) => {
+    const actual = await importOriginal();
+    return {
+        ...actual,
+        spawn: vi.fn(),
+    };
+});
+const mockedSpawn = vi.mocked(spawn);
+// Import the functions initially
+import { relaunchAppInChildProcess, relaunchOnExitCode } from './relaunch.js';
+describe('relaunchOnExitCode', () => {
+    let processExitSpy;
+    let consoleErrorSpy;
+    let stdinResumeSpy;
+    beforeEach(() => {
+        processExitSpy = vi.spyOn(process, 'exit').mockImplementation(() => {
+            throw new Error('PROCESS_EXIT_CALLED');
+        });
+        consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => { });
+        stdinResumeSpy = vi
+            .spyOn(process.stdin, 'resume')
+            .mockImplementation(() => process.stdin);
+        vi.clearAllMocks();
+    });
+    afterEach(() => {
+        processExitSpy.mockRestore();
+        consoleErrorSpy.mockRestore();
+        stdinResumeSpy.mockRestore();
+    });
+    it('should exit with non-RELAUNCH_EXIT_CODE', async () => {
+        const runner = vi.fn().mockResolvedValue(0);
+        await expect(relaunchOnExitCode(runner)).rejects.toThrow('PROCESS_EXIT_CALLED');
+        expect(runner).toHaveBeenCalledTimes(1);
+        expect(processExitSpy).toHaveBeenCalledWith(0);
+    });
+    it('should continue running when RELAUNCH_EXIT_CODE is returned', async () => {
+        let callCount = 0;
+        const runner = vi.fn().mockImplementation(async () => {
+            callCount++;
+            if (callCount === 1)
+                return RELAUNCH_EXIT_CODE;
+            if (callCount === 2)
+                return RELAUNCH_EXIT_CODE;
+            return 0; // Exit on third call
+        });
+        await expect(relaunchOnExitCode(runner)).rejects.toThrow('PROCESS_EXIT_CALLED');
+        expect(runner).toHaveBeenCalledTimes(3);
+        expect(processExitSpy).toHaveBeenCalledWith(0);
+    });
+    it('should handle runner errors', async () => {
+        const error = new Error('Runner failed');
+        const runner = vi.fn().mockRejectedValue(error);
+        await expect(relaunchOnExitCode(runner)).rejects.toThrow('PROCESS_EXIT_CALLED');
+        expect(runner).toHaveBeenCalledTimes(1);
+        expect(consoleErrorSpy).toHaveBeenCalledWith('Fatal error: Failed to relaunch the CLI process.', error);
+        expect(stdinResumeSpy).toHaveBeenCalled();
+        expect(processExitSpy).toHaveBeenCalledWith(1);
+    });
+});
+describe('relaunchAppInChildProcess', () => {
+    let processExitSpy;
+    let consoleErrorSpy;
+    let stdinPauseSpy;
+    let stdinResumeSpy;
+    // Store original values to restore later
+    const originalEnv = { ...process.env };
+    const originalExecArgv = [...process.execArgv];
+    const originalArgv = [...process.argv];
+    const originalExecPath = process.execPath;
+    beforeEach(() => {
+        vi.clearAllMocks();
+        process.env = { ...originalEnv };
+        delete process.env['GEMINI_CLI_NO_RELAUNCH'];
+        process.execArgv = [...originalExecArgv];
+        process.argv = [...originalArgv];
+        process.execPath = '/usr/bin/node';
+        processExitSpy = vi.spyOn(process, 'exit').mockImplementation(() => {
+            throw new Error('PROCESS_EXIT_CALLED');
+        });
+        consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => { });
+        stdinPauseSpy = vi
+            .spyOn(process.stdin, 'pause')
+            .mockImplementation(() => process.stdin);
+        stdinResumeSpy = vi
+            .spyOn(process.stdin, 'resume')
+            .mockImplementation(() => process.stdin);
+    });
+    afterEach(() => {
+        process.env = { ...originalEnv };
+        process.execArgv = [...originalExecArgv];
+        process.argv = [...originalArgv];
+        process.execPath = originalExecPath;
+        processExitSpy.mockRestore();
+        consoleErrorSpy.mockRestore();
+        stdinPauseSpy.mockRestore();
+        stdinResumeSpy.mockRestore();
+    });
+    describe('when GEMINI_CLI_NO_RELAUNCH is set', () => {
+        it('should return early without spawning a child process', async () => {
+            process.env['GEMINI_CLI_NO_RELAUNCH'] = 'true';
+            await relaunchAppInChildProcess(['--test'], ['--verbose']);
+            expect(mockedSpawn).not.toHaveBeenCalled();
+            expect(processExitSpy).not.toHaveBeenCalled();
+        });
+    });
+    describe('when GEMINI_CLI_NO_RELAUNCH is not set', () => {
+        beforeEach(() => {
+            delete process.env['GEMINI_CLI_NO_RELAUNCH'];
+        });
+        it('should construct correct node arguments from execArgv, additionalNodeArgs, script, additionalScriptArgs, and argv', () => {
+            // Test the argument construction logic directly by extracting it into a testable function
+            // This tests the same logic that's used in relaunchAppInChildProcess
+            // Setup test data to verify argument ordering
+            const mockExecArgv = ['--inspect=9229', '--trace-warnings'];
+            const mockArgv = [
+                '/usr/bin/node',
+                '/path/to/cli.js',
+                'command',
+                '--flag=value',
+                '--verbose',
+            ];
+            const additionalNodeArgs = [
+                '--max-old-space-size=4096',
+                '--experimental-modules',
+            ];
+            const additionalScriptArgs = ['--model', 'gemini-1.5-pro', '--debug'];
+            // Extract the argument construction logic from relaunchAppInChildProcess
+            const script = mockArgv[1];
+            const scriptArgs = mockArgv.slice(2);
+            const nodeArgs = [
+                ...mockExecArgv,
+                ...additionalNodeArgs,
+                script,
+                ...additionalScriptArgs,
+                ...scriptArgs,
+            ];
+            // Verify the argument construction follows the expected pattern:
+            // [...process.execArgv, ...additionalNodeArgs, script, ...additionalScriptArgs, ...scriptArgs]
+            const expectedArgs = [
+                // Original node execution arguments
+                '--inspect=9229',
+                '--trace-warnings',
+                // Additional node arguments passed to function
+                '--max-old-space-size=4096',
+                '--experimental-modules',
+                // The script path
+                '/path/to/cli.js',
+                // Additional script arguments passed to function
+                '--model',
+                'gemini-1.5-pro',
+                '--debug',
+                // Original script arguments (everything after the script in process.argv)
+                'command',
+                '--flag=value',
+                '--verbose',
+            ];
+            expect(nodeArgs).toEqual(expectedArgs);
+        });
+        it('should handle empty additional arguments correctly', () => {
+            // Test edge cases with empty arrays
+            const mockExecArgv = ['--trace-warnings'];
+            const mockArgv = ['/usr/bin/node', '/app/cli.js', 'start'];
+            const additionalNodeArgs = [];
+            const additionalScriptArgs = [];
+            // Extract the argument construction logic
+            const script = mockArgv[1];
+            const scriptArgs = mockArgv.slice(2);
+            const nodeArgs = [
+                ...mockExecArgv,
+                ...additionalNodeArgs,
+                script,
+                ...additionalScriptArgs,
+                ...scriptArgs,
+            ];
+            const expectedArgs = ['--trace-warnings', '/app/cli.js', 'start'];
+            expect(nodeArgs).toEqual(expectedArgs);
+        });
+        it('should handle complex argument patterns', () => {
+            // Test with various argument types including flags with values, boolean flags, etc.
+            const mockExecArgv = ['--max-old-space-size=8192'];
+            const mockArgv = [
+                '/usr/bin/node',
+                '/cli.js',
+                '--config=/path/to/config.json',
+                '--verbose',
+                'subcommand',
+                '--output',
+                'file.txt',
+            ];
+            const additionalNodeArgs = ['--inspect-brk=9230'];
+            const additionalScriptArgs = ['--model=gpt-4', '--temperature=0.7'];
+            const script = mockArgv[1];
+            const scriptArgs = mockArgv.slice(2);
+            const nodeArgs = [
+                ...mockExecArgv,
+                ...additionalNodeArgs,
+                script,
+                ...additionalScriptArgs,
+                ...scriptArgs,
+            ];
+            const expectedArgs = [
+                '--max-old-space-size=8192',
+                '--inspect-brk=9230',
+                '/cli.js',
+                '--model=gpt-4',
+                '--temperature=0.7',
+                '--config=/path/to/config.json',
+                '--verbose',
+                'subcommand',
+                '--output',
+                'file.txt',
+            ];
+            expect(nodeArgs).toEqual(expectedArgs);
+        });
+        // Note: Additional integration tests for spawn behavior are complex due to module mocking
+        // limitations with ES modules. The core logic is tested in relaunchOnExitCode tests.
+        it('should handle null exit code from child process', async () => {
+            process.argv = ['/usr/bin/node', '/app/cli.js'];
+            const mockChild = createMockChildProcess(0, false); // Don't auto-close
+            mockedSpawn.mockImplementation(() => {
+                // Emit close with null code immediately
+                setImmediate(() => {
+                    mockChild.emit('close', null);
+                });
+                return mockChild;
+            });
+            // Start the relaunch process
+            const promise = relaunchAppInChildProcess([], []);
+            await expect(promise).rejects.toThrow('PROCESS_EXIT_CALLED');
+            // Should default to exit code 1
+            expect(processExitSpy).toHaveBeenCalledWith(1);
+        });
+    });
+});
+/**
+ * Creates a mock child process that emits events asynchronously
+ */
+function createMockChildProcess(exitCode = 0, autoClose = false) {
+    const mockChild = new EventEmitter();
+    Object.assign(mockChild, {
+        stdin: null,
+        stdout: null,
+        stderr: null,
+        stdio: [null, null, null],
+        pid: 12345,
+        killed: false,
+        exitCode: null,
+        signalCode: null,
+        spawnargs: [],
+        spawnfile: '',
+        kill: vi.fn(),
+        send: vi.fn(),
+        disconnect: vi.fn(),
+        unref: vi.fn(),
+        ref: vi.fn(),
+    });
+    if (autoClose) {
+        setImmediate(() => {
+            mockChild.emit('close', exitCode);
+        });
+    }
+    return mockChild;
+}
+//# sourceMappingURL=relaunch.test.js.map

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

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

package/dist/src/utils/sandbox.js

@@ -14,6 +14,7 @@ import { USER_SETTINGS_DIR, SETTINGS_DIRECTORY_NAME, } from '../config/settings.
 import { promisify } from 'node:util';
 import { FatalSandboxError } from '@google/gemini-cli-core';
 import { ConsolePatcher } from '../ui/utils/ConsolePatcher.js';
+import { randomBytes } from 'node:crypto';
 const execAsync = promisify(exec);
 function getContainerPath(hostPath) {
     if (os.platform() !== 'win32') {
@@ -423,17 +424,30 @@ export async function start_sandbox(config, nodeArgs = [], cliConfig, cliArgs =
                 }
             }
         }
-        // name container after image, plus numeric suffix to avoid conflicts
+        // name container after image, plus random suffix to avoid conflicts
         const imageName = parseImageName(image);
-        let index = 0;
-        const containerNameCheck = execSync(`${config.command} ps -a --format "{{.Names}}"`)
-            .toString()
-            .trim();
-        while (containerNameCheck.includes(`${imageName}-${index}`)) {
-            index++;
-        }
-        const containerName = `${imageName}-${index}`;
+        const isIntegrationTest = process.env['GEMINI_CLI_INTEGRATION_TEST'] === 'true';
+        let containerName;
+        if (isIntegrationTest) {
+            containerName = `gemini-cli-integration-test-${randomBytes(4).toString('hex')}`;
+            console.log(`ContainerName: ${containerName}`);
+        }
+        else {
+            let index = 0;
+            const containerNameCheck = execSync(`${config.command} ps -a --format "{{.Names}}"`)
+                .toString()
+                .trim();
+            while (containerNameCheck.includes(`${imageName}-${index}`)) {
+                index++;
+            }
+            containerName = `${imageName}-${index}`;
+            console.log(`ContainerName (regular): ${containerName}`);
+        }
         args.push('--name', containerName, '--hostname', containerName);
+        // copy GEMINI_CLI_TEST_VAR for integration tests
+        if (process.env['GEMINI_CLI_TEST_VAR']) {
+            args.push('--env', `GEMINI_CLI_TEST_VAR=${process.env['GEMINI_CLI_TEST_VAR']}`);
+        }
         // copy GEMINI_API_KEY(s)
         if (process.env['GEMINI_API_KEY']) {
             args.push('--env', `GEMINI_API_KEY=${process.env['GEMINI_API_KEY']}`);