Send all stderr and stdout to the output channel when a DVC process fails

extension/src/cli/dvc/runner.ts

@@ -164,8 +164,8 @@ export class DvcRunner extends Disposable implements ICli {
         {
           ...baseEvent,
           duration: stopWatch.getElapsedTime(),
-          exitCode,
-          stderr
+          errorOutput: stderr,
+          exitCode
         },
         this.processCompleted
       )

extension/src/cli/index.ts

@@ -1,7 +1,7 @@
 import { Event, EventEmitter } from 'vscode'
 import { getCommandString } from './command'
 import { CliError, MaybeConsoleError } from './error'
-import { notifyCompleted, notifyStarted } from './util'
+import { notifyCompleted, notifyStarted, transformChunkToString } from './util'
 import { createProcess, Process, ProcessOptions } from '../process/execution'
 import { StopWatch } from '../util/time'
 import { Disposable } from '../class/dispose'
@@ -13,7 +13,7 @@ export type CliEvent = {
 }
 
 export type CliResult = CliEvent & {
-  stderr?: string
+  errorOutput?: string
   duration: number
   exitCode: number | null
 }
@@ -72,13 +72,19 @@ export class Cli extends Disposable implements ICli {
 
   protected async executeProcess(options: ProcessOptions): Promise<string> {
     const { baseEvent, stopWatch } = this.getProcessDetails(options)
+    let all = ''
     try {
       const process = this.dispose.track(this.createProcess(baseEvent, options))
 
       void process.on('close', () => {
         void this.dispose.untrack(process)
       })
 
+      process.all?.on(
+        'data',
+        chunk => (all += transformChunkToString(chunk as Buffer))
+      )
+
       const { stdout, exitCode } = await process
 
       notifyCompleted(
@@ -96,18 +102,26 @@ export class Cli extends Disposable implements ICli {
         error as MaybeConsoleError,
         options,
         baseEvent,
-        stopWatch.getElapsedTime()
+        stopWatch.getElapsedTime(),
+        all
       )
     }
   }
 
   protected async createBackgroundProcess(options: ProcessOptions) {
     const { baseEvent, stopWatch } = this.getProcessDetails(options)
+    let all = ''
     try {
       const backgroundProcess = this.createProcess(baseEvent, {
         detached: true,
         ...options
       })
+
+      backgroundProcess.all?.on(
+        'data',
+        chunk => (all += transformChunkToString(chunk as Buffer))
+      )
+
       return await this.getOutputAndDisconnect(
         baseEvent,
         backgroundProcess,
@@ -118,7 +132,8 @@ export class Cli extends Disposable implements ICli {
         error as MaybeConsoleError,
         options,
         baseEvent,
-        stopWatch.getElapsedTime()
+        stopWatch.getElapsedTime(),
+        all
       )
     }
   }
@@ -170,7 +185,8 @@ export class Cli extends Disposable implements ICli {
     error: MaybeConsoleError,
     options: ProcessOptions,
     baseEvent: CliEvent,
-    duration: number
+    duration: number,
+    all: string
   ) {
     const cliError = new CliError({
       baseError: error,
@@ -180,8 +196,8 @@ export class Cli extends Disposable implements ICli {
       {
         ...baseEvent,
         duration,
-        exitCode: cliError.exitCode,
-        stderr: cliError.stderr
+        errorOutput: all || cliError.stderr,
+        exitCode: cliError.exitCode
       },
       this.processCompleted
     )

extension/src/cli/util.ts

@@ -7,31 +7,32 @@ export const notifyStarted = (
   processStarted: EventEmitter<CliEvent>
 ): void => processStarted.fire(baseEvent)
 
+export const transformChunkToString = (chunk: Buffer): string =>
+  chunk
+    .toString()
+    .split(/(\r?\n)/g)
+    .join('\r')
+
 export const notifyOutput = (
   process: Process,
   processOutput: EventEmitter<string>
 ): void => {
   process.all?.on('data', chunk =>
-    processOutput.fire(
-      (chunk as Buffer)
-        .toString()
-        .split(/(\r?\n)/g)
-        .join('\r')
-    )
+    processOutput.fire(transformChunkToString(chunk as Buffer))
   )
 }
 
 export const notifyCompleted = (
-  { command, pid, cwd, duration, exitCode, stderr }: CliResult,
+  { command, pid, cwd, duration, exitCode, errorOutput: stderr }: CliResult,
   processCompleted: EventEmitter<CliResult>
 ): void =>
   processCompleted.fire({
     command,
     cwd,
     duration,
+    errorOutput: stderr?.replace(/\n+/g, '\n'),
     exitCode,
-    pid,
-    stderr: stderr?.replace(/\n+/g, '\n')
+    pid
   })
 
 export const captureStdErr = (process: Process): string => {

extension/src/cli/viewable.ts

@@ -77,8 +77,8 @@ export class ViewableCliProcess extends DeferredDisposable {
         {
           ...baseEvent,
           duration: stopWatch.getElapsedTime(),
-          exitCode,
-          stderr
+          errorOutput: stderr,
+          exitCode
         },
         processCompleted
       )

extension/src/test/suite/vscode/outputChannel.test.ts

@@ -79,10 +79,10 @@ suite('Output Channel Test Suite', () => {
         command: 'some command',
         cwd,
         duration: 20,
+        errorOutput:
+          'THIS IS AN IMPOSSIBLE ERROR. THIS ERROR CANNOT OCCUR. IF THIS ERROR OCCURS, SEE YOUR IBM REPRESENTATIVE.',
         exitCode: -9,
-        pid: 12345,
-        stderr:
-          'THIS IS AN IMPOSSIBLE ERROR. THIS ERROR CANNOT OCCUR. IF THIS ERROR OCCURS, SEE YOUR IBM REPRESENTATIVE.'
+        pid: 12345
       })
 
       expect(mockOutputChannel).to.be.called

extension/src/vscode/outputChannel.ts

@@ -41,15 +41,17 @@ export class OutputChannel extends Disposable {
   private onDidCompleteProcess(cli: ICli) {
     this.dispose.track(
       cli.onDidCompleteProcess(
-        ({ command, duration, exitCode, pid, stderr }) => {
+        ({ command, duration, exitCode, pid, errorOutput }) => {
           const processStatus =
-            exitCode && stderr ? ProcessStatus.FAILED : ProcessStatus.COMPLETED
+            exitCode && errorOutput
+              ? ProcessStatus.FAILED
+              : ProcessStatus.COMPLETED
 
           const baseOutput = this.getBaseOutput(pid, command, processStatus)
           const completionOutput = this.getCompletionOutput(
             exitCode,
             duration,
-            stderr
+            errorOutput
           )
 
           return this.outputChannel.append(`${baseOutput}${completionOutput}\n`)
@@ -75,7 +77,7 @@ export class OutputChannel extends Disposable {
   private getCompletionOutput(
     exitCode: number | null,
     duration: number,
-    stderr?: string
+    errorOutput?: string
   ) {
     let completionOutput = ''
     if (exitCode) {
@@ -84,8 +86,8 @@ export class OutputChannel extends Disposable {
 
     completionOutput += ` (${duration}ms)`
 
-    if (exitCode && stderr) {
-      completionOutput += `\n${stderr}`
+    if (exitCode && errorOutput) {
+      completionOutput += `\n${errorOutput}`
     }
 
     return completionOutput