From 1a2906a8ad6e9cf7a68441c956af91d189eff417 Mon Sep 17 00:00:00 2001 From: Gal Zahavi <38544478+galz10@users.noreply.github.com> Date: Fri, 15 Aug 2025 10:27:33 -0700 Subject: Revert #6088 (#6328) --- packages/cli/src/ui/hooks/shellCommandProcessor.ts | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'packages/cli/src/ui/hooks/shellCommandProcessor.ts') diff --git a/packages/cli/src/ui/hooks/shellCommandProcessor.ts b/packages/cli/src/ui/hooks/shellCommandProcessor.ts index 537b21ac..08df0a74 100644 --- a/packages/cli/src/ui/hooks/shellCommandProcessor.ts +++ b/packages/cli/src/ui/hooks/shellCommandProcessor.ts @@ -104,6 +104,7 @@ export const useShellCommandProcessor = ( const execPromise = new Promise((resolve) => { let lastUpdateTime = Date.now(); let cumulativeStdout = ''; + let cumulativeStderr = ''; let isBinaryStream = false; let binaryBytesReceived = 0; @@ -141,7 +142,11 @@ export const useShellCommandProcessor = ( case 'data': // Do not process text data if we've already switched to binary mode. if (isBinaryStream) break; - cumulativeStdout = event.chunk; + if (event.stream === 'stdout') { + cumulativeStdout += event.chunk; + } else { + cumulativeStderr += event.chunk; + } break; case 'binary_detected': isBinaryStream = true; @@ -167,7 +172,9 @@ export const useShellCommandProcessor = ( '[Binary output detected. Halting stream...]'; } } else { - currentDisplayOutput = cumulativeStdout; + currentDisplayOutput = + cumulativeStdout + + (cumulativeStderr ? `\n${cumulativeStderr}` : ''); } // Throttle pending UI updates to avoid excessive re-renders. -- cgit v1.2.3