MediaMetz/gemini-cli
1
0
Fork 0
mirror of https://github.com/google-gemini/gemini-cli.git synced 2026-04-15 15:50:35 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix(core): ensure file stream output dir exists and test uses explicit tool output path

Browse Source
This commit is contained in:
Spencer
2026-04-10 03:46:49 +00:00
parent 3d1c2e849c
commit c1297436b9
2 changed files with 21 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
integration-tests/run_shell_command_file_stream.test.ts
View File

@@ -48,36 +48,18 @@ describe('run_shell_command streaming to file regression', () => {
await rig.run({ args: prompt });
let savedFilePath = '';
const tmpdir = path.join(rig.homeDir!, '.gemini', 'tmp');
if (fs.existsSync(tmpdir)) {
const findFiles = (dir: string): string[] => {
let results: string[] = [];
const list = fs.readdirSync(dir, { withFileTypes: true });
for (const file of list) {
const fullPath = path.join(dir, file.name);
if (file.isDirectory()) {
results = results.concat(findFiles(fullPath));
} else if (file.isFile() && file.name.endsWith('.txt')) {
results.push(fullPath);
}
}
return results;
};
const files = findFiles(tmpdir);
for (const p of files) {
const stat = fs.statSync(p);
if (Date.now() - stat.mtimeMs < 60000 && stat.size >= 20000000) {
savedFilePath = p;
break;
}
}
}
const toolLogs = rig.readToolLogs();
const shellCall = toolLogs.find(
(log) => log.toolRequest.name === 'run_shell_command',
);
expect(shellCall).toBeTruthy();
savedFilePath = shellCall?.toolResponse?.result?.outputFile;
expect(
savedFilePath,
`Expected to find a saved output file >= 20MB in ${tmpdir}`,
`Expected the tool response to contain an outputFile`,
).toBeTruthy();
const savedContent = fs.readFileSync(savedFilePath, 'utf8');
expect(savedContent).toContain(startMarker);
expect(savedContent).toContain(endMarker);
@@ -117,45 +99,18 @@ describe('run_shell_command streaming to file regression', () => {
await rig.run({ args: prompt });
let savedFilePath = '';
const tmpdir = path.join(rig.homeDir!, '.gemini', 'tmp');
if (fs.existsSync(tmpdir)) {
const findFiles = (dir: string): string[] => {
let results: string[] = [];
const list = fs.readdirSync(dir, { withFileTypes: true });
for (const file of list) {
const fullPath = path.join(dir, file.name);
if (file.isDirectory()) {
results = results.concat(findFiles(fullPath));
} else if (file.isFile() && file.name.endsWith('.txt')) {
results.push(fullPath);
}
}
return results;
};
const files = findFiles(tmpdir);
const fileStats = files.map((p) => ({
p,
size: fs.statSync(p).size,
age: Date.now() - fs.statSync(p).mtimeMs,
}));
for (const p of files) {
const stat = fs.statSync(p);
// Look for file >= 20MB (since we expect 50MB, but allowing margin for the bug)
if (Date.now() - stat.mtimeMs < 60000 && stat.size >= 20000000) {
savedFilePath = p;
break;
}
}
if (!savedFilePath) {
console.error('Available files:', JSON.stringify(fileStats, null, 2));
}
}
const toolLogs = rig.readToolLogs();
const shellCall = toolLogs.find(
(log) => log.toolRequest.name === 'run_shell_command',
);
expect(shellCall).toBeTruthy();
savedFilePath = shellCall?.toolResponse?.result?.outputFile;
expect(
savedFilePath,
`Expected to find a saved output file >= 20MB in ${tmpdir}`,
`Expected the tool response to contain an outputFile`,
).toBeTruthy();
const savedContent = fs.readFileSync(savedFilePath, 'utf8');
expect(savedContent).toContain(startMarker);
expect(savedContent).toContain(endMarker);

7
packages/core/src/tools/shell.ts
View File

@@ -466,7 +466,9 @@ export class ShellToolInvocation extends BaseToolInvocation<
const onAbort = () => combinedController.abort();
const outputFileName = `gemini_shell_output_${crypto.randomBytes(6).toString('hex')}.log`;
const outputFilePath = path.join(os.tmpdir(), outputFileName);
const projectTempDir = this.context.config.storage.getProjectTempDir();
fs.mkdirSync(projectTempDir, { recursive: true });
const outputFilePath = path.join(projectTempDir, outputFileName);
const outputStream = fs.createWriteStream(outputFilePath);
let fullOutputReturned = false;
@@ -669,7 +671,8 @@ export class ShellToolInvocation extends BaseToolInvocation<
}
const result = await resultPromise;
await new Promise<void>((resolve) => {
await new Promise<void>((resolve, reject) => {
outputStream.on('error', reject);
outputStream.end(resolve);
});