jcarr
/
gemini-cli
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix SIGPIPE and race condition causing dropping of final output ( "command not found" error) on cloudtops (#429)

This commit is contained in:
Olcan 2025-05-19 13:16:11 -07:00 committed by GitHub
parent 750649eb64
commit e1e59bf0cd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
packages/server/src/tools/shell.ts
View File

@ -141,7 +141,7 @@ export class ShellTool extends BaseTool<ShellToolParams, ToolResult> {
let command = params.command.trim(); let command = params.command.trim();
if (!command.endsWith('&')) command += ';'; if (!command.endsWith('&')) command += ';';
// note the final echo is only to trigger the stderr handler below // note the final echo is only to trigger the stderr handler below
command = `{ ${command} }; pgrep -g 0 >${tempFilePath} 2>&1; echo >&2`; command = `{ ${command} }; pgrep -g 0 >${tempFilePath} 2>&1; ( trap '' PIPE ; echo >&2 )`;
// spawn command in specified directory (or project root if not specified) // spawn command in specified directory (or project root if not specified)
const shell = spawn('bash', ['-c', command], { const shell = spawn('bash', ['-c', command], {
@ -160,16 +160,19 @@ export class ShellTool extends BaseTool<ShellToolParams, ToolResult> {
let stderr = ''; let stderr = '';
shell.stderr.on('data', (data: Buffer) => { shell.stderr.on('data', (data: Buffer) => {
// if the temporary file exists, close the streams and ignore any remaining output let str = data.toString();
// otherwise the streams can remain connected to background processes // if the temporary file exists, close the streams and finalize stdout/stderr
// otherwise these streams can delay termination ('close' event) until all background processes exit
if (fs.existsSync(tempFilePath)) { if (fs.existsSync(tempFilePath)) {
shell.stdout.destroy(); shell.stdout.destroy();
shell.stderr.destroy(); shell.stderr.destroy();
} else { // exclude final \n, which should be from echo >&2 unless there are background processes writing to stderr
const str = data.toString(); if (str.endsWith('\n')) {
str = str.slice(0, -1);
}
}
stderr += str; stderr += str;
output += str; output += str;
}
}); });
let error: Error | null = null; let error: Error | null = null;