Fix stderror not being captured in processed exec and max retries

src/main/kotlin/slack/cli/exec/ProcessedExecCli.kt

@@ -52,6 +52,15 @@ public class ProcessedExecCli :
     option("--config", envvar = "PE_CONFIGURATION_FILE")
       .path(mustExist = true, canBeFile = true, canBeDir = false)
 
+  private val debug by option("--debug", "-d").flag()
+
+  @get:TestOnly
+  private val noExit by
+    option(
+        "--no-exit",
+        help = "Instructs this CLI to not exit the process with the status code. Test only!"
+      )
+      .flag()
   @get:TestOnly internal val parseOnly by option("--parse-only").flag(default = false)
 
   internal val args by argument().multiple()
@@ -76,8 +85,12 @@ public class ProcessedExecCli :
 
     // Initial command execution
     val (exitCode, logFile) = executeCommand(cmd, tmpDir)
-    while (exitCode != 0) {
-      echo("Command failed with exit code $exitCode. Running processor script...")
+    var attempts = 0
+    while (exitCode != 0 && attempts < 1) {
+      attempts++
+      echo(
+        "Command failed with exit code $exitCode. Running processor script (attempt $attempts)..."
+      )
 
       echo("Processing CI failure")
       val resultProcessor = ResultProcessor(verbose, bugsnagKey, config, ::echo)
@@ -114,8 +127,14 @@ public class ProcessedExecCli :
 
     // If we got here, all is well
     // Delete the tmp files
-    tmpDir.deleteRecursively()
-    exitProcess(exitCode)
+    if (!debug) {
+      tmpDir.deleteRecursively()
+    }
+
+    echo("Exiting with code $exitCode")
+    if (!noExit) {
+      exitProcess(exitCode)
+    }
   }
 
   // Function to execute command and capture output. Shorthand to the testable top-level function.
@@ -148,7 +167,7 @@ internal fun executeCommand(
         // Pass the line through unmodified
         line to ""
       }
-      val process = command.process()
+      val process = command.process() forkErr { it pipe echoHandler pipe tmpFile.toFile() }
       pipeline { process pipe echoHandler pipe tmpFile.toFile() }.join()
       exitCode = process.process.pcb.exitCode
     }

src/main/kotlin/slack/cli/exec/ResultProcessor.kt

@@ -54,14 +54,15 @@ internal class ResultProcessor(
     val bugsnag: Bugsnag? by lazy { bugsnagKey?.let { key -> createBugsnag(key) } }
 
     val logLinesReversed = logFile.readLines().asReversed()
+    echo("Checking ${config.knownIssues.size} known issues")
     for (issue in config.knownIssues) {
       val retrySignal = issue.check(logLinesReversed, echo)
 
       if (retrySignal != RetrySignal.Unknown) {
         // Report to bugsnag. Shared common Throwable but with different messages.
-        bugsnag?.apply {
+        bugsnag?.let {
           verboseEcho("Reporting to bugsnag: $retrySignal")
-          notify(IssueThrowable(issue), Severity.ERROR) { report ->
+          it.notify(IssueThrowable(issue), Severity.ERROR) { report ->
             // Group by the throwable message
             report.setGroupingHash(issue.groupingHash)
             report.addToTab("Run Info", "After-Retry", isAfterRetry)
@@ -70,6 +71,7 @@ internal class ResultProcessor(
             }
           }
         }
+          ?: run { verboseEcho("Skipping bugsnag reporting: $retrySignal") }
 
         if (retrySignal is RetrySignal.Ack) {
           echo("Recognized known issue but cannot retry: ${issue.message}")

src/main/kotlin/slack/cli/exec/RetrySignal.kt

@@ -23,13 +23,25 @@ import kotlin.time.Duration
 internal sealed interface RetrySignal {
 
   /** Unknown issue. */
-  @TypeLabel("unknown") object Unknown : RetrySignal
+  @TypeLabel("unknown")
+  object Unknown : RetrySignal {
+    // TODO remove when we have data objects in Kotlin 1.9
+    override fun toString() = this::class.simpleName!!
+  }
 
   /** Indicates an issue that is recognized but cannot be retried. */
-  @TypeLabel("ack") object Ack : RetrySignal
+  @TypeLabel("ack")
+  object Ack : RetrySignal {
+    // TODO remove when we have data objects in Kotlin 1.9
+    override fun toString() = this::class.simpleName!!
+  }
 
   /** Indicates this issue should be retried immediately. */
-  @TypeLabel("immediate") object RetryImmediately : RetrySignal
+  @TypeLabel("immediate")
+  object RetryImmediately : RetrySignal {
+    // TODO remove when we have data objects in Kotlin 1.9
+    override fun toString() = this::class.simpleName!!
+  }
 
   /** Indicates this issue should be retried after a [delay]. */
   @TypeLabel("delayed")

src/test/kotlin/slack/cli/exec/ResultProcessorTest.kt

@@ -48,6 +48,38 @@ class ResultProcessorTest {
     assertThat(logs.joinToString("\n").trim()).contains(expectedOutput)
   }
 
+  @Test
+  fun testExecuteCommandWithStderr() {
+    val script =
+      """
+      #!/bin/bash
+
+      >&2 echo "Error text"
+    """
+        .trimIndent()
+    val scriptFile =
+      tmpFolder.newFile("script.sh").apply {
+        writeText(script)
+        setExecutable(true)
+      }
+    tmpFolder.newFile("test.txt")
+    val tmpDir = tmpFolder.newFolder("tmp/processed_exec")
+    val (exitCode, outputFile) =
+      executeCommand(tmpFolder.root.toPath(), scriptFile.absolutePath, tmpDir.toPath(), logs::add)
+    assertThat(exitCode).isEqualTo(0)
+
+    val expectedOutput =
+      """
+      Error text
+    """
+        .trimIndent()
+
+    assertThat(outputFile.readText().trim()).isEqualTo(expectedOutput)
+
+    // Note we use "contains" here because our script may output additional logs
+    assertThat(logs.joinToString("\n").trim()).contains(expectedOutput)
+  }
+
   @Test
   fun unknownIssue() {
     val outputFile = tmpFolder.newFile("logs.txt")