From f7d72837457aa16b3fa1a76678fb43a625969a84 Mon Sep 17 00:00:00 2001
From: Yaroslav Bolyukin <iam@lach.pw>
Date: Wed, 04 Feb 2026 20:56:44 +0000
Subject: [PATCH] fix: unbiased stdout/process join race condition


---
--- a/crates/fleet-base/src/command.rs
+++ b/crates/fleet-base/src/command.rs
@@ -349,27 +349,23 @@
 	let mut out_buf = if want_stdout { Some(vec![]) } else { None };
 	loop {
 		select! {
-			e = err.next() => {
-				if let Some(e) = e {
-					let e = e?;
-					err_handler.handle_line(&e);
-				}
+			biased;
+
+			Some(e) = err.next() => {
+				let e = e?;
+				err_handler.handle_line(&e);
 			},
-			o = ob.next() => {
-				if let Some(o) = o {
-					out_buf.as_mut().expect("stdout == wants_stdout").extend_from_slice(&o?);
-				}
+			Some(o) = ob.next() => {
+				out_buf.as_mut().expect("stdout == wants_stdout").extend_from_slice(&o?);
 			},
-			o = ol.next() => {
-				if let Some(o) = o {
-					let o = o?;
-					if let Some(out) = out_handler.as_mut() {
-						out.handle_line(&o)
-					} else {
-						err_handler.handle_line(&o)
-					}
-					// out_handler.handle_info(&o);
+			Some(o) = ol.next() => {
+				let o = o?;
+				if let Some(out) = out_handler.as_mut() {
+					out.handle_line(&o)
+				} else {
+					err_handler.handle_line(&o)
 				}
+				// out_handler.handle_info(&o);
 			},
 			code = child.wait() => {
 				let code = code?;
@@ -414,27 +410,23 @@
 	let mut wait_future = pin::pin!(child.wait());
 	loop {
 		select! {
-			e = err.next() => {
-				if let Some(e) = e {
-					let e = e?;
-					err_handler.handle_line(&e);
-				}
+			biased;
+
+			Some(e) = err.next() => {
+				let e = e?;
+				err_handler.handle_line(&e);
 			},
-			o = ob.next() => {
-				if let Some(o) = o {
-					out_buf.as_mut().expect("stdout == wants_stdout").extend_from_slice(&o?);
-				}
+			Some(o) = ob.next() => {
+				out_buf.as_mut().expect("stdout == wants_stdout").extend_from_slice(&o?);
 			},
-			o = ol.next() => {
-				if let Some(o) = o {
-					let o = o?;
-					if let Some(out) = out_handler.as_mut() {
-						out.handle_line(&o)
-					} else {
-						err_handler.handle_line(&o)
-					}
-					// out_handler.handle_info(&o);
+			Some(o) = ol.next() => {
+				let o = o?;
+				if let Some(out) = out_handler.as_mut() {
+					out.handle_line(&o)
+				} else {
+					err_handler.handle_line(&o)
 				}
+				// out_handler.handle_info(&o);
 			},
 			code = &mut wait_future => {
 				let code = code?;

-- 
gitstuff