fix: Handle --timeout 0 correctly as unlimited instead of ignoring it

Author: inureyes

src/app/dispatcher.rs

@@ -88,7 +88,7 @@ pub async fn dispatch_command(cli: &Cli, ctx: &AppContext) -> Result<()> {
                 cli.password,
                 #[cfg(target_os = "macos")]
                 use_keychain,
-                Some(cli.timeout),
+                cli.timeout,
                 Some(cli.connect_timeout),
             )
             .await
@@ -347,9 +347,11 @@ async fn handle_exec_command(cli: &Cli, ctx: &AppContext, command: &str) -> Resu
         std::process::exit(0);
     } else {
         // Regular command execution
-        let timeout = if cli.timeout > 0 {
-            Some(cli.timeout)
+        let timeout = if let Some(t) = cli.timeout {
+            // User explicitly specified --timeout, use it directly (including 0 for unlimited)
+            Some(t)
         } else {
+            // User did not specify --timeout, fall back to config
             ctx.config
                 .get_timeout(ctx.cluster_name.as_deref().or(cli.cluster.as_deref()))
         };

src/cli/bssh.rs

@@ -169,10 +169,9 @@ pub struct Cli {
 
     #[arg(
         long,
-        default_value = "300",
-        help = "Command timeout in seconds (0 for unlimited)"
+        help = "Command timeout in seconds (0 for unlimited, default: 300 if not specified)"
     )]
-    pub timeout: u64,
+    pub timeout: Option<u64>,
 
     #[arg(
         long = "connect-timeout",

src/cli/pdsh.rs

@@ -282,7 +282,7 @@ impl PdshCli {
             // Map -t to --connect-timeout
             connect_timeout: self.connect_timeout.unwrap_or(30),
             // Map -u to --timeout
-            timeout: self.command_timeout.unwrap_or(300),
+            timeout: self.command_timeout,
             // Map -N to --no-prefix
             no_prefix: self.no_prefix,
             // Map -b to --batch
@@ -526,7 +526,7 @@ mod tests {
         // Connect timeout
         assert_eq!(bssh_cli.connect_timeout, 60);
         // Command timeout
-        assert_eq!(bssh_cli.timeout, 600);
+        assert_eq!(bssh_cli.timeout, Some(600));
         // No prefix flag
         assert!(bssh_cli.no_prefix);
         // Batch flag
@@ -547,8 +547,8 @@ mod tests {
 
         // Default connect timeout (30s)
         assert_eq!(bssh_cli.connect_timeout, 30);
-        // Default command timeout (300s)
-        assert_eq!(bssh_cli.timeout, 300);
+        // Default command timeout (None - will use config or 300s default)
+        assert_eq!(bssh_cli.timeout, None);
         // Default parallel (32 from pdsh fanout)
         assert_eq!(bssh_cli.parallel, 32);
         // Default strict host key checking

tests/fail_fast_test.rs

@@ -314,7 +314,7 @@ fn test_fail_fast_flag_combinations() {
     ];
     let cli = Cli::try_parse_from(args).expect("Should parse with fail-fast and timeout");
     assert!(cli.fail_fast);
-    assert_eq!(cli.timeout, 60);
+    assert_eq!(cli.timeout, Some(60));
 }
 
 /// Test that -k doesn't conflict with existing short options

tests/pdsh_compat_test.rs

@@ -280,8 +280,8 @@ fn test_pdsh_to_bssh_default_timeouts() {
 
     // Default connect timeout is 30s
     assert_eq!(bssh_cli.connect_timeout, 30);
-    // Default command timeout is 300s
-    assert_eq!(bssh_cli.timeout, 300);
+    // Default command timeout (None - will use config or 300s default)
+    assert_eq!(bssh_cli.timeout, None);
 }
 
 #[test]
@@ -291,7 +291,7 @@ fn test_pdsh_to_bssh_custom_timeouts() {
     let bssh_cli = pdsh_cli.to_bssh_cli();
 
     assert_eq!(bssh_cli.connect_timeout, 10);
-    assert_eq!(bssh_cli.timeout, 600);
+    assert_eq!(bssh_cli.timeout, Some(600));
 }
 
 #[test]