feat: add GEMINI_CLI environment variable to spawned shell commands (#4791)

This commit is contained in:
Daniel Lee
2025-07-24 10:13:00 -07:00
committed by GitHub
parent 52980510c9
commit 3dd6e431df
6 changed files with 54 additions and 3 deletions

View File

@@ -6,6 +6,8 @@
import { act, renderHook } from '@testing-library/react';
import { vi } from 'vitest';
import { spawn } from 'child_process';
import type { ChildProcessWithoutNullStreams } from 'child_process';
import { useShellCommandProcessor } from './shellCommandProcessor';
import { Config, GeminiClient } from '@google/gemini-cli-core';
import * as fs from 'fs';
@@ -39,12 +41,13 @@ describe('useShellCommandProcessor', () => {
let configMock: Config;
let geminiClientMock: GeminiClient;
beforeEach(async () => {
const { spawn } = await import('child_process');
beforeEach(() => {
spawnEmitter = new EventEmitter();
spawnEmitter.stdout = new EventEmitter();
spawnEmitter.stderr = new EventEmitter();
(spawn as vi.Mock).mockReturnValue(spawnEmitter);
vi.mocked(spawn).mockReturnValue(
spawnEmitter as ChildProcessWithoutNullStreams,
);
vi.spyOn(fs, 'existsSync').mockReturnValue(false);
vi.spyOn(fs, 'readFileSync').mockReturnValue('');
@@ -88,6 +91,16 @@ describe('useShellCommandProcessor', () => {
result.current.handleShellCommand('ls -l', abortController.signal);
});
expect(spawn).toHaveBeenCalledWith(
'bash',
['-c', expect.any(String)],
expect.objectContaining({
env: expect.objectContaining({
GEMINI_CLI: '1',
}),
}),
);
expect(onExecMock).toHaveBeenCalledTimes(1);
const execPromise = onExecMock.mock.calls[0][0];

View File

@@ -72,6 +72,10 @@ function executeShellCommand(
cwd,
stdio: ['ignore', 'pipe', 'pipe'],
detached: !isWindows, // Use process groups on non-Windows for robust killing
env: {
...process.env,
GEMINI_CLI: '1',
},
});
// Use decoders to handle multi-byte characters safely (for streaming output).