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

@@ -514,4 +514,24 @@ describe('ShellTool Bug Reproduction', () => {
undefined,
);
});
it('should pass GEMINI_CLI environment variable to executed commands', async () => {
config = {
getCoreTools: () => undefined,
getExcludeTools: () => undefined,
getDebugMode: () => false,
getGeminiClient: () => ({}) as GeminiClient,
getTargetDir: () => '.',
getSummarizeToolOutputConfig: () => ({}),
} as unknown as Config;
shellTool = new ShellTool(config);
const abortSignal = new AbortController().signal;
const result = await shellTool.execute(
{ command: 'echo "$GEMINI_CLI"' },
abortSignal,
);
expect(result.returnDisplay).toBe('1\n');
});
});

View File

@@ -322,11 +322,19 @@ Process Group PGID: Process group started or \`(none)\``,
stdio: ['ignore', 'pipe', 'pipe'],
// detached: true, // ensure subprocess starts its own process group (esp. in Linux)
cwd: path.resolve(this.config.getTargetDir(), params.directory || ''),
env: {
...process.env,
GEMINI_CLI: '1',
},
})
: spawn('bash', ['-c', command], {
stdio: ['ignore', 'pipe', 'pipe'],
detached: true, // ensure subprocess starts its own process group (esp. in Linux)
cwd: path.resolve(this.config.getTargetDir(), params.directory || ''),
env: {
...process.env,
GEMINI_CLI: '1',
},
});
let exited = false;