chore: Various improvements

Author: rsenden

fcli-core/fcli-common/src/main/java/com/fortify/cli/common/cli/util/FcliCommandExecutorFactory.java

@@ -26,6 +26,7 @@
 import org.slf4j.LoggerFactory;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.fortify.cli.common.exception.FcliCommandExecutionException;
 import com.fortify.cli.common.exception.FcliExecutionExceptionHandler;
 import com.fortify.cli.common.exception.FcliSimpleException;
 import com.fortify.cli.common.output.cli.cmd.IRecordCollectionSupport;
@@ -192,7 +193,7 @@ private void rethrowAsRuntimeException(Throwable t) {
         }
 
         private final void throwExceptionOnNonZeroExitCode(Result r) {
-            throw new FcliSimpleException("Fcli command terminated with non-zero exit code "+r.getExitCode());
+            throw new FcliCommandExecutionException(r);
         }
 
         // We want to replicate the CommandSpec with new command instances, at least for the 

fcli-core/fcli-common/src/main/java/com/fortify/cli/common/exception/FcliCommandExecutionException.java

@@ -0,0 +1,40 @@
+/*
+ * Copyright 2021-2025 Open Text.
+ *
+ * The only warranties for products and services of Open Text
+ * and its affiliates and licensors ("Open Text") are as may
+ * be set forth in the express warranty statements accompanying
+ * such products and services. Nothing herein should be construed
+ * as constituting an additional warranty. Open Text shall not be
+ * liable for technical or editorial errors or omissions contained
+ * herein. The information contained herein is subject to change
+ * without notice.
+ */
+package com.fortify.cli.common.exception;
+
+import com.formkiq.graalvm.annotations.Reflectable;
+import com.fortify.cli.common.util.OutputHelper;
+
+import lombok.Getter;
+
+/**
+ * Exception thrown when an fcli command execution fails with a non-zero exit code.
+ * Provides access to the command's stdout and stderr output for detailed error reporting.
+ */
+@Reflectable
+public class FcliCommandExecutionException extends FcliSimpleException {
+    private static final long serialVersionUID = 1L;
+    
+    @Getter
+    private final OutputHelper.Result result;
+    
+    public FcliCommandExecutionException(OutputHelper.Result result) {
+        super("Command execution failed with exit code " + result.getExitCode());
+        this.result = result;
+    }
+    
+    public FcliCommandExecutionException(String message, OutputHelper.Result result) {
+        super(message);
+        this.result = result;
+    }
+}

fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/setup/cli/cmd/ToolSetupCommand.java

@@ -17,6 +17,7 @@
 
 import com.fortify.cli.common.cli.cmd.AbstractRunnableCommand;
 import com.fortify.cli.common.cli.util.FcliCommandExecutorFactory;
+import com.fortify.cli.common.exception.FcliCommandExecutionException;
 import com.fortify.cli.common.exception.FcliSimpleException;
 import com.fortify.cli.common.util.JreHelper;
 import com.fortify.cli.common.util.OutputHelper;
@@ -142,9 +143,13 @@ private RegistrationResult tryRegisterTool(ToolSetupSpec spec, String version) {
                 String installDir = extractInstallDirFromJsonOutput(result.getOut());
                 return new RegistrationResult(true, installDir != null ? installDir : "PATH");
             }
-        } catch (Exception e) {
+        } catch (FcliCommandExecutionException e) {
             // Registration failed, but don't throw - just log progress
             System.out.println("Tool " + toolName + " not found in PATH, will proceed with installation");
+            // Do not show stderr for expected registration failures
+        } catch (Exception e) {
+            // Other exceptions
+            System.out.println("Tool " + toolName + " not found in PATH, will proceed with installation");
         }
         return new RegistrationResult(false, null);
     }
@@ -186,16 +191,24 @@ private InstallResult installTool(ToolSetupSpec spec, String version) {
             }
         }
 
-        var result = executeFcliCommand(cmd);
-        if (result.getExitCode() != 0) {
-            throw new FcliSimpleException("Failed to install " + toolName);
+        try {
+            var result = executeFcliCommand(cmd);
+            
+            // Extract action and install directory from JSON output
+            String action = extractActionFromJsonOutput(result.getOut());
+            String installDir = extractInstallDirFromJsonOutput(result.getOut());
+            
+            return new InstallResult(action != null ? action : "installed", installDir != null ? installDir : "installed");
+        } catch (FcliCommandExecutionException e) {
+            // Show user-friendly error message
+            System.err.println("Installation for " + toolName + " failed:");
+            if (e.getResult().getErr() != null && !e.getResult().getErr().isEmpty()) {
+                System.err.println(e.getResult().getErr());
+            } else if (e.getResult().getOut() != null && !e.getResult().getOut().isEmpty()) {
+                System.err.println(e.getResult().getOut());
+            }
+            throw new FcliSimpleException("Installation of " + toolName + " failed");
         }
-        
-        // Extract action and install directory from JSON output
-        String action = extractActionFromJsonOutput(result.getOut());
-        String installDir = extractInstallDirFromJsonOutput(result.getOut());
-        
-        return new InstallResult(action != null ? action : "installed", installDir != null ? installDir : "installed");
     }
 
     private String extractInstallDirFromJsonOutput(String output) {
@@ -325,7 +338,7 @@ private OutputHelper.Result executeFcliCommand(String cmd) {
         var executor = FcliCommandExecutorFactory.builder()
                 .cmd(cmd)
                 .stdoutOutputType(OutputType.collect)  // Collect stdout to get the JSON output
-                .stderrOutputType(OutputType.suppress)  // Suppress stderr to avoid showing exceptions
+                .stderrOutputType(OutputType.collect)  // Collect stderr to show on failure
                 .build()
                 .create();
         return executor.execute();