refactor: cli executor catch up with legacy cli

cli/flamingock-cli-executor/src/main/java/io/flamingock/cli/executor/FlamingockExecutorCli.java

@@ -17,6 +17,7 @@
 
 import io.flamingock.cli.executor.command.AuditCommand;
 import io.flamingock.cli.executor.command.ExecuteCommand;
+import io.flamingock.cli.executor.command.IssueCommand;
 import io.flamingock.cli.executor.handler.ExecutorExceptionHandler;
 import io.flamingock.cli.executor.util.VersionProvider;
 import picocli.CommandLine;
@@ -45,11 +46,14 @@
                 "@|bold Examples:|@",
                 "  flamingock execute apply --jar ./app.jar",
                 "  flamingock audit list --jar ./app.jar",
+                "  flamingock audit fix --jar ./app.jar -c my-change-id -r APPLIED",
+                "  flamingock issue list --jar ./app.jar",
+                "  flamingock issue get --jar ./app.jar -c my-change-id --guidance",
                 "  flamingock --log-level=debug execute apply --jar ./my-app.jar",
                 "",
                 "For detailed help on any command, use: flamingock <command> --help"
         },
-        subcommands = {ExecuteCommand.class, AuditCommand.class},
+        subcommands = {ExecuteCommand.class, AuditCommand.class, IssueCommand.class},
         mixinStandardHelpOptions = true,
         versionProvider = VersionProvider.class
 )

cli/flamingock-cli-executor/src/main/java/io/flamingock/cli/executor/command/AuditCommand.java

@@ -24,12 +24,13 @@
  * <p>Groups subcommands related to audit inspection:</p>
  * <ul>
  *   <li>{@code list} - List audit entries</li>
+ *   <li>{@code fix} - Fix audit state for a change with issues</li>
  * </ul>
  */
 @Command(
         name = "audit",
         description = "Audit operations for inspecting change history",
-        subcommands = {ListCommand.class},
+        subcommands = {ListCommand.class, FixCommand.class},
         mixinStandardHelpOptions = true
 )
 public class AuditCommand implements Runnable {

cli/flamingock-cli-executor/src/main/java/io/flamingock/cli/executor/command/FixCommand.java

@@ -0,0 +1,150 @@
+/*
+ * Copyright 2026 Flamingock (https://www.flamingock.io)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.flamingock.cli.executor.command;
+
+import io.flamingock.cli.executor.FlamingockExecutorCli;
+import io.flamingock.cli.executor.orchestration.CommandExecutor;
+import io.flamingock.cli.executor.orchestration.CommandResult;
+import io.flamingock.cli.executor.orchestration.ExecutionOptions;
+import io.flamingock.cli.executor.output.ConsoleFormatter;
+import io.flamingock.cli.executor.util.VersionProvider;
+import io.flamingock.internal.common.core.operation.OperationType;
+import io.flamingock.internal.common.core.recovery.Resolution;
+import io.flamingock.internal.common.core.response.data.AuditFixResponseData;
+import picocli.CommandLine.Command;
+import picocli.CommandLine.Option;
+import picocli.CommandLine.ParentCommand;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.Callable;
+
+/**
+ * Command to fix audit state for a change with issues.
+ *
+ * <p>This command marks a change as either APPLIED or ROLLED_BACK,
+ * resolving any audit issues that are blocking execution.</p>
+ */
+@Command(
+        name = "fix",
+        description = "Fix audit state for a change with issues",
+        mixinStandardHelpOptions = true
+)
+public class FixCommand implements Callable<Integer> {
+
+    public static final int EXIT_JAR_NOT_FOUND = 126;
+
+    @ParentCommand
+    private AuditCommand parent;
+
+    @Option(names = {"--jar", "-j"},
+            description = "Path to the application JAR",
+            required = true)
+    private File jarFile;
+
+    @Option(names = {"-c", "--change-id"},
+            description = "The change ID to fix",
+            required = true)
+    private String changeId;
+
+    @Option(names = {"-r", "--resolution"},
+            description = "Resolution type: APPLIED or ROLLED_BACK",
+            required = true)
+    private Resolution resolution;
+
+    private final CommandExecutor commandExecutor;
+
+    public FixCommand() {
+        this(new CommandExecutor());
+    }
+
+    public FixCommand(CommandExecutor commandExecutor) {
+        this.commandExecutor = commandExecutor;
+    }
+
+    @Override
+    public Integer call() {
+        FlamingockExecutorCli root = getRootCommand();
+        boolean quiet = root != null && root.isQuiet();
+        Optional<String> logLevel = root != null ? root.getLogLevel() : Optional.empty();
+
+        if (!quiet) {
+            ConsoleFormatter.printHeader(VersionProvider.getVersionString());
+        }
+
+        if (!jarFile.exists()) {
+            ConsoleFormatter.printError("JAR file not found: " + jarFile.getAbsolutePath());
+            return EXIT_JAR_NOT_FOUND;
+        }
+
+        if (!jarFile.isFile()) {
+            ConsoleFormatter.printError("Path is not a file: " + jarFile.getAbsolutePath());
+            return EXIT_JAR_NOT_FOUND;
+        }
+
+        Map<String, String> operationArgs = new HashMap<>();
+        operationArgs.put("flamingock.change-id", changeId);
+        operationArgs.put("flamingock.resolution", resolution.name());
+
+        ExecutionOptions options = ExecutionOptions.builder()
+                .logLevel(logLevel.orElse(null))
+                .streamOutput(logLevel.isPresent())
+                .operationArgs(operationArgs)
+                .build();
+
+        CommandResult<AuditFixResponseData> result = commandExecutor.execute(
+                jarFile.getAbsolutePath(),
+                OperationType.AUDIT_FIX,
+                AuditFixResponseData.class,
+                options
+        );
+
+        if (result.isSuccess()) {
+            AuditFixResponseData data = result.getData();
+            if (data != null) {
+                if ("APPLIED".equals(data.getResult())) {
+                    ConsoleFormatter.printSuccess(0);
+                    System.out.println(data.getMessage());
+                } else {
+                    ConsoleFormatter.printInfo(data.getMessage());
+                }
+            }
+            return 0;
+        } else {
+            ConsoleFormatter.printFailure(result.getErrorCode(), result.getErrorMessage());
+            return result.getExitCode();
+        }
+    }
+
+    private FlamingockExecutorCli getRootCommand() {
+        if (parent == null) {
+            return null;
+        }
+        try {
+            java.lang.reflect.Field parentField = AuditCommand.class.getDeclaredField("parent");
+            parentField.setAccessible(true);
+            Object grandParent = parentField.get(parent);
+            if (grandParent instanceof FlamingockExecutorCli) {
+                return (FlamingockExecutorCli) grandParent;
+            }
+        } catch (Exception e) {
+            // Fall through
+        }
+        return null;
+    }
+}

cli/flamingock-cli-executor/src/main/java/io/flamingock/cli/executor/command/GetIssueCommand.java

@@ -0,0 +1,166 @@
+/*
+ * Copyright 2026 Flamingock (https://www.flamingock.io)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.flamingock.cli.executor.command;
+
+import io.flamingock.cli.executor.FlamingockExecutorCli;
+import io.flamingock.cli.executor.orchestration.CommandExecutor;
+import io.flamingock.cli.executor.orchestration.CommandResult;
+import io.flamingock.cli.executor.orchestration.ExecutionOptions;
+import io.flamingock.cli.executor.output.ConsoleFormatter;
+import io.flamingock.cli.executor.output.IssueFormatter;
+import io.flamingock.cli.executor.output.JsonFormatter;
+import io.flamingock.cli.executor.util.VersionProvider;
+import io.flamingock.internal.common.core.operation.OperationType;
+import io.flamingock.internal.common.core.response.data.IssueGetResponseData;
+import picocli.CommandLine.Command;
+import picocli.CommandLine.Option;
+import picocli.CommandLine.ParentCommand;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.Callable;
+
+/**
+ * Command to get detailed information about a specific audit issue.
+ */
+@Command(
+        name = "get",
+        aliases = "describe",
+        description = "Get detailed information about an audit issue",
+        mixinStandardHelpOptions = true
+)
+public class GetIssueCommand implements Callable<Integer> {
+
+    public static final int EXIT_JAR_NOT_FOUND = 126;
+
+    @ParentCommand
+    private IssueCommand parent;
+
+    @Option(names = {"--jar", "-j"},
+            description = "Path to the application JAR",
+            required = true)
+    private File jarFile;
+
+    @Option(names = {"-c", "--change-id"},
+            description = "The change ID to inspect (if not provided, shows first issue)")
+    private String changeId;
+
+    @Option(names = {"--json"},
+            description = "Output in JSON format")
+    private boolean json;
+
+    @Option(names = {"-g", "--guidance"},
+            description = "Show resolution guidance")
+    private boolean guidance;
+
+    private final CommandExecutor commandExecutor;
+
+    public GetIssueCommand() {
+        this(new CommandExecutor());
+    }
+
+    public GetIssueCommand(CommandExecutor commandExecutor) {
+        this.commandExecutor = commandExecutor;
+    }
+
+    @Override
+    public Integer call() {
+        FlamingockExecutorCli root = getRootCommand();
+        boolean quiet = root != null && root.isQuiet();
+        Optional<String> logLevel = root != null ? root.getLogLevel() : Optional.empty();
+
+        if (!quiet && !json) {
+            ConsoleFormatter.printHeader(VersionProvider.getVersionString());
+        }
+
+        if (!jarFile.exists()) {
+            ConsoleFormatter.printError("JAR file not found: " + jarFile.getAbsolutePath());
+            return EXIT_JAR_NOT_FOUND;
+        }
+
+        if (!jarFile.isFile()) {
+            ConsoleFormatter.printError("Path is not a file: " + jarFile.getAbsolutePath());
+            return EXIT_JAR_NOT_FOUND;
+        }
+
+        Map<String, String> operationArgs = new HashMap<>();
+        if (changeId != null && !changeId.isEmpty()) {
+            operationArgs.put("flamingock.change-id", changeId);
+        }
+        if (guidance) {
+            operationArgs.put("flamingock.guidance", "true");
+        }
+
+        ExecutionOptions options = ExecutionOptions.builder()
+                .logLevel(logLevel.orElse(null))
+                .streamOutput(logLevel.isPresent())
+                .operationArgs(operationArgs)
+                .build();
+
+        CommandResult<IssueGetResponseData> result = commandExecutor.execute(
+                jarFile.getAbsolutePath(),
+                OperationType.ISSUE_GET,
+                IssueGetResponseData.class,
+                options
+        );
+
+        if (result.isSuccess()) {
+            IssueGetResponseData data = result.getData();
+            if (json) {
+                JsonFormatter.print(data);
+            } else {
+                displayIssue(data, quiet);
+            }
+            return 0;
+        } else {
+            ConsoleFormatter.printFailure(result.getErrorCode(), result.getErrorMessage());
+            return result.getExitCode();
+        }
+    }
+
+    private void displayIssue(IssueGetResponseData data, boolean quiet) {
+        if (data == null || !data.isFound()) {
+            if (changeId != null) {
+                ConsoleFormatter.printInfo("No issue found for change ID: " + changeId);
+            } else {
+                ConsoleFormatter.printInfo("No issues found. All changes are healthy.");
+            }
+            return;
+        }
+
+        System.out.println();
+        IssueFormatter.printDetail(data, guidance);
+    }
+
+    private FlamingockExecutorCli getRootCommand() {
+        if (parent == null) {
+            return null;
+        }
+        try {
+            java.lang.reflect.Field parentField = IssueCommand.class.getDeclaredField("parent");
+            parentField.setAccessible(true);
+            Object grandParent = parentField.get(parent);
+            if (grandParent instanceof FlamingockExecutorCli) {
+                return (FlamingockExecutorCli) grandParent;
+            }
+        } catch (Exception e) {
+            // Fall through
+        }
+        return null;
+    }
+}