fix: exit handling for invalid manifest

Signed-off-by: Sam Gammon <[email protected]>

Author: sgammon

packages/cli/src/main/kotlin/elide/tool/cli/AbstractToolCommand.kt

@@ -181,26 +181,27 @@ abstract class AbstractToolCommand<Context>:
           if (err != null && HandledExit.isHandledExit(err)) {
             throw err  // re-throw for outer
           }
-          val (emitStackAndLog, rethrow) = when (err) {
-            null -> true to true
+          val (emitStackAndLog, rethrow, subject) = when (err) {
+            null -> Triple(true, true, err)
             is PackageManifestService.ManifestInvalid -> {
               if (Statics.noColor) {
-                logging.error(err.message)
+                Statics.terminal.println(err.message)
               } else {
-                logging.error(TextColors.red(err.message ?: "Project manifest error"))
+                Statics.terminal.println(TextColors.red(err.message ?: "Project manifest error"))
               }
 
-              false to false
+              // exit with code 3; do not provide a cause message otherwise it will be logged
+              Triple(false, false, HandledExit.create(3))
             }
-            else -> true to true
+            else -> Triple(true, true, err)
           }
           if (emitStackAndLog) {
             val stack = err?.stackTrace?.joinToString("\n") ?: "(unknown)"
             val label = err ?: "(unknown)"
             logging.error("Uncaught fatal exception: $label\n$stack")
           }
           exit.set(1)
-          if (err != null && rethrow) throw err
+          if (err != null && rethrow) throw (subject ?: err)
         }
       }
     }

packages/cli/src/main/kotlin/elide/tool/cli/cmd/repl/HandledExit.kt

@@ -27,7 +27,15 @@ internal class HandledExit private constructor (
     }
 
     @JvmStatic fun notify(exitCode: Int, message: String? = null, cause: Throwable? = null): Nothing {
-      throw HandledExit(
+      throw create(
+        exitCode = exitCode,
+        message = message,
+        cause = cause,
+      )
+    }
+
+    @JvmStatic fun create(exitCode: Int, message: String? = null, cause: Throwable? = null): HandledExit {
+      return HandledExit(
         exitCode = exitCode,
         causeMessage = message,
         cause = cause,

packages/cli/src/main/kotlin/elide/tool/cli/main.kt

@@ -33,6 +33,7 @@ import elide.runtime.gvm.kotlin.KotlinLanguage
 import elide.tool.cli.Elide.Companion.installStatics
 import elide.tool.cli.cmd.repl.HandledExit
 import elide.tooling.cli.Statics
+import elide.tooling.project.PackageManifestService
 
 // Whether to enable the experimental V2 entrypoint through Clikt.
 private const val ENABLE_CLI_ENTRY_V2 = false
@@ -109,12 +110,12 @@ private inline fun runInner(args: Array<String>): Int = when (ENABLE_CLI_ENTRY_V
           } catch (_: PrintHelpMessage) {
             try {
               sorryIHaveToFactory(args).usage(System.out)
+              0
             } catch (err: Throwable) {
               println("Failed to print help message: ${err.message}")
               err.printStackTrace()
               exitProcess(1)
             }
-            0
           } catch (err: RuntimeException) {
             println("Uncaught error while running command: ${err.message}")
             err.printStackTrace()