@@ -1,5 +1,5 @@
1+use crate::instance::STATUS_FILE_NAME;
12use 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,7 +23,6 @@ use std::{
2323};
2424
2525use block2::RcBlock;
26−use bytesize::ByteSize;
2726use dispatch2::DispatchQueue;
2827use objc2::{AnyThread, rc::Retained, runtime::ProtocolObject};
2928use objc2_foundation::*;
@@ -35,44 +34,68 @@ const DEBIAN_COMPRESSED_SIZE_BYTES: u64 = 280901576;
3534const SHARED_DIRECTORIES_TAG: &str = "shared";
3635pub const PROJECT_GUEST_BASE: &str = "/usr/local/vibebox-mounts";
3736
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;
3841const START_TIMEOUT: Duration = Duration::from_secs(60);
3942const LOGIN_EXPECT_TIMEOUT: Duration = Duration::from_secs(120);
40−const PROVISION_EXPECT_TIMEOUT: Duration = Duration::from_secs(900);
4143
42−const ERROR_REPORT_SCRIPT: &str = include_str!("error_report.sh");
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+
62+impl Drop for StatusFile {
63+ fn drop(&mut self) {
64+ if !self.cleared.load(Ordering::SeqCst) {
65+ let _ = fs::remove_file(&self.path);
66+ self.cleared.store(true, Ordering::SeqCst);
67+ }
68+ }
69+}
4370const PROVISION_SCRIPT: &str = include_str!("provision.sh");
71+const PROVISION_SCRIPT_NAME: &str = "provision.sh";
4472const RESIZE_DISK_SCRIPT: &str = include_str!("resize_disk.sh");
4573const DEFAULT_RAW_NAME: &str = "default.raw";
4674const INSTANCE_RAW_NAME: &str = "instance.raw";
4775const BASE_DISK_RAW_NAME: &str = "disk.raw";
4876
4977#[derive(Clone)]
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− },
78+pub(crate) enum LoginAction {
79+ Expect { text: String, timeout: Duration },
6080 Send(String),
6181}
62−use crate::config::BoxConfig;
6382use LoginAction::*;
6483
6584#[derive(Clone)]
66−pub struct DirectoryShare {
85+pub(crate) struct DirectoryShare {
6786 host: PathBuf,
6887 guest: PathBuf,
6988 read_only: bool,
7089}
7190
7291impl DirectoryShare {
73− pub fn new(host: PathBuf, mut guest: PathBuf, read_only: bool) -> Result<Self> {
92+ pub(crate) fn new(
93+ host: PathBuf,
94+ mut guest: PathBuf,
95+ read_only: bool,
96+ ) -> Result<Self, Box<dyn std::error::Error>> {
7497 if !host.exists() {
75− bail!(format!("host path does not exist: {}", host.display()));
98+ return Err(format!("Host path does not exist: {}", host.display()).into());
7699 }
77100 if !guest.is_absolute() {
78101 guest = PathBuf::from("/root").join(guest);
@@ -84,10 +107,10 @@ impl DirectoryShare {
84107 })
85108 }
86109
87− pub fn from_mount_spec(spec: &str) -> Result<Self> {
110+ pub(crate) fn from_mount_spec(spec: &str) -> Result<Self, Box<dyn std::error::Error>> {
88111 let parts: Vec<&str> = spec.split(':').collect();
89112 if parts.len() < 2 || parts.len() > 3 {
90− bail!(format!("invalid mount spec: {spec}"));
113+ return Err(format!("Invalid mount spec: {spec}").into());
91114 }
92115 let host = expand_tilde_path(parts[0]);
93116 let guest = PathBuf::from(parts[1]);
@@ -96,10 +119,11 @@ impl DirectoryShare {
96119 "read-only" => true,
97120 "read-write" => false,
98121 _ => {
99− bail!(format!(
122+ return Err(format!(
100123 "Invalid mount mode '{}'; expected read-only or read-write",
101124 parts[2]
102− ));
125+ )
126+ .into());
103127 }
104128 }
105129 } else {
@@ -143,28 +167,19 @@ pub struct VmArg {
143167 pub mounts: Vec<String>,
144168}
145169
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<()>
170+pub fn run_with_args<F>(args: VmArg, io_handler: F) -> Result<(), Box<dyn std::error::Error>>
155171where
156172 F: FnOnce(Arc<OutputMonitor>, OwnedFd, OwnedFd) -> IoContext,
157173{
158− run_with_args_and_extras(args, io_handler, Vec::new(), Vec::new(), None)
174+ run_with_args_and_extras(args, io_handler, Vec::new(), Vec::new())
159175}
160176
161−pub fn run_with_args_and_extras<F>(
177+pub(crate) fn run_with_args_and_extras<F>(
162178 args: VmArg,
163179 io_handler: F,
164180 extra_login_actions: Vec<LoginAction>,
165181 extra_directory_shares: Vec<DirectoryShare>,
166− status: Option<&StatusEmitter<'_>>,
167−) -> Result<()>
182+) -> Result<(), Box<dyn std::error::Error>>
168183where
169184 F: FnOnce(Arc<OutputMonitor>, OwnedFd, OwnedFd) -> IoContext,
170185{
@@ -173,7 +188,7 @@ where
173188 let project_root = env::current_dir()?;
174189 let project_name = project_root
175190 .file_name()
176− .with_context(|| "Project directory has no name")?
191+ .ok_or("Project directory has no name")?
177192 .to_string_lossy()
178193 .into_owned();
179194
@@ -185,10 +200,8 @@ where
185200 let guest_mise_cache = cache_dir.join(".guest-mise-cache");
186201
187202 let instance_dir = project_root.join(INSTANCE_DIR_NAME);
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");
203+ let status_file = StatusFile::new(instance_dir.join(STATUS_FILE_NAME));
204+ status_file.update("preparing VM image...");
192205
193206 let basename_compressed = DEBIAN_COMPRESSED_DISK_URL.rsplit('/').next().unwrap();
194207 let base_compressed = cache_dir.join(basename_compressed);
@@ -212,14 +225,13 @@ where
212225 &base_compressed,
213226 &default_raw,
214227 std::slice::from_ref(&mise_directory_share),
215− Some(&provision_log),
216− status,
228+ Some(&status_file),
217229 )?;
218230 let _ = ensure_instance_disk(
219231 &instance_raw,
220232 &default_raw,
221− ByteSize(args.disk_bytes),
222− status,
233+ args.disk_bytes,
234+ Some(&status_file),
223235 )?;
224236 let base_size = fs::metadata(&default_raw)?.len();
225237 let instance_size = fs::metadata(&instance_raw)?.len();
@@ -249,7 +261,7 @@ where
249261 }
250262
251263 if needs_resize {
252− let resize_cmd = script_command_from_content("resize_disk.sh", RESIZE_DISK_SCRIPT)?;
264+ let resize_cmd = script_command_from_content("resize_disk", RESIZE_DISK_SCRIPT)?;
253265 login_actions.push(Send(resize_cmd));
254266 }
255267
@@ -265,29 +277,25 @@ where
265277 &directory_shares[..],
266278 args.cpu_count,
267279 args.ram_bytes,
268− status,
280+ Some(&status_file),
269281 io_handler,
270282 )
271283}
272284
273−pub fn script_command_from_content(label: &str, script: &str) -> Result<String> {
285+pub(crate) fn script_command_from_content(
286+ label: &str,
287+ script: &str,
288+) -> Result<String, Box<dyn std::error::Error>> {
274289 let marker = "VIBE_SCRIPT_EOF";
275290 let guest_dir = "/tmp/vibe-scripts";
276291 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);
284292 let command = format!(
285− "mkdir -p {guest_dir}\ncat >{guest_path} <<'{marker}'\n{wrapped_script}\n{marker}\nchmod +x {guest_path}\n{guest_path}"
293+ "mkdir -p {guest_dir}\ncat >{guest_path} <<'{marker}'\n{script}\n{marker}\nchmod +x {guest_path}\n{guest_path}"
286294 );
287295 if script.contains(marker) {
288− bail!(format!(
289− "Script '{label}' contains marker '{marker}', cannot safely upload"
290− ));
296+ return Err(
297+ format!("Script '{label}' contains marker '{marker}', cannot safely upload").into(),
298+ );
291299 }
292300 Ok(command)
293301}
@@ -351,12 +359,6 @@ enum WaitResult {
351359 Found,
352360}
353361
354−#[derive(PartialEq, Eq)]
355−enum WaitAnyResult {
356− Timeout,
357− Found(usize),
358−}
359−
360362pub enum VmInput {
361363 Bytes(Vec<u8>),
362364 Shutdown,
@@ -364,7 +366,6 @@ pub enum VmInput {
364366
365367enum VmOutput {
366368 LoginActionTimeout { action: String, timeout: Duration },
367− LoginActionFailed { action: String, reason: String },
368369}
369370
370371#[derive(Default)]
@@ -401,41 +402,6 @@ impl OutputMonitor {
401402 WaitResult::Found
402403 }
403404 }
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
439405}
440406
441407#[derive(Debug)]
@@ -484,16 +450,18 @@ impl IoControl {
484450fn ensure_base_image(
485451 base_raw: &Path,
486452 base_compressed: &Path,
487− status: Option<&StatusEmitter<'_>>,
488−) -> Result<()> {
453+ status: Option<&StatusFile>,
454+) -> Result<(), Box<dyn std::error::Error>> {
489455 if base_raw.exists() {
490456 return Ok(());
491457 }
492458
493459 if !base_compressed.exists()
494− || fs::metadata(base_compressed).map(|m| m.len())? < DEBIAN_COMPRESSED_SIZE_BYTES
460+ || std::fs::metadata(base_compressed).map(|m| m.len())? < DEBIAN_COMPRESSED_SIZE_BYTES
495461 {
496− emit_status(status, "downloading base image...");
462+ if let Some(status) = status {
463+ status.update("downloading base image...");
464+ }
497465 tracing::info!("downloading base image");
498466 let status = Command::new("curl")
499467 .args([
@@ -508,14 +476,15 @@ fn ensure_base_image(
508476 ])
509477 .status()?;
510478 if !status.success() {
511− bail!("failed to download base image");
479+ return Err("Failed to download base image".into());
512480 }
513481 }
514482
515483 // Check SHA
516484 {
517− emit_status(status, "verifying base image...");
518− tracing::info!("verifying base image...");
485+ if let Some(status) = status {
486+ status.update("verifying base image...");
487+ }
519488 let input = format!("{} {}\n", DEBIAN_COMPRESSED_SHA, base_compressed.display());
520489
521490 let mut child = Command::new("/usr/bin/shasum")
@@ -533,25 +502,25 @@ fn ensure_base_image(
533502
534503 let status = child.wait().expect("failed to wait on child");
535504 if !status.success() {
536− bail!(format!(
537− "SHA validation failed for {DEBIAN_COMPRESSED_DISK_URL}"
538− ));
505+ return Err(format!("SHA validation failed for {DEBIAN_COMPRESSED_DISK_URL}").into());
539506 }
540507 }
541508
542− emit_status(status, "decompressing base image...");
543− tracing::info!("decompressing base image...");
509+ if let Some(status) = status {
510+ status.update("decompressing base image...");
511+ }
512+ tracing::info!("decompressing base image");
544513 let status = Command::new("tar")
545514 .args([
546515 "-xOf",
547516 &base_compressed.to_string_lossy(),
548517 BASE_DISK_RAW_NAME,
549518 ])
550− .stdout(fs::File::create(base_raw)?)
519+ .stdout(std::fs::File::create(base_raw)?)
551520 .status()?;
552521
553522 if !status.success() {
554− bail!("Failed to decompress base image");
523+ return Err("Failed to decompress base image".into());
555524 }
556525
557526 Ok(())
@@ -562,56 +531,29 @@ fn ensure_default_image(
562531 base_compressed: &Path,
563532 default_raw: &Path,
564533 directory_shares: &[DirectoryShare],
565− provision_log: Option<&Path>,
566− status: Option<&StatusEmitter<'_>>,
567−) -> Result<()> {
534+ status: Option<&StatusFile>,
535+) -> Result<(), Box<dyn std::error::Error>> {
568536 if default_raw.exists() {
569537 return Ok(());
570538 }
571539
572540 ensure_base_image(base_raw, base_compressed, status)?;
573541
574− emit_status(status, "configuring base image...");
575− tracing::info!("configuring base image...");
542+ if let Some(status) = status {
543+ status.update("configuring base image...");
544+ }
545+ tracing::info!("configuring base image");
576546 fs::copy(base_raw, default_raw)?;
577547
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− }
548+ let provision_command = script_command_from_content(PROVISION_SCRIPT_NAME, PROVISION_SCRIPT)?;
549+ run_vm(
550+ default_raw,
551+ &[Send(provision_command)],
552+ directory_shares,
553+ DEFAULT_CPU_COUNT,
554+ DEFAULT_RAM_BYTES,
555+ None,
556+ )?;
615557
616558 Ok(())
617559}
@@ -619,16 +561,18 @@ fn ensure_default_image(
619561fn ensure_instance_disk(
620562 instance_raw: &Path,
621563 template_raw: &Path,
622− target_bytes: ByteSize,
623− status: Option<&StatusEmitter<'_>>,
624−) -> Result<bool> {
564+ target_bytes: u64,
565+ status: Option<&StatusFile>,
566+) -> Result<bool, Box<dyn std::error::Error>> {
625567 if instance_raw.exists() {
626− let current_size = ByteSize(fs::metadata(instance_raw)?.len());
568+ let current_size = fs::metadata(instance_raw)?.len();
627569 if current_size != target_bytes {
628− let current_gb = current_size;
629− let target_gb = target_bytes;
570+ let current_gb = current_size as f64 / (1024.0 * 1024.0 * 1024.0);
571+ let target_gb = target_bytes as f64 / (1024.0 * 1024.0 * 1024.0);
630572 tracing::warn!(
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.",
573+ current_bytes = current_size,
574+ target_bytes,
575+ "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.",
632576 current_gb,
633577 target_gb
634578 );
@@ -636,28 +580,30 @@ fn ensure_instance_disk(
636580 return Ok(false);
637581 }
638582
639− let template_size = ByteSize(fs::metadata(template_raw)?.len());
583+ let template_size = fs::metadata(template_raw)?.len();
640584 if target_bytes < template_size {
641− bail!(format!(
642− "Requested disk size {} is smaller than base image size {}",
585+ return Err(format!(
586+ "Requested disk size {} bytes is smaller than base image size {} bytes",
643587 target_bytes, template_size
644− ));
588+ )
589+ .into());
645590 }
646591 let target_size = target_bytes;
647592 let needs_resize = target_size > template_size;
648593
649− emit_status(status, "creating instance disk...");
650− tracing::info!("creating instance disk...");
594+ if let Some(status) = status {
595+ status.update("creating instance disk...");
596+ }
651597 tracing::info!(path = %template_raw.display(), "creating instance disk");
652− fs::create_dir_all(instance_raw.parent().unwrap())?;
598+ std::fs::create_dir_all(instance_raw.parent().unwrap())?;
653599 if target_size == template_size {
654600 fs::copy(template_raw, instance_raw)?;
655601 return Ok(needs_resize);
656602 }
657603
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)?;
604+ let mut dst = std::fs::File::create(instance_raw)?;
605+ dst.set_len(target_size)?;
606+ let mut src = std::fs::File::open(template_raw)?;
661607 std::io::copy(&mut src, &mut dst)?;
662608 Ok(needs_resize)
663609}
@@ -675,17 +621,18 @@ pub fn create_pipe() -> (OwnedFd, OwnedFd) {
675621 (read_stream.into(), write_stream.into())
676622}
677623
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−>(
624+pub fn spawn_vm_io_with_hooks<F, G>(
682625 output_monitor: Arc<OutputMonitor>,
683626 vm_output_fd: OwnedFd,
684627 vm_input_fd: OwnedFd,
685628 io_control: Arc<IoControl>,
686629 mut on_line: F,
687630 mut on_output: G,
688−) -> IoContext {
631+) -> IoContext
632+where
633+ F: FnMut(&str) -> bool + ::std::marker::Send + 'static,
634+ G: FnMut(&[u8]) + ::std::marker::Send + 'static,
635+{
689636 let (input_tx, input_rx): (Sender<VmInput>, Receiver<VmInput>) = mpsc::channel();
690637
691638 // raw_guard is set when we've put the user's terminal into raw mode because we've attached stdin/stdout to the VM.
@@ -833,14 +780,14 @@ pub fn spawn_vm_io_with_hooks<
833780 PollResult::Spurious => continue,
834781 PollResult::Ready(bytes) => {
835782 if io_control.forward_output() {
836− // enable raw mode if we haven't already
783+ // enable raw mode, if we haven't already
837784 if raw_guard.lock().unwrap().is_none()
838785 && let Ok(guard) = enable_raw_mode(libc::STDIN_FILENO)
839786 {
840787 *raw_guard.lock().unwrap() = Some(guard);
841788 }
842789
843− let mut stdout = io::stdout().lock();
790+ let mut stdout = std::io::stdout().lock();
844791 if stdout.write_all(bytes).is_err() {
845792 break;
846793 }
@@ -856,7 +803,7 @@ pub fn spawn_vm_io_with_hooks<
856803
857804 // Copies data from mpsc channel into VM, so vibe can "type" stuff and run scripts.
858805 let mux_thread = thread::spawn(move || {
859− let mut vm_writer = fs::File::from(vm_input_fd);
806+ let mut vm_writer = std::fs::File::from(vm_input_fd);
860807 loop {
861808 match input_rx.recv() {
862809 Ok(VmInput::Bytes(data)) => {
@@ -886,7 +833,7 @@ pub fn spawn_vm_io_with_line_handler<F>(
886833 on_line: F,
887834) -> IoContext
888835where
889− F: FnMut(&str) -> bool + std::marker::Send + 'static,
836+ F: FnMut(&str) -> bool + ::std::marker::Send + 'static,
890837{
891838 spawn_vm_io_with_hooks(
892839 output_monitor,
@@ -906,36 +853,6 @@ pub fn spawn_vm_io(
906853 spawn_vm_io_with_line_handler(output_monitor, vm_output_fd, vm_input_fd, |_| false)
907854}
908855
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−
939856impl IoContext {
940857 pub fn shutdown(self) {
941858 let _ = self.input_tx.send(VmInput::Shutdown);
@@ -953,7 +870,7 @@ fn create_vm_configuration(
953870 vm_writes_to_fd: OwnedFd,
954871 cpu_count: usize,
955872 ram_bytes: u64,
956−) -> Result<Retained<VZVirtualMachineConfiguration>> {
873+) -> Result<Retained<VZVirtualMachineConfiguration>, Box<dyn std::error::Error>> {
957874 unsafe {
958875 let platform =
959876 VZGenericPlatformConfiguration::init(VZGenericPlatformConfiguration::alloc());
@@ -987,7 +904,7 @@ fn create_vm_configuration(
987904 false,
988905 VZDiskImageCachingMode::Automatic,
989906 VZDiskImageSynchronizationMode::Full,
990− )?;
907+ ).unwrap();
991908
992909 let disk_device = VZVirtioBlockDeviceConfiguration::initWithAttachment(
993910 VZVirtioBlockDeviceConfiguration::alloc(),
@@ -1074,7 +991,7 @@ fn create_vm_configuration(
1074991 // Validate
1075992 config.validateWithError().map_err(|e| {
1076993 io::Error::other(format!(
1077− "invalid VM configuration: {:?}",
994+ "Invalid VM configuration: {:?}",
1078995 e.localizedDescription()
1079996 ))
1080997 })?;
@@ -1083,9 +1000,9 @@ fn create_vm_configuration(
10831000 }
10841001}
10851002
1086−fn load_efi_variable_store() -> Result<Retained<VZEFIVariableStore>> {
1003+fn load_efi_variable_store() -> Result<Retained<VZEFIVariableStore>, Box<dyn std::error::Error>> {
10871004 unsafe {
1088− let temp_dir = env::temp_dir();
1005+ let temp_dir = std::env::temp_dir();
10891006 let temp_path = temp_dir.join(format!("efi_variable_store_{}.efivars", std::process::id()));
10901007 let url = nsurl_from_path(&temp_path)?;
10911008 let options = VZEFIVariableStoreInitializationOptions::AllowOverwrite;
@@ -1101,8 +1018,8 @@ fn load_efi_variable_store() -> Result<Retained<VZEFIVariableStore>> {
11011018fn spawn_login_actions_thread(
11021019 login_actions: Vec<LoginAction>,
11031020 output_monitor: Arc<OutputMonitor>,
1104− input_tx: Sender<VmInput>,
1105− vm_output_tx: Sender<VmOutput>,
1021+ input_tx: mpsc::Sender<VmInput>,
1022+ vm_output_tx: mpsc::Sender<VmOutput>,
11061023) -> thread::JoinHandle<()> {
11071024 thread::spawn(move || {
11081025 for a in login_actions {
@@ -1116,27 +1033,6 @@ fn spawn_login_actions_thread(
11161033 return;
11171034 }
11181035 }
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− },
11401036 Send(mut text) => {
11411037 text.push('\n'); // Type the newline so the command is actually submitted.
11421038 input_tx.send(VmInput::Bytes(text.into_bytes())).unwrap();
@@ -1152,9 +1048,9 @@ fn run_vm_with_io<F>(
11521048 directory_shares: &[DirectoryShare],
11531049 cpu_count: usize,
11541050 ram_bytes: u64,
1155− status: Option<&StatusEmitter<'_>>,
1051+ status: Option<&StatusFile>,
11561052 io_handler: F,
1157−) -> Result<()>
1053+) -> Result<(), Box<dyn std::error::Error>>
11581054where
11591055 F: FnOnce(Arc<OutputMonitor>, OwnedFd, OwnedFd) -> IoContext,
11601056{
@@ -1201,22 +1097,23 @@ where
12011097
12021098 match rx.try_recv() {
12031099 Ok(result) => {
1204− result.map_err(|e| Error::msg(format!("Failed to start VM: {}", e)))?;
1100+ result.map_err(|e| format!("Failed to start VM: {}", e))?;
12051101 break;
12061102 }
12071103 Err(mpsc::TryRecvError::Empty) => continue,
12081104 Err(mpsc::TryRecvError::Disconnected) => {
1209− bail!("VM start channel disconnected");
1105+ return Err("VM start channel disconnected".into());
12101106 }
12111107 }
12121108 }
12131109
12141110 if Instant::now() >= start_deadline {
1215− bail!("Timed out waiting for VM to start");
1111+ return Err("Timed out waiting for VM to start".into());
12161112 }
12171113
1218− emit_status(status, "vm booting... go vibecoder!");
1219− tracing::info!("vm booting... go vibecoder!");
1114+ if let Some(status) = status {
1115+ status.update("vm booting... go vibecoder!");
1116+ }
12201117 tracing::info!("vm booting");
12211118
12221119 let output_monitor = Arc::new(OutputMonitor::default());
@@ -1262,7 +1159,7 @@ where
12621159 );
12631160
12641161 let mut last_state = None;
1265− let mut exit_result: Result<(), String> = Ok(());
1162+ let mut exit_result = Ok(());
12661163 loop {
12671164 unsafe {
12681165 NSRunLoop::mainRunLoop().runMode_beforeDate(
@@ -1281,24 +1178,8 @@ where
12811178 exit_result = Err(format!(
12821179 "Login action ({}) timed out after {:?}; shutting down.",
12831180 action, timeout
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− ));
1181+ )
1182+ .into());
13021183 unsafe {
13031184 if vm.canRequestStop() {
13041185 if let Err(err) = vm.requestStopWithError() {
@@ -1314,7 +1195,7 @@ where
13141195 Err(mpsc::TryRecvError::Empty) => {}
13151196 Err(mpsc::TryRecvError::Disconnected) => {}
13161197 }
1317− if state != VZVirtualMachineState::Running {
1198+ if state != objc2_virtualization::VZVirtualMachineState::Running {
13181199 //eprintln!("VM stopped with state: {:?}", state);
13191200 break;
13201201 }
@@ -1324,7 +1205,7 @@ where
13241205
13251206 io_ctx.shutdown();
13261207
1327− exit_result.map_err(Error::msg)
1208+ exit_result
13281209}
13291210
13301211fn run_vm(
@@ -1333,8 +1214,8 @@ fn run_vm(
13331214 directory_shares: &[DirectoryShare],
13341215 cpu_count: usize,
13351216 ram_bytes: u64,
1336− status: Option<&StatusEmitter<'_>>,
1337−) -> Result<()> {
1217+ status: Option<&StatusFile>,
1218+) -> Result<(), Box<dyn std::error::Error>> {
13381219 run_vm_with_io(
13391220 disk_path,
13401221 login_actions,
@@ -1346,7 +1227,7 @@ fn run_vm(
13461227 )
13471228}
13481229
1349−fn nsurl_from_path(path: &Path) -> Result<Retained<NSURL>> {
1230+fn nsurl_from_path(path: &Path) -> Result<Retained<NSURL>, Box<dyn std::error::Error>> {
13501231 let abs_path = if path.is_absolute() {
13511232 path.to_path_buf()
13521233 } else {
@@ -1355,7 +1236,7 @@ fn nsurl_from_path(path: &Path) -> Result<Retained<NSURL>> {
13551236 let ns_path = NSString::from_str(
13561237 abs_path
13571238 .to_str()
1358− .with_context(|| "non-UTF8 path encountered while building NSURL")?,
1239+ .ok_or("Non-UTF8 path encountered while building NSURL")?,
13591240 );
13601241 Ok(NSURL::fileURLWithPath(&ns_path))
13611242}
@@ -1370,7 +1251,7 @@ fn enable_raw_mode(fd: i32) -> io::Result<RawModeGuard> {
13701251 let original = attributes;
13711252
13721253 // Disable translation of carriage return to newline on input
1373− attributes.c_iflag &= !libc::ICRNL;
1254+ attributes.c_iflag &= !(libc::ICRNL);
13741255 // Disable canonical mode (line buffering), echo, and signal generation
13751256 attributes.c_lflag &= !(libc::ICANON | libc::ECHO | libc::ISIG);
13761257 attributes.c_cc[libc::VMIN] = 0;
@@ -1398,10 +1279,10 @@ impl Drop for RawModeGuard {
13981279
13991280// Ensure the running binary has com.apple.security.virtualization entitlements by checking and, if not, signing and relaunching.
14001281pub fn ensure_signed() {
1401− if env::var("VIBEBOX_SKIP_CODESIGN").as_deref() == Ok("1") {
1282+ if std::env::var("VIBEBOX_SKIP_CODESIGN").as_deref() == Ok("1") {
14021283 return;
14031284 }
1404− let exe = env::current_exe().expect("failed to get current exe path");
1285+ let exe = std::env::current_exe().expect("failed to get current exe path");
14051286 let exe_str = exe.to_str().expect("exe path not valid utf-8");
14061287
14071288 let has_required_entitlements = {
@@ -1423,8 +1304,8 @@ pub fn ensure_signed() {
14231304 }
14241305
14251306 const ENTITLEMENTS: &str = include_str!("entitlements.plist");
1426− let entitlements_path = env::temp_dir().join("entitlements.plist");
1427− fs::write(&entitlements_path, ENTITLEMENTS).expect("failed to write entitlements");
1307+ let entitlements_path = std::env::temp_dir().join("entitlements.plist");
1308+ std::fs::write(&entitlements_path, ENTITLEMENTS).expect("failed to write entitlements");
14281309
14291310 let output = Command::new("codesign")
14301311 .args([
@@ -1437,7 +1318,7 @@ pub fn ensure_signed() {
14371318 ])
14381319 .output();
14391320
1440− let _ = fs::remove_file(&entitlements_path);
1321+ let _ = std::fs::remove_file(&entitlements_path);
14411322
14421323 match output {
14431324 Ok(o) if o.status.success() => {
@@ -1445,7 +1326,7 @@ pub fn ensure_signed() {
14451326 if !stderr.trim().is_empty() {
14461327 tracing::debug!(codesign_stderr = %stderr.trim(), "codesign output");
14471328 }
1448− let err = Command::new(&exe).args(env::args_os().skip(1)).exec();
1329+ let err = Command::new(&exe).args(std::env::args_os().skip(1)).exec();
14491330 tracing::error!(error = %err, "failed to re-exec after signing");
14501331 std::process::exit(1);
14511332 }