From 22ca537909d9777b08fb46ce9211af52215c3b64 Mon Sep 17 00:00:00 2001
From: Jorn Tuyls <jorn.tuyls@gmail.com>
Date: Fri, 11 Sep 2026 14:30:26 -0700
Subject: [PATCH] fix: exit 0 for flm help, version, and port

Requested help, version, and port stopped via parse_options returning false,
which main maps to exit 1. Treat them as successful commands and handle them
before loading the model list. Usage errors still exit 1.
---
 src/include/utils/vm_args.hpp | 11 ++++-----
 src/src/main.cpp              | 43 +++++++++++++++++++----------------
 2 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/src/include/utils/vm_args.hpp b/src/include/utils/vm_args.hpp
index dc78dc59..1e286b7b 100644
--- a/src/include/utils/vm_args.hpp
+++ b/src/include/utils/vm_args.hpp
@@ -134,15 +134,14 @@ bool parse_options(int argc, char *argv[], program_args_t& parsed_args) {
 
         // Help has highest priority
         if (vm.count("help")) {
-            // Custom help formatting to match the desired style
             print_help(general);
-            return false; // Exit after showing help
+            parsed_args.command = "help";
+            return true;
         }
 
         if (vm.count("version")) {
-            // Custom help formatting to match the desired style
-            std::cout << "FLM v" << __FLM_VERSION__ << std::endl;
-            return false; // Exit after showing help
+            parsed_args.command = "version";
+            return true;
         }
 
         // Extract command
@@ -152,7 +151,7 @@ bool parse_options(int argc, char *argv[], program_args_t& parsed_args) {
             // Handle help and version commands directly
             if (parsed_args.command == "help") {
                 print_help(general);
-                return false; // Exit after showing help
+                return true;
             }
             
             if (parsed_args.command == "version") {
diff --git a/src/src/main.cpp b/src/src/main.cpp
index 446b907b..588861b5 100644
--- a/src/src/main.cpp
+++ b/src/src/main.cpp
@@ -472,10 +472,31 @@ int main(int argc, char* argv[]) {
     // Parse command line arguments using Boost Program Options
     program_args_t parsed_args;
     if (!arg_utils::parse_options(argc, argv, parsed_args)) {
-        return 1; // Help was already printed by Boost Program Options
+        return 1;
+    }
+
+    if (parsed_args.command == "help") {
+        return 0;
+    }
+
+    if (parsed_args.command == "version") {
+        if (parsed_args.json_output) {
+            std::cout << "{ \"version\": \"" << __FLM_VERSION__ << "\" }" << std::endl;
+        } else {
+            std::cout << "FLM v" << __FLM_VERSION__ << std::endl;
+        }
+        return 0;
+    }
+
+    if (parsed_args.command == "port") {
+        if (parsed_args.json_output) {
+            std::cout << "{ \"port\": " << utils::get_server_port(parsed_args.port) << " }" << std::endl;
+        } else {
+            std::cout << "Server Port: " << utils::get_server_port(parsed_args.port) << std::endl;
+        }
+        return 0;
     }
 
-    
     // Get the command, model tag, and force flag
     std::string exe_dir = utils::get_executable_directory();
     std::string config_path;
@@ -577,24 +598,6 @@ int main(int argc, char* argv[]) {
 #endif
 
     // code for all commands:
-    
-    if (parsed_args.command == "version") {
-        if (parsed_args.json_output) {
-            std::cout << "{ \"version\": \"" << __FLM_VERSION__ << "\" }" << std::endl;
-        } else {
-            std::cout << "FLM v" << __FLM_VERSION__ << std::endl;
-        }
-        return 0;
-    }
-
-    if (parsed_args.command == "port"){
-        if (parsed_args.json_output) {
-            std::cout << "{ \"port\": " << utils::get_server_port(parsed_args.port) << " }" << std::endl;
-        } else {
-            std::cout << "Server Port: " << utils::get_server_port(parsed_args.port) << std::endl;
-        }
-        return 0;
-    }
 
     if (parsed_args.preemption){
         header_print("FLM", "Allowing high priority tasks to preempt FLM!");