@@ -1,5 +1,5 @@
1−use crate::instance::STATUS_FILE_NAME;
21use crate::session_manager::{GLOBAL_CACHE_DIR_NAME, INSTANCE_DIR_NAME};
2+use anyhow::{Context, Error, Result, bail};
33use std::{
44 env, fs,
55 io::{self, Write},
@@ -23,6 +23,7 @@ use std::{
2323};
2424
2525use block2::RcBlock;
26+use bytesize::ByteSize;
2627use dispatch2::DispatchQueue;
2728use objc2::{AnyThread, rc::Retained, runtime::ProtocolObject};
2829use objc2_foundation::*;
@@ -34,74 +35,44 @@ const DEBIAN_COMPRESSED_SIZE_BYTES: u64 = 280901576;
3435const SHARED_DIRECTORIES_TAG: &str = "shared";
3536pub const PROJECT_GUEST_BASE: &str = "/usr/local/vibebox-mounts";
3637
37−const BYTES_PER_MB: u64 = 1024 * 1024;
38−const DEFAULT_CPU_COUNT: usize = 2;
39−const DEFAULT_RAM_MB: u64 = 2048;
40−const DEFAULT_RAM_BYTES: u64 = DEFAULT_RAM_MB * BYTES_PER_MB;
4138const START_TIMEOUT: Duration = Duration::from_secs(60);
4239const LOGIN_EXPECT_TIMEOUT: Duration = Duration::from_secs(120);
40+const PROVISION_EXPECT_TIMEOUT: Duration = Duration::from_secs(900);
4341
44−struct StatusFile {
45− path: PathBuf,
46− cleared: AtomicBool,
47−}
48−
49−impl StatusFile {
50− fn new(path: PathBuf) -> Self {
51− Self {
52− path,
53− cleared: AtomicBool::new(false),
54− }
55− }
56−
57− fn update(&self, message: &str) {
58− let _ = fs::write(&self.path, message);
59− }
60−
61− fn clear(&self) {
62− if !self.cleared.swap(true, Ordering::SeqCst) {
63− let _ = fs::remove_file(&self.path);
64− }
65− }
66−}
67−
68−impl Drop for StatusFile {
69− fn drop(&mut self) {
70− if !self.cleared.load(Ordering::SeqCst) {
71− let _ = fs::remove_file(&self.path);
72− self.cleared.store(true, Ordering::SeqCst);
73− }
74− }
75−}
42+const ERROR_REPORT_SCRIPT: &str = include_str!("error_report.sh");
7643const PROVISION_SCRIPT: &str = include_str!("provision.sh");
77−const PROVISION_SCRIPT_NAME: &str = "provision.sh";
7844const RESIZE_DISK_SCRIPT: &str = include_str!("resize_disk.sh");
7945const DEFAULT_RAW_NAME: &str = "default.raw";
8046const INSTANCE_RAW_NAME: &str = "instance.raw";
8147const BASE_DISK_RAW_NAME: &str = "disk.raw";
8248
8349#[derive(Clone)]
84−pub(crate) enum LoginAction {
85− Expect { text: String, timeout: Duration },
50+pub enum LoginAction {
51+ Expect {
52+ text: String,
53+ timeout: Duration,
54+ },
55+ ExpectEither {
56+ success: String,
57+ failure: String,
58+ timeout: Duration,
59+ },
8660 Send(String),
8761}
62+use crate::config::BoxConfig;
8863use LoginAction::*;
8964
9065#[derive(Clone)]
91−pub(crate) struct DirectoryShare {
66+pub struct DirectoryShare {
9267 host: PathBuf,
9368 guest: PathBuf,
9469 read_only: bool,
9570}
9671
9772impl DirectoryShare {
98− pub(crate) fn new(
99− host: PathBuf,
100− mut guest: PathBuf,
101− read_only: bool,
102− ) -> Result<Self, Box<dyn std::error::Error>> {
73+ pub fn new(host: PathBuf, mut guest: PathBuf, read_only: bool) -> Result<Self> {
10374 if !host.exists() {
104− return Err(format!("Host path does not exist: {}", host.display()).into());
75+ bail!(format!("host path does not exist: {}", host.display()));
10576 }
10677 if !guest.is_absolute() {
10778 guest = PathBuf::from("/root").join(guest);
@@ -113,10 +84,10 @@ impl DirectoryShare {
11384 })
11485 }
11586
116− pub(crate) fn from_mount_spec(spec: &str) -> Result<Self, Box<dyn std::error::Error>> {
87+ pub fn from_mount_spec(spec: &str) -> Result<Self> {
11788 let parts: Vec<&str> = spec.split(':').collect();
11889 if parts.len() < 2 || parts.len() > 3 {
119− return Err(format!("Invalid mount spec: {spec}").into());
90+ bail!(format!("invalid mount spec: {spec}"));
12091 }
12192 let host = expand_tilde_path(parts[0]);
12293 let guest = PathBuf::from(parts[1]);
@@ -125,11 +96,10 @@ impl DirectoryShare {
12596 "read-only" => true,
12697 "read-write" => false,
12798 _ => {
128− return Err(format!(
99+ bail!(format!(
129100 "Invalid mount mode '{}'; expected read-only or read-write",
130101 parts[2]
131− )
132− .into());
102+ ));
133103 }
134104 }
135105 } else {
@@ -173,19 +143,28 @@ pub struct VmArg {
173143 pub mounts: Vec<String>,
174144}
175145
176−pub fn run_with_args<F>(args: VmArg, io_handler: F) -> Result<(), Box<dyn std::error::Error>>
146+type StatusEmitter<'a> = dyn Fn(&str) + std::marker::Send + Sync + 'a;
147+
148+fn emit_status(status: Option<&StatusEmitter<'_>>, message: &str) {
149+ if let Some(status) = status {
150+ status(message);
151+ }
152+}
153+
154+pub fn run_with_args<F>(args: VmArg, io_handler: F) -> Result<()>
177155where
178156 F: FnOnce(Arc<OutputMonitor>, OwnedFd, OwnedFd) -> IoContext,
179157{
180− run_with_args_and_extras(args, io_handler, Vec::new(), Vec::new())
158+ run_with_args_and_extras(args, io_handler, Vec::new(), Vec::new(), None)
181159}
182160
183−pub(crate) fn run_with_args_and_extras<F>(
161+pub fn run_with_args_and_extras<F>(
184162 args: VmArg,
185163 io_handler: F,
186164 extra_login_actions: Vec<LoginAction>,
187165 extra_directory_shares: Vec<DirectoryShare>,
188−) -> Result<(), Box<dyn std::error::Error>>
166+ status: Option<&StatusEmitter<'_>>,
167+) -> Result<()>
189168where
190169 F: FnOnce(Arc<OutputMonitor>, OwnedFd, OwnedFd) -> IoContext,
191170{
@@ -194,7 +173,7 @@ where
194173 let project_root = env::current_dir()?;
195174 let project_name = project_root
196175 .file_name()
197− .ok_or("Project directory has no name")?
176+ .with_context(|| "Project directory has no name")?
198177 .to_string_lossy()
199178 .into_owned();
200179
@@ -206,8 +185,10 @@ where
206185 let guest_mise_cache = cache_dir.join(".guest-mise-cache");
207186
208187 let instance_dir = project_root.join(INSTANCE_DIR_NAME);
209− let status_file = StatusFile::new(instance_dir.join(STATUS_FILE_NAME));
210− status_file.update("preparing VM image...");
188+ fs::create_dir_all(&instance_dir)?;
189+ emit_status(status, "preparing VM image...");
190+ tracing::info!("preparing VM image...");
191+ let provision_log = instance_dir.join("provision.log");
211192
212193 let basename_compressed = DEBIAN_COMPRESSED_DISK_URL.rsplit('/').next().unwrap();
213194 let base_compressed = cache_dir.join(basename_compressed);
@@ -231,13 +212,14 @@ where
231212 &base_compressed,
232213 &default_raw,
233214 std::slice::from_ref(&mise_directory_share),
234− Some(&status_file),
215+ Some(&provision_log),
216+ status,
235217 )?;
236218 let _ = ensure_instance_disk(
237219 &instance_raw,
238220 &default_raw,
239− args.disk_bytes,
240− Some(&status_file),
221+ ByteSize(args.disk_bytes),
222+ status,
241223 )?;
242224 let base_size = fs::metadata(&default_raw)?.len();
243225 let instance_size = fs::metadata(&instance_raw)?.len();
@@ -267,7 +249,7 @@ where
267249 }
268250
269251 if needs_resize {
270− let resize_cmd = script_command_from_content("resize_disk", RESIZE_DISK_SCRIPT)?;
252+ let resize_cmd = script_command_from_content("resize_disk.sh", RESIZE_DISK_SCRIPT)?;
271253 login_actions.push(Send(resize_cmd));
272254 }
273255
@@ -283,25 +265,29 @@ where
283265 &directory_shares[..],
284266 args.cpu_count,
285267 args.ram_bytes,
286− Some(&status_file),
268+ status,
287269 io_handler,
288270 )
289271}
290272
291−pub(crate) fn script_command_from_content(
292− label: &str,
293− script: &str,
294−) -> Result<String, Box<dyn std::error::Error>> {
273+pub fn script_command_from_content(label: &str, script: &str) -> Result<String> {
295274 let marker = "VIBE_SCRIPT_EOF";
296275 let guest_dir = "/tmp/vibe-scripts";
297276 let guest_path = format!("{guest_dir}/{label}.sh");
277+ let script_body = match script.split_once('\n') {
278+ Some((first, rest)) if first.starts_with("#!") => rest,
279+ _ => script,
280+ };
281+ let wrapped_script = ERROR_REPORT_SCRIPT
282+ .replace("__LABEL__", label)
283+ .replace("__SCRIPT_BODY__", script_body);
298284 let command = format!(
299− "mkdir -p {guest_dir}\ncat >{guest_path} <<'{marker}'\n{script}\n{marker}\nchmod +x {guest_path}\n{guest_path}"
285+ "mkdir -p {guest_dir}\ncat >{guest_path} <<'{marker}'\n{wrapped_script}\n{marker}\nchmod +x {guest_path}\n{guest_path}"
300286 );
301287 if script.contains(marker) {
302− return Err(
303− format!("Script '{label}' contains marker '{marker}', cannot safely upload").into(),
304− );
288+ bail!(format!(
289+ "Script '{label}' contains marker '{marker}', cannot safely upload"
290+ ));
305291 }
306292 Ok(command)
307293}
@@ -365,6 +351,12 @@ enum WaitResult {
365351 Found,
366352}
367353
354+#[derive(PartialEq, Eq)]
355+enum WaitAnyResult {
356+ Timeout,
357+ Found(usize),
358+}
359+
368360pub enum VmInput {
369361 Bytes(Vec<u8>),
370362 Shutdown,
@@ -372,6 +364,7 @@ pub enum VmInput {
372364
373365enum VmOutput {
374366 LoginActionTimeout { action: String, timeout: Duration },
367+ LoginActionFailed { action: String, reason: String },
375368}
376369
377370#[derive(Default)]
@@ -408,6 +401,41 @@ impl OutputMonitor {
408401 WaitResult::Found
409402 }
410403 }
404+
405+ fn wait_for_any(&self, needles: &[&str], timeout: Duration) -> WaitAnyResult {
406+ let mut found: Option<usize> = None;
407+ let (_unused, timeout_result) = self
408+ .condvar
409+ .wait_timeout_while(self.buffer.lock().unwrap(), timeout, |buf| {
410+ if let Some((pos, idx, len)) = find_any(buf, needles) {
411+ *buf = buf[(pos + len)..].to_string();
412+ found = Some(idx);
413+ false
414+ } else {
415+ true
416+ }
417+ })
418+ .unwrap();
419+
420+ if timeout_result.timed_out() {
421+ WaitAnyResult::Timeout
422+ } else {
423+ WaitAnyResult::Found(found.unwrap_or(0))
424+ }
425+ }
426+}
427+
428+fn find_any(buf: &str, needles: &[&str]) -> Option<(usize, usize, usize)> {
429+ let mut best: Option<(usize, usize, usize)> = None; // (pos, idx, len)
430+ for (idx, needle) in needles.iter().enumerate() {
431+ if let Some(pos) = buf.find(needle) {
432+ let candidate = (pos, idx, needle.len());
433+ if best.is_none_or(|b| candidate.0 < b.0) {
434+ best = Some(candidate);
435+ }
436+ }
437+ }
438+ best
411439}
412440
413441#[derive(Debug)]
@@ -456,18 +484,16 @@ impl IoControl {
456484fn ensure_base_image(
457485 base_raw: &Path,
458486 base_compressed: &Path,
459− status: Option<&StatusFile>,
460−) -> Result<(), Box<dyn std::error::Error>> {
487+ status: Option<&StatusEmitter<'_>>,
488+) -> Result<()> {
461489 if base_raw.exists() {
462490 return Ok(());
463491 }
464492
465493 if !base_compressed.exists()
466− || std::fs::metadata(base_compressed).map(|m| m.len())? < DEBIAN_COMPRESSED_SIZE_BYTES
494+ || fs::metadata(base_compressed).map(|m| m.len())? < DEBIAN_COMPRESSED_SIZE_BYTES
467495 {
468− if let Some(status) = status {
469− status.update("downloading base image...");
470− }
496+ emit_status(status, "downloading base image...");
471497 tracing::info!("downloading base image");
472498 let status = Command::new("curl")
473499 .args([
@@ -482,15 +508,14 @@ fn ensure_base_image(
482508 ])
483509 .status()?;
484510 if !status.success() {
485− return Err("Failed to download base image".into());
511+ bail!("failed to download base image");
486512 }
487513 }
488514
489515 // Check SHA
490516 {
491− if let Some(status) = status {
492− status.update("verifying base image...");
493− }
517+ emit_status(status, "verifying base image...");
518+ tracing::info!("verifying base image...");
494519 let input = format!("{} {}\n", DEBIAN_COMPRESSED_SHA, base_compressed.display());
495520
496521 let mut child = Command::new("/usr/bin/shasum")
@@ -508,25 +533,25 @@ fn ensure_base_image(
508533
509534 let status = child.wait().expect("failed to wait on child");
510535 if !status.success() {
511− return Err(format!("SHA validation failed for {DEBIAN_COMPRESSED_DISK_URL}").into());
536+ bail!(format!(
537+ "SHA validation failed for {DEBIAN_COMPRESSED_DISK_URL}"
538+ ));
512539 }
513540 }
514541
515− if let Some(status) = status {
516− status.update("decompressing base image...");
517− }
518− tracing::info!("decompressing base image");
542+ emit_status(status, "decompressing base image...");
543+ tracing::info!("decompressing base image...");
519544 let status = Command::new("tar")
520545 .args([
521546 "-xOf",
522547 &base_compressed.to_string_lossy(),
523548 BASE_DISK_RAW_NAME,
524549 ])
525− .stdout(std::fs::File::create(base_raw)?)
550+ .stdout(fs::File::create(base_raw)?)
526551 .status()?;
527552
528553 if !status.success() {
529− return Err("Failed to decompress base image".into());
554+ bail!("Failed to decompress base image");
530555 }
531556
532557 Ok(())
@@ -537,29 +562,56 @@ fn ensure_default_image(
537562 base_compressed: &Path,
538563 default_raw: &Path,
539564 directory_shares: &[DirectoryShare],
540− status: Option<&StatusFile>,
541−) -> Result<(), Box<dyn std::error::Error>> {
565+ provision_log: Option<&Path>,
566+ status: Option<&StatusEmitter<'_>>,
567+) -> Result<()> {
542568 if default_raw.exists() {
543569 return Ok(());
544570 }
545571
546572 ensure_base_image(base_raw, base_compressed, status)?;
547573
548− if let Some(status) = status {
549− status.update("configuring base image...");
550− }
551− tracing::info!("configuring base image");
574+ emit_status(status, "configuring base image...");
575+ tracing::info!("configuring base image...");
552576 fs::copy(base_raw, default_raw)?;
553577
554− let provision_command = script_command_from_content(PROVISION_SCRIPT_NAME, PROVISION_SCRIPT)?;
555− run_vm(
556− default_raw,
557− &[Send(provision_command)],
558− directory_shares,
559− DEFAULT_CPU_COUNT,
560− DEFAULT_RAM_BYTES,
561− None,
562− )?;
578+ let provision_command = script_command_from_content("provision.sh", PROVISION_SCRIPT)?;
579+ let provision_actions = [
580+ Send(provision_command),
581+ ExpectEither {
582+ success: "VIBEBOX_PROVISION_OK".to_string(),
583+ failure: "VIBEBOX_PROVISION_FAILED".to_string(),
584+ timeout: PROVISION_EXPECT_TIMEOUT,
585+ },
586+ ];
587+ let provision_result = if let Some(log_path) = provision_log {
588+ let log_path = log_path.to_path_buf();
589+ run_vm_with_io(
590+ default_raw,
591+ &provision_actions,
592+ directory_shares,
593+ BoxConfig::default().cpu_count,
594+ BoxConfig::default().ram_size.as_u64(),
595+ status,
596+ move |output_monitor, vm_output_fd, vm_input_fd| {
597+ spawn_vm_io_with_log(output_monitor, vm_output_fd, vm_input_fd, log_path)
598+ },
599+ )
600+ } else {
601+ run_vm(
602+ default_raw,
603+ &provision_actions,
604+ directory_shares,
605+ BoxConfig::default().cpu_count,
606+ BoxConfig::default().ram_size.as_u64(),
607+ status,
608+ )
609+ };
610+
611+ if let Err(err) = provision_result {
612+ let _ = fs::remove_file(default_raw);
613+ return Err(err);
614+ }
563615
564616 Ok(())
565617}
@@ -567,18 +619,16 @@ fn ensure_default_image(
567619fn ensure_instance_disk(
568620 instance_raw: &Path,
569621 template_raw: &Path,
570− target_bytes: u64,
571− status: Option<&StatusFile>,
572−) -> Result<bool, Box<dyn std::error::Error>> {
622+ target_bytes: ByteSize,
623+ status: Option<&StatusEmitter<'_>>,
624+) -> Result<bool> {
573625 if instance_raw.exists() {
574− let current_size = fs::metadata(instance_raw)?.len();
626+ let current_size = ByteSize(fs::metadata(instance_raw)?.len());
575627 if current_size != target_bytes {
576− let current_gb = current_size as f64 / (1024.0 * 1024.0 * 1024.0);
577− let target_gb = target_bytes as f64 / (1024.0 * 1024.0 * 1024.0);
628+ let current_gb = current_size;
629+ let target_gb = target_bytes;
578630 tracing::warn!(
579− current_bytes = current_size,
580− target_bytes,
581− "instance disk size does not match config (current {:.2} GB, config {:.2} GB); disk_gb applies only on init. Run `vibebox reset` to recreate or set disk_gb to match; using existing disk.",
631+ "instance disk size does not match config (current {}, config {}); disk_gb applies only on init. Run `vibebox reset` to recreate or set disk_gb to match; using existing disk.",
582632 current_gb,
583633 target_gb
584634 );
@@ -586,30 +636,28 @@ fn ensure_instance_disk(
586636 return Ok(false);
587637 }
588638
589− let template_size = fs::metadata(template_raw)?.len();
639+ let template_size = ByteSize(fs::metadata(template_raw)?.len());
590640 if target_bytes < template_size {
591− return Err(format!(
592− "Requested disk size {} bytes is smaller than base image size {} bytes",
641+ bail!(format!(
642+ "Requested disk size {} is smaller than base image size {}",
593643 target_bytes, template_size
594− )
595− .into());
644+ ));
596645 }
597646 let target_size = target_bytes;
598647 let needs_resize = target_size > template_size;
599648
600− if let Some(status) = status {
601− status.update("creating instance disk...");
602− }
649+ emit_status(status, "creating instance disk...");
650+ tracing::info!("creating instance disk...");
603651 tracing::info!(path = %template_raw.display(), "creating instance disk");
604− std::fs::create_dir_all(instance_raw.parent().unwrap())?;
652+ fs::create_dir_all(instance_raw.parent().unwrap())?;
605653 if target_size == template_size {
606654 fs::copy(template_raw, instance_raw)?;
607655 return Ok(needs_resize);
608656 }
609657
610− let mut dst = std::fs::File::create(instance_raw)?;
611− dst.set_len(target_size)?;
612− let mut src = std::fs::File::open(template_raw)?;
658+ let mut dst = fs::File::create(instance_raw)?;
659+ dst.set_len(target_size.as_u64())?;
660+ let mut src = fs::File::open(template_raw)?;
613661 std::io::copy(&mut src, &mut dst)?;
614662 Ok(needs_resize)
615663}
@@ -627,18 +675,17 @@ pub fn create_pipe() -> (OwnedFd, OwnedFd) {
627675 (read_stream.into(), write_stream.into())
628676}
629677
630−pub fn spawn_vm_io_with_hooks<F, G>(
678+pub fn spawn_vm_io_with_hooks<
679+ F: FnMut(&str) -> bool + std::marker::Send + 'static,
680+ G: FnMut(&[u8]) + std::marker::Send + 'static,
681+>(
631682 output_monitor: Arc<OutputMonitor>,
632683 vm_output_fd: OwnedFd,
633684 vm_input_fd: OwnedFd,
634685 io_control: Arc<IoControl>,
635686 mut on_line: F,
636687 mut on_output: G,
637−) -> IoContext
638−where
639− F: FnMut(&str) -> bool + ::std::marker::Send + 'static,
640− G: FnMut(&[u8]) + ::std::marker::Send + 'static,
641−{
688+) -> IoContext {
642689 let (input_tx, input_rx): (Sender<VmInput>, Receiver<VmInput>) = mpsc::channel();
643690
644691 // raw_guard is set when we've put the user's terminal into raw mode because we've attached stdin/stdout to the VM.
@@ -786,14 +833,14 @@ where
786833 PollResult::Spurious => continue,
787834 PollResult::Ready(bytes) => {
788835 if io_control.forward_output() {
789− // enable raw mode, if we haven't already
836+ // enable raw mode if we haven't already
790837 if raw_guard.lock().unwrap().is_none()
791838 && let Ok(guard) = enable_raw_mode(libc::STDIN_FILENO)
792839 {
793840 *raw_guard.lock().unwrap() = Some(guard);
794841 }
795842
796− let mut stdout = std::io::stdout().lock();
843+ let mut stdout = io::stdout().lock();
797844 if stdout.write_all(bytes).is_err() {
798845 break;
799846 }
@@ -809,7 +856,7 @@ where
809856
810857 // Copies data from mpsc channel into VM, so vibe can "type" stuff and run scripts.
811858 let mux_thread = thread::spawn(move || {
812− let mut vm_writer = std::fs::File::from(vm_input_fd);
859+ let mut vm_writer = fs::File::from(vm_input_fd);
813860 loop {
814861 match input_rx.recv() {
815862 Ok(VmInput::Bytes(data)) => {
@@ -839,7 +886,7 @@ pub fn spawn_vm_io_with_line_handler<F>(
839886 on_line: F,
840887) -> IoContext
841888where
842− F: FnMut(&str) -> bool + ::std::marker::Send + 'static,
889+ F: FnMut(&str) -> bool + std::marker::Send + 'static,
843890{
844891 spawn_vm_io_with_hooks(
845892 output_monitor,
@@ -859,6 +906,36 @@ pub fn spawn_vm_io(
859906 spawn_vm_io_with_line_handler(output_monitor, vm_output_fd, vm_input_fd, |_| false)
860907}
861908
909+fn spawn_vm_io_with_log(
910+ output_monitor: Arc<OutputMonitor>,
911+ vm_output_fd: OwnedFd,
912+ vm_input_fd: OwnedFd,
913+ log_path: PathBuf,
914+) -> IoContext {
915+ let log_file = fs::OpenOptions::new()
916+ .create(true)
917+ .write(true)
918+ .truncate(true)
919+ .open(&log_path)
920+ .ok()
921+ .map(|file| Arc::new(Mutex::new(file)));
922+
923+ spawn_vm_io_with_hooks(
924+ output_monitor,
925+ vm_output_fd,
926+ vm_input_fd,
927+ IoControl::new(),
928+ |_| false,
929+ move |bytes| {
930+ if let Some(log) = &log_file
931+ && let Ok(mut file) = log.lock()
932+ {
933+ let _ = file.write_all(bytes);
934+ }
935+ },
936+ )
937+}
938+
862939impl IoContext {
863940 pub fn shutdown(self) {
864941 let _ = self.input_tx.send(VmInput::Shutdown);
@@ -876,7 +953,7 @@ fn create_vm_configuration(
876953 vm_writes_to_fd: OwnedFd,
877954 cpu_count: usize,
878955 ram_bytes: u64,
879−) -> Result<Retained<VZVirtualMachineConfiguration>, Box<dyn std::error::Error>> {
956+) -> Result<Retained<VZVirtualMachineConfiguration>> {
880957 unsafe {
881958 let platform =
882959 VZGenericPlatformConfiguration::init(VZGenericPlatformConfiguration::alloc());
@@ -910,7 +987,7 @@ fn create_vm_configuration(
910987 false,
911988 VZDiskImageCachingMode::Automatic,
912989 VZDiskImageSynchronizationMode::Full,
913− ).unwrap();
990+ )?;
914991
915992 let disk_device = VZVirtioBlockDeviceConfiguration::initWithAttachment(
916993 VZVirtioBlockDeviceConfiguration::alloc(),
@@ -997,7 +1074,7 @@ fn create_vm_configuration(
9971074 // Validate
9981075 config.validateWithError().map_err(|e| {
9991076 io::Error::other(format!(
1000− "Invalid VM configuration: {:?}",
1077+ "invalid VM configuration: {:?}",
10011078 e.localizedDescription()
10021079 ))
10031080 })?;
@@ -1006,9 +1083,9 @@ fn create_vm_configuration(
10061083 }
10071084}
10081085
1009−fn load_efi_variable_store() -> Result<Retained<VZEFIVariableStore>, Box<dyn std::error::Error>> {
1086+fn load_efi_variable_store() -> Result<Retained<VZEFIVariableStore>> {
10101087 unsafe {
1011− let temp_dir = std::env::temp_dir();
1088+ let temp_dir = env::temp_dir();
10121089 let temp_path = temp_dir.join(format!("efi_variable_store_{}.efivars", std::process::id()));
10131090 let url = nsurl_from_path(&temp_path)?;
10141091 let options = VZEFIVariableStoreInitializationOptions::AllowOverwrite;
@@ -1024,8 +1101,8 @@ fn load_efi_variable_store() -> Result<Retained<VZEFIVariableStore>, Box<dyn std
10241101fn spawn_login_actions_thread(
10251102 login_actions: Vec<LoginAction>,
10261103 output_monitor: Arc<OutputMonitor>,
1027− input_tx: mpsc::Sender<VmInput>,
1028− vm_output_tx: mpsc::Sender<VmOutput>,
1104+ input_tx: Sender<VmInput>,
1105+ vm_output_tx: Sender<VmOutput>,
10291106) -> thread::JoinHandle<()> {
10301107 thread::spawn(move || {
10311108 for a in login_actions {
@@ -1039,6 +1116,27 @@ fn spawn_login_actions_thread(
10391116 return;
10401117 }
10411118 }
1119+ ExpectEither {
1120+ success,
1121+ failure,
1122+ timeout,
1123+ } => match output_monitor.wait_for_any(&[&success, &failure], timeout) {
1124+ WaitAnyResult::Found(0) => {}
1125+ WaitAnyResult::Found(_) => {
1126+ let _ = vm_output_tx.send(VmOutput::LoginActionFailed {
1127+ action: format!("expect '{}'", success),
1128+ reason: format!("saw failure marker '{}'", failure),
1129+ });
1130+ return;
1131+ }
1132+ WaitAnyResult::Timeout => {
1133+ let _ = vm_output_tx.send(VmOutput::LoginActionTimeout {
1134+ action: format!("expect '{}'", success),
1135+ timeout,
1136+ });
1137+ return;
1138+ }
1139+ },
10421140 Send(mut text) => {
10431141 text.push('\n'); // Type the newline so the command is actually submitted.
10441142 input_tx.send(VmInput::Bytes(text.into_bytes())).unwrap();
@@ -1054,9 +1152,9 @@ fn run_vm_with_io<F>(
10541152 directory_shares: &[DirectoryShare],
10551153 cpu_count: usize,
10561154 ram_bytes: u64,
1057− status: Option<&StatusFile>,
1155+ status: Option<&StatusEmitter<'_>>,
10581156 io_handler: F,
1059−) -> Result<(), Box<dyn std::error::Error>>
1157+) -> Result<()>
10601158where
10611159 F: FnOnce(Arc<OutputMonitor>, OwnedFd, OwnedFd) -> IoContext,
10621160{
@@ -1103,24 +1201,22 @@ where
11031201
11041202 match rx.try_recv() {
11051203 Ok(result) => {
1106− result.map_err(|e| format!("Failed to start VM: {}", e))?;
1204+ result.map_err(|e| Error::msg(format!("Failed to start VM: {}", e)))?;
11071205 break;
11081206 }
11091207 Err(mpsc::TryRecvError::Empty) => continue,
11101208 Err(mpsc::TryRecvError::Disconnected) => {
1111− return Err("VM start channel disconnected".into());
1209+ bail!("VM start channel disconnected");
11121210 }
11131211 }
11141212 }
11151213
11161214 if Instant::now() >= start_deadline {
1117− return Err("Timed out waiting for VM to start".into());
1215+ bail!("Timed out waiting for VM to start");
11181216 }
11191217
1120− if let Some(status) = status {
1121− status.update("vm booting... go vibecoder!");
1122− status.clear();
1123− }
1218+ emit_status(status, "vm booting... go vibecoder!");
1219+ tracing::info!("vm booting... go vibecoder!");
11241220 tracing::info!("vm booting");
11251221
11261222 let output_monitor = Arc::new(OutputMonitor::default());
@@ -1166,7 +1262,7 @@ where
11661262 );
11671263
11681264 let mut last_state = None;
1169− let mut exit_result = Ok(());
1265+ let mut exit_result: Result<(), String> = Ok(());
11701266 loop {
11711267 unsafe {
11721268 NSRunLoop::mainRunLoop().runMode_beforeDate(
@@ -1185,8 +1281,24 @@ where
11851281 exit_result = Err(format!(
11861282 "Login action ({}) timed out after {:?}; shutting down.",
11871283 action, timeout
1188− )
1189− .into());
1284+ ));
1285+ unsafe {
1286+ if vm.canRequestStop() {
1287+ if let Err(err) = vm.requestStopWithError() {
1288+ tracing::error!(error = ?err, "failed to request VM stop");
1289+ }
1290+ } else if vm.canStop() {
1291+ let handler = RcBlock::new(|_error: *mut NSError| {});
1292+ vm.stopWithCompletionHandler(&handler);
1293+ }
1294+ }
1295+ break;
1296+ }
1297+ Ok(VmOutput::LoginActionFailed { action, reason }) => {
1298+ exit_result = Err(format!(
1299+ "Login action ({}) failed: {}; shutting down.",
1300+ action, reason
1301+ ));
11901302 unsafe {
11911303 if vm.canRequestStop() {
11921304 if let Err(err) = vm.requestStopWithError() {
@@ -1202,7 +1314,7 @@ where
12021314 Err(mpsc::TryRecvError::Empty) => {}
12031315 Err(mpsc::TryRecvError::Disconnected) => {}
12041316 }
1205− if state != objc2_virtualization::VZVirtualMachineState::Running {
1317+ if state != VZVirtualMachineState::Running {
12061318 //eprintln!("VM stopped with state: {:?}", state);
12071319 break;
12081320 }
@@ -1212,7 +1324,7 @@ where
12121324
12131325 io_ctx.shutdown();
12141326
1215− exit_result
1327+ exit_result.map_err(Error::msg)
12161328}
12171329
12181330fn run_vm(
@@ -1221,8 +1333,8 @@ fn run_vm(
12211333 directory_shares: &[DirectoryShare],
12221334 cpu_count: usize,
12231335 ram_bytes: u64,
1224− status: Option<&StatusFile>,
1225−) -> Result<(), Box<dyn std::error::Error>> {
1336+ status: Option<&StatusEmitter<'_>>,
1337+) -> Result<()> {
12261338 run_vm_with_io(
12271339 disk_path,
12281340 login_actions,
@@ -1234,7 +1346,7 @@ fn run_vm(
12341346 )
12351347}
12361348
1237−fn nsurl_from_path(path: &Path) -> Result<Retained<NSURL>, Box<dyn std::error::Error>> {
1349+fn nsurl_from_path(path: &Path) -> Result<Retained<NSURL>> {
12381350 let abs_path = if path.is_absolute() {
12391351 path.to_path_buf()
12401352 } else {
@@ -1243,7 +1355,7 @@ fn nsurl_from_path(path: &Path) -> Result<Retained<NSURL>, Box<dyn std::error::E
12431355 let ns_path = NSString::from_str(
12441356 abs_path
12451357 .to_str()
1246− .ok_or("Non-UTF8 path encountered while building NSURL")?,
1358+ .with_context(|| "non-UTF8 path encountered while building NSURL")?,
12471359 );
12481360 Ok(NSURL::fileURLWithPath(&ns_path))
12491361}
@@ -1258,7 +1370,7 @@ fn enable_raw_mode(fd: i32) -> io::Result<RawModeGuard> {
12581370 let original = attributes;
12591371
12601372 // Disable translation of carriage return to newline on input
1261− attributes.c_iflag &= !(libc::ICRNL);
1373+ attributes.c_iflag &= !libc::ICRNL;
12621374 // Disable canonical mode (line buffering), echo, and signal generation
12631375 attributes.c_lflag &= !(libc::ICANON | libc::ECHO | libc::ISIG);
12641376 attributes.c_cc[libc::VMIN] = 0;
@@ -1286,10 +1398,10 @@ impl Drop for RawModeGuard {
12861398
12871399// Ensure the running binary has com.apple.security.virtualization entitlements by checking and, if not, signing and relaunching.
12881400pub fn ensure_signed() {
1289− if std::env::var("VIBEBOX_SKIP_CODESIGN").as_deref() == Ok("1") {
1401+ if env::var("VIBEBOX_SKIP_CODESIGN").as_deref() == Ok("1") {
12901402 return;
12911403 }
1292− let exe = std::env::current_exe().expect("failed to get current exe path");
1404+ let exe = env::current_exe().expect("failed to get current exe path");
12931405 let exe_str = exe.to_str().expect("exe path not valid utf-8");
12941406
12951407 let has_required_entitlements = {
@@ -1311,8 +1423,8 @@ pub fn ensure_signed() {
13111423 }
13121424
13131425 const ENTITLEMENTS: &str = include_str!("entitlements.plist");
1314− let entitlements_path = std::env::temp_dir().join("entitlements.plist");
1315− std::fs::write(&entitlements_path, ENTITLEMENTS).expect("failed to write entitlements");
1426+ let entitlements_path = env::temp_dir().join("entitlements.plist");
1427+ fs::write(&entitlements_path, ENTITLEMENTS).expect("failed to write entitlements");
13161428
13171429 let output = Command::new("codesign")
13181430 .args([
@@ -1325,7 +1437,7 @@ pub fn ensure_signed() {
13251437 ])
13261438 .output();
13271439
1328− let _ = std::fs::remove_file(&entitlements_path);
1440+ let _ = fs::remove_file(&entitlements_path);
13291441
13301442 match output {
13311443 Ok(o) if o.status.success() => {
@@ -1333,7 +1445,7 @@ pub fn ensure_signed() {
13331445 if !stderr.trim().is_empty() {
13341446 tracing::debug!(codesign_stderr = %stderr.trim(), "codesign output");
13351447 }
1336− let err = Command::new(&exe).args(std::env::args_os().skip(1)).exec();
1448+ let err = Command::new(&exe).args(env::args_os().skip(1)).exec();
13371449 tracing::error!(error = %err, "failed to re-exec after signing");
13381450 std::process::exit(1);
13391451 }