fix(cli): gemini command stuck in git bash (#6397)

Co-authored-by: Arya Gummadi <aryagummadi@google.com>
This commit is contained in:
Sudheer Tripathi
2025-08-23 05:49:20 +05:30
committed by GitHub
parent da73f13d02
commit d89f7ea9b5
5 changed files with 198 additions and 78 deletions

View File

@@ -9,86 +9,57 @@ export async function readStdin(): Promise<string> {
return new Promise((resolve, reject) => {
let data = '';
let totalSize = 0;
let hasReceivedData = false;
process.stdin.setEncoding('utf8');
function cleanup() {
clearTimeout(timeout);
const pipedInputShouldBeAvailableInMs = 500;
let pipedInputTimerId: null | NodeJS.Timeout = setTimeout(() => {
// stop reading if input is not available yet, this is needed
// in terminals where stdin is never TTY and nothing's piped
// which causes the program to get stuck expecting data from stdin
onEnd();
}, pipedInputShouldBeAvailableInMs);
const onReadable = () => {
let chunk;
while ((chunk = process.stdin.read()) !== null) {
if (pipedInputTimerId) {
clearTimeout(pipedInputTimerId);
pipedInputTimerId = null;
}
if (totalSize + chunk.length > MAX_STDIN_SIZE) {
const remainingSize = MAX_STDIN_SIZE - totalSize;
data += chunk.slice(0, remainingSize);
console.warn(
`Warning: stdin input truncated to ${MAX_STDIN_SIZE} bytes.`,
);
process.stdin.destroy(); // Stop reading further
break;
}
data += chunk;
totalSize += chunk.length;
}
};
const onEnd = () => {
cleanup();
resolve(data);
};
const onError = (err: Error) => {
cleanup();
reject(err);
};
const cleanup = () => {
if (pipedInputTimerId) {
clearTimeout(pipedInputTimerId);
pipedInputTimerId = null;
}
process.stdin.removeListener('readable', onReadable);
process.stdin.removeListener('end', onEnd);
process.stdin.removeListener('error', onError);
}
function processChunk(chunk: string): boolean {
hasReceivedData = true;
if (totalSize + chunk.length > MAX_STDIN_SIZE) {
const remainingSize = MAX_STDIN_SIZE - totalSize;
data += chunk.slice(0, remainingSize);
console.warn(
`Warning: stdin input truncated to ${MAX_STDIN_SIZE} bytes.`,
);
process.stdin.destroy();
return true; // Indicates truncation occurred
} else {
data += chunk;
totalSize += chunk.length;
return false;
}
}
function checkInitialState(): boolean {
if (process.stdin.destroyed || process.stdin.readableEnded) {
cleanup();
resolve('');
return true;
}
const chunk = process.stdin.read();
if (chunk !== null) {
processChunk(chunk);
return false;
}
if (!process.stdin.readable) {
cleanup();
resolve('');
return true;
}
return false;
}
if (checkInitialState()) {
return;
}
function onReadable() {
let chunk;
while ((chunk = process.stdin.read()) !== null) {
const truncated = processChunk(chunk);
if (truncated) {
break;
}
}
}
function onEnd() {
cleanup();
resolve(data);
}
function onError(err: Error) {
cleanup();
reject(err);
}
const timeout = setTimeout(() => {
if (!hasReceivedData) {
cleanup();
resolve('');
}
}, 50);
};
process.stdin.on('readable', onReadable);
process.stdin.on('end', onEnd);