Order CliAction variants by category

Reorganize the enum into four groups: display/help, daemon entry
(Run, Simulate, PresetCommand), daemon-affecting subcommands
(RestartCommand, StopCommand, GeoCommand, TestCommand,
StatusCommand), and config subcommands (SetCommand, GetCommand).
main.rs and the config_dir accessor mirror this order so the match
arms scan top-to-bottom in the same shape as the enum.

Author: psi4j

src/args.rs

@@ -31,24 +31,41 @@ pub enum SetOperator {
 /// Represents the parsed command-line arguments and their intended actions.
 #[derive(Debug, PartialEq)]
 pub enum CliAction {
+    /// Display version information and exit
+    ShowVersion,
+
+    /// Display help information and exit
+    ShowHelp,
+
+    /// Show help due to unknown arguments and exit
+    ShowHelpDueToError,
+
+    /// Display detailed help for a specific command or general help
+    HelpCommand { command: Option<String> },
+
+    /// Display usage help for a specific command (--help flag in command context)
+    UsageHelp { command: String },
+
+    /// Show command-specific usage due to error
+    ShowCommandUsageDueToError {
+        command: String,
+        error_message: String,
+    },
+
     /// Run the normal application with these settings
     Run {
         debug_enabled: bool,
         config_dir: Option<String>,
         background: bool,
     },
 
-    /// Test using subcommand syntax  
-    TestCommand {
-        debug_enabled: bool,
-        temperature: u32,
-        gamma: f64,
-        config_dir: Option<String>,
-    },
-
-    /// Geo using subcommand syntax
-    GeoCommand {
+    /// Simulate time passing for testing
+    Simulate {
         debug_enabled: bool,
+        start_time: String,
+        end_time: String,
+        multiplier: f64,
+        log_to_file: bool,
         config_dir: Option<String>,
     },
 
@@ -59,35 +76,32 @@ pub enum CliAction {
         config_dir: Option<String>,
     },
 
-    /// Set configuration field subcommand
-    SetCommand {
+    /// Restart using subcommand syntax
+    RestartCommand {
         debug_enabled: bool,
-        fields: Vec<(String, SetOperator, String)>,
+        instant: bool,
         config_dir: Option<String>,
-        target: Option<String>,
+        background: bool,
     },
 
-    /// Get configuration field subcommand
-    GetCommand {
+    /// Stop using subcommand syntax
+    StopCommand {
         debug_enabled: bool,
-        fields: Vec<String>,
         config_dir: Option<String>,
-        target: Option<String>,
-        json: bool,
     },
 
-    /// Stop using subcommand syntax
-    StopCommand {
+    /// Geo using subcommand syntax
+    GeoCommand {
         debug_enabled: bool,
         config_dir: Option<String>,
     },
 
-    /// Restart using subcommand syntax
-    RestartCommand {
+    /// Test using subcommand syntax
+    TestCommand {
         debug_enabled: bool,
-        instant: bool,
+        temperature: u32,
+        gamma: f64,
         config_dir: Option<String>,
-        background: bool,
     },
 
     /// Status command - display current runtime state
@@ -97,35 +111,21 @@ pub enum CliAction {
         follow: bool,
     },
 
-    /// Display detailed help for a specific command or general help
-    HelpCommand { command: Option<String> },
-
-    /// Display usage help for a specific command (--help flag in command context)
-    UsageHelp { command: String },
-
-    /// Simulate time passing for testing
-    Simulate {
+    /// Set configuration field subcommand
+    SetCommand {
         debug_enabled: bool,
-        start_time: String,
-        end_time: String,
-        multiplier: f64,
-        log_to_file: bool,
+        fields: Vec<(String, SetOperator, String)>,
         config_dir: Option<String>,
+        target: Option<String>,
     },
 
-    /// Display help information and exit
-    ShowHelp,
-
-    /// Display version information and exit
-    ShowVersion,
-
-    /// Show help due to unknown arguments and exit
-    ShowHelpDueToError,
-
-    /// Show command-specific usage due to error
-    ShowCommandUsageDueToError {
-        command: String,
-        error_message: String,
+    /// Get configuration field subcommand
+    GetCommand {
+        debug_enabled: bool,
+        fields: Vec<String>,
+        config_dir: Option<String>,
+        target: Option<String>,
+        json: bool,
     },
 }
 
@@ -134,14 +134,14 @@ impl CliAction {
     pub fn config_dir(&self) -> Option<&str> {
         match self {
             Self::Run { config_dir, .. }
-            | Self::TestCommand { config_dir, .. }
-            | Self::GeoCommand { config_dir, .. }
+            | Self::Simulate { config_dir, .. }
             | Self::PresetCommand { config_dir, .. }
-            | Self::SetCommand { config_dir, .. }
-            | Self::GetCommand { config_dir, .. }
-            | Self::StopCommand { config_dir, .. }
             | Self::RestartCommand { config_dir, .. }
-            | Self::Simulate { config_dir, .. } => config_dir.as_deref(),
+            | Self::StopCommand { config_dir, .. }
+            | Self::GeoCommand { config_dir, .. }
+            | Self::TestCommand { config_dir, .. }
+            | Self::SetCommand { config_dir, .. }
+            | Self::GetCommand { config_dir, .. } => config_dir.as_deref(),
             _ => None,
         }
     }

src/main.rs

@@ -70,29 +70,11 @@ fn main() -> Result<()> {
             }
             Ok(())
         }
-        CliAction::GeoCommand { debug_enabled, .. } => {
-            commands::geo::handle_geo_command(debug_enabled)
-        }
-        CliAction::RestartCommand {
-            debug_enabled,
-            instant,
-            background,
-            ..
-        } => commands::restart::handle_restart_command(instant, debug_enabled, background),
-        CliAction::StopCommand { debug_enabled, .. } => {
-            commands::stop::handle_stop_command(debug_enabled)
-        }
         CliAction::Run {
             debug_enabled,
             background,
             ..
         } => Sunsetr::new(debug_enabled).background(background).run(),
-        CliAction::TestCommand {
-            debug_enabled,
-            temperature,
-            gamma,
-            ..
-        } => commands::test::handle_test_command(temperature, gamma, debug_enabled),
         CliAction::Simulate {
             debug_enabled,
             start_time,
@@ -131,6 +113,27 @@ fn main() -> Result<()> {
                 Sunsetr::new(debug_enabled).without_headers().run()
             }
         },
+        CliAction::RestartCommand {
+            debug_enabled,
+            instant,
+            background,
+            ..
+        } => commands::restart::handle_restart_command(instant, debug_enabled, background),
+        CliAction::StopCommand { debug_enabled, .. } => {
+            commands::stop::handle_stop_command(debug_enabled)
+        }
+        CliAction::GeoCommand { debug_enabled, .. } => {
+            commands::geo::handle_geo_command(debug_enabled)
+        }
+        CliAction::TestCommand {
+            debug_enabled,
+            temperature,
+            gamma,
+            ..
+        } => commands::test::handle_test_command(temperature, gamma, debug_enabled),
+        CliAction::StatusCommand { json, follow, .. } => {
+            commands::status::handle_status_command(json, follow)
+        }
         CliAction::SetCommand { fields, target, .. } => {
             commands::set::handle_set_command(fields, target.as_deref())
         }
@@ -140,8 +143,5 @@ fn main() -> Result<()> {
             json,
             ..
         } => commands::get::handle_get_command(&fields, target.as_deref(), json),
-        CliAction::StatusCommand { json, follow, .. } => {
-            commands::status::handle_status_command(json, follow)
-        }
     }
 }