@@ -1,5 +1,5 @@
1−use crate::instance::STATUS_FILE_NAME;
2use crate::session_manager::{GLOBAL_CACHE_DIR_NAME, INSTANCE_DIR_NAME};
1use crate::session_manager::{GLOBAL_CACHE_DIR_NAME, INSTANCE_DIR_NAME};
2+use anyhow::{Context, Error, Result, bail};
5 io::{self, Write},
5 io::{self, Write},
@@ -23,6 +23,7 @@ use std::{
25use block2::RcBlock;
25use block2::RcBlock;
26+use bytesize::ByteSize;
26use dispatch2::DispatchQueue;
27use dispatch2::DispatchQueue;
27use objc2::{AnyThread, rc::Retained, runtime::ProtocolObject};
28use objc2::{AnyThread, rc::Retained, runtime::ProtocolObject};
28use objc2_foundation::*;
29use objc2_foundation::*;
@@ -32,75 +33,46 @@ const DEBIAN_COMPRESSED_DISK_URL: &str = "https://cloud.debian.org/images/cloud/
32const DEBIAN_COMPRESSED_SHA: &str = "6ab9be9e6834adc975268367f2f0235251671184345c34ee13031749fdfbf66fe4c3aafd949a2d98550426090e9ac645e79009c51eb0eefc984c15786570bb38";
33const DEBIAN_COMPRESSED_SHA: &str = "6ab9be9e6834adc975268367f2f0235251671184345c34ee13031749fdfbf66fe4c3aafd949a2d98550426090e9ac645e79009c51eb0eefc984c15786570bb38";
33const DEBIAN_COMPRESSED_SIZE_BYTES: u64 = 280901576;
34const DEBIAN_COMPRESSED_SIZE_BYTES: u64 = 280901576;
34const SHARED_DIRECTORIES_TAG: &str = "shared";
35const SHARED_DIRECTORIES_TAG: &str = "shared";
36+pub const PROJECT_GUEST_BASE: &str = "/usr/local/vibebox-mounts";
36−const BYTES_PER_MB: u64 = 1024 * 1024;
37−const DEFAULT_CPU_COUNT: usize = 2;
38−const DEFAULT_RAM_MB: u64 = 2048;
39−const DEFAULT_RAM_BYTES: u64 = DEFAULT_RAM_MB * BYTES_PER_MB;
40const START_TIMEOUT: Duration = Duration::from_secs(60);
38const START_TIMEOUT: Duration = Duration::from_secs(60);
41const LOGIN_EXPECT_TIMEOUT: Duration = Duration::from_secs(120);
39const LOGIN_EXPECT_TIMEOUT: Duration = Duration::from_secs(120);
40+const PROVISION_EXPECT_TIMEOUT: Duration = Duration::from_secs(900);
43−struct StatusFile {
42+const ERROR_REPORT_SCRIPT: &str = include_str!("error_report.sh");
49− fn new(path: PathBuf) -> Self {
52− cleared: AtomicBool::new(false),
56− fn update(&self, message: &str) {
57− let _ = fs::write(&self.path, message);
61− if !self.cleared.swap(true, Ordering::SeqCst) {
62− let _ = fs::remove_file(&self.path);
67−impl Drop for StatusFile {
69− if !self.cleared.load(Ordering::SeqCst) {
70− let _ = fs::remove_file(&self.path);
71− self.cleared.store(true, Ordering::SeqCst);
75const PROVISION_SCRIPT: &str = include_str!("provision.sh");
43const PROVISION_SCRIPT: &str = include_str!("provision.sh");
76−const PROVISION_SCRIPT_NAME: &str = "provision.sh";
44+const RESIZE_DISK_SCRIPT: &str = include_str!("resize_disk.sh");
77const DEFAULT_RAW_NAME: &str = "default.raw";
45const DEFAULT_RAW_NAME: &str = "default.raw";
78const INSTANCE_RAW_NAME: &str = "instance.raw";
46const INSTANCE_RAW_NAME: &str = "instance.raw";
79const BASE_DISK_RAW_NAME: &str = "disk.raw";
47const BASE_DISK_RAW_NAME: &str = "disk.raw";
81#[derive(Clone)]
49#[derive(Clone)]
82−pub(crate) enum LoginAction {
50+pub enum LoginAction {
83− Expect { text: String, timeout: Duration },
53+ timeout: Duration,
84 Send(String),
60 Send(String),
85− Script { path: PathBuf, index: usize },
62+use crate::config::BoxConfig;
87use LoginAction::*;
63use LoginAction::*;
89#[derive(Clone)]
65#[derive(Clone)]
90−pub(crate) struct DirectoryShare {
66+pub struct DirectoryShare {
91 host: PathBuf,
67 host: PathBuf,
92 guest: PathBuf,
68 guest: PathBuf,
93 read_only: bool,
69 read_only: bool,
96impl DirectoryShare {
72impl DirectoryShare {
99− mut guest: PathBuf,
73+ pub fn new(host: PathBuf, mut guest: PathBuf, read_only: bool) -> Result<Self> {
101− ) -> Result<Self, Box<dyn std::error::Error>> {
102 if !host.exists() {
74 if !host.exists() {
103− return Err(format!("Host path does not exist: {}", host.display()).into());
75+ bail!(format!("host path does not exist: {}", host.display()));
105 if !guest.is_absolute() {
77 if !guest.is_absolute() {
106 guest = PathBuf::from("/root").join(guest);
78 guest = PathBuf::from("/root").join(guest);
@@ -112,10 +84,10 @@ impl DirectoryShare {
115− 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> {
116 let parts: Vec<&str> = spec.split(':').collect();
88 let parts: Vec<&str> = spec.split(':').collect();
117 if parts.len() < 2 || parts.len() > 3 {
89 if parts.len() < 2 || parts.len() > 3 {
118− return Err(format!("Invalid mount spec: {spec}").into());
90+ bail!(format!("invalid mount spec: {spec}"));
120 let host = expand_tilde_path(parts[0]);
92 let host = expand_tilde_path(parts[0]);
121 let guest = PathBuf::from(parts[1]);
93 let guest = PathBuf::from(parts[1]);
@@ -124,11 +96,10 @@ impl DirectoryShare {
124 "read-only" => true,
96 "read-only" => true,
125 "read-write" => false,
97 "read-write" => false,
127− return Err(format!(
99+ bail!(format!(
128 "Invalid mount mode '{}'; expected read-only or read-write",
100 "Invalid mount mode '{}'; expected read-only or read-write",
@@ -156,10 +127,10 @@ fn expand_tilde_path(value: &str) -> PathBuf {
156 if let Ok(home) = env::var("HOME") {
127 if let Ok(home) = env::var("HOME") {
157 return PathBuf::from(home).join(stripped);
128 return PathBuf::from(home).join(stripped);
159− } else if value == "~" {
130+ } else if value == "~"
160− if let Ok(home) = env::var("HOME") {
131+ && let Ok(home) = env::var("HOME")
161− return PathBuf::from(home);
133+ return PathBuf::from(home);
164 PathBuf::from(value)
135 PathBuf::from(value)
@@ -167,23 +138,33 @@ fn expand_tilde_path(value: &str) -> PathBuf {
167pub struct VmArg {
138pub struct VmArg {
168 pub cpu_count: usize,
139 pub cpu_count: usize,
169 pub ram_bytes: u64,
140 pub ram_bytes: u64,
141+ pub disk_bytes: u64,
170 pub no_default_mounts: bool,
142 pub no_default_mounts: bool,
171 pub mounts: Vec<String>,
143 pub mounts: Vec<String>,
146+type StatusEmitter<'a> = dyn Fn(&str) + std::marker::Send + Sync + 'a;
148+fn emit_status(status: Option<&StatusEmitter<'_>>, message: &str) {
149+ if let Some(status) = status {
174−pub fn run_with_args<F>(args: VmArg, io_handler: F) -> Result<(), Box<dyn std::error::Error>>
154+pub fn run_with_args<F>(args: VmArg, io_handler: F) -> Result<()>
176 F: FnOnce(Arc<OutputMonitor>, OwnedFd, OwnedFd) -> IoContext,
156 F: FnOnce(Arc<OutputMonitor>, OwnedFd, OwnedFd) -> IoContext,
178− 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)
181−pub(crate) fn run_with_args_and_extras<F>(
161+pub fn run_with_args_and_extras<F>(
182 args: VmArg,
162 args: VmArg,
183 io_handler: F,
163 io_handler: F,
184 extra_login_actions: Vec<LoginAction>,
164 extra_login_actions: Vec<LoginAction>,
185 extra_directory_shares: Vec<DirectoryShare>,
165 extra_directory_shares: Vec<DirectoryShare>,
186−) -> Result<(), Box<dyn std::error::Error>>
166+ status: Option<&StatusEmitter<'_>>,
188 F: FnOnce(Arc<OutputMonitor>, OwnedFd, OwnedFd) -> IoContext,
169 F: FnOnce(Arc<OutputMonitor>, OwnedFd, OwnedFd) -> IoContext,
@@ -192,7 +173,7 @@ where
192 let project_root = env::current_dir()?;
173 let project_root = env::current_dir()?;
193 let project_name = project_root
174 let project_name = project_root
194 .file_name()
175 .file_name()
195− .ok_or("Project directory has no name")?
176+ .with_context(|| "Project directory has no name")?
196 .to_string_lossy()
177 .to_string_lossy()
197 .into_owned();
178 .into_owned();
@@ -204,8 +185,10 @@ where
204 let guest_mise_cache = cache_dir.join(".guest-mise-cache");
185 let guest_mise_cache = cache_dir.join(".guest-mise-cache");
206 let instance_dir = project_root.join(INSTANCE_DIR_NAME);
187 let instance_dir = project_root.join(INSTANCE_DIR_NAME);
207− let status_file = StatusFile::new(instance_dir.join(STATUS_FILE_NAME));
188+ fs::create_dir_all(&instance_dir)?;
208− status_file.update("preparing VM image...");
189+ emit_status(status, "preparing VM image...");
190+ tracing::info!("preparing VM image...");
191+ let provision_log = instance_dir.join("provision.log");
210 let basename_compressed = DEBIAN_COMPRESSED_DISK_URL.rsplit('/').next().unwrap();
193 let basename_compressed = DEBIAN_COMPRESSED_DISK_URL.rsplit('/').next().unwrap();
211 let base_compressed = cache_dir.join(basename_compressed);
194 let base_compressed = cache_dir.join(basename_compressed);
@@ -229,16 +212,26 @@ where
229 &base_compressed,
212 &base_compressed,
230 &default_raw,
213 &default_raw,
231 std::slice::from_ref(&mise_directory_share),
214 std::slice::from_ref(&mise_directory_share),
232− Some(&status_file),
215+ Some(&provision_log),
218+ let _ = ensure_instance_disk(
221+ ByteSize(args.disk_bytes),
234− ensure_instance_disk(&instance_raw, &default_raw, Some(&status_file))?;
224+ let base_size = fs::metadata(&default_raw)?.len();
225+ let instance_size = fs::metadata(&instance_raw)?.len();
226+ let needs_resize = instance_size > base_size;
235 let disk_path = instance_raw;
227 let disk_path = instance_raw;
237 let mut login_actions = Vec::new();
229 let mut login_actions = Vec::new();
238 let mut directory_shares = Vec::new();
230 let mut directory_shares = Vec::new();
240 if !args.no_default_mounts {
232 if !args.no_default_mounts {
233+ let project_guest_dir = PathBuf::from(PROJECT_GUEST_BASE).join(project_name);
241− login_actions.push(Send(format!("cd {project_name}")));
234+ login_actions.push(Send(format!("cd {}", project_guest_dir.display())));
243 // discourage read/write of .git folder from within the VM. note that this isn't secure, since the VM runs as root and could unmount this.
236 // discourage read/write of .git folder from within the VM. note that this isn't secure, since the VM runs as root and could unmount this.
244 // I couldn't find an alternative way to do this --- the MacOS sandbox doesn't apply to the Apple Virtualization system
237 // I couldn't find an alternative way to do this --- the MacOS sandbox doesn't apply to the Apple Virtualization system
@@ -246,15 +239,6 @@ where
246 login_actions.push(Send(r"mount -t tmpfs tmpfs .git/".into()));
239 login_actions.push(Send(r"mount -t tmpfs tmpfs .git/".into()));
249− directory_shares.push(
250− DirectoryShare::new(
252− PathBuf::from("/root/").join(project_name),
255− .expect("Project directory must exist"),
258 directory_shares.push(mise_directory_share);
242 directory_shares.push(mise_directory_share);
@@ -264,6 +248,11 @@ where
264 directory_shares.push(DirectoryShare::from_mount_spec(spec)?);
248 directory_shares.push(DirectoryShare::from_mount_spec(spec)?);
252+ let resize_cmd = script_command_from_content("resize_disk.sh", RESIZE_DISK_SCRIPT)?;
253+ login_actions.push(Send(resize_cmd));
267 if let Some(motd_action) = motd_login_action(&directory_shares) {
256 if let Some(motd_action) = motd_login_action(&directory_shares) {
268 login_actions.push(motd_action);
257 login_actions.push(motd_action);
@@ -276,35 +265,29 @@ where
276 &directory_shares[..],
265 &directory_shares[..],
277 args.cpu_count,
266 args.cpu_count,
278 args.ram_bytes,
267 args.ram_bytes,
279− Some(&status_file),
268+ status,
280 io_handler,
269 io_handler,
284−fn script_command_from_path(
287−) -> Result<String, Box<dyn std::error::Error>> {
288− let script = fs::read_to_string(path)
289− .map_err(|err| format!("Failed to read script {}: {err}", path.display()))?;
290− let label = format!("{}_{}", index, path.file_name().unwrap().display());
291− script_command_from_content(&label, &script)
294−pub(crate) fn script_command_from_content(
273+pub fn script_command_from_content(label: &str, script: &str) -> Result<String> {
297−) -> Result<String, Box<dyn std::error::Error>> {
298 let marker = "VIBE_SCRIPT_EOF";
274 let marker = "VIBE_SCRIPT_EOF";
299 let guest_dir = "/tmp/vibe-scripts";
275 let guest_dir = "/tmp/vibe-scripts";
300 let guest_path = format!("{guest_dir}/{label}.sh");
276 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,
281+ let wrapped_script = ERROR_REPORT_SCRIPT
282+ .replace("__LABEL__", label)
283+ .replace("__SCRIPT_BODY__", script_body);
301 let command = format!(
284 let command = format!(
302− "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}"
304 if script.contains(marker) {
287 if script.contains(marker) {
305− return Err(
288+ bail!(format!(
306− format!("Script '{label}' contains marker '{marker}', cannot safely upload").into(),
289+ "Script '{label}' contains marker '{marker}', cannot safely upload"
309 Ok(command)
292 Ok(command)
@@ -368,6 +351,12 @@ enum WaitResult {
354+#[derive(PartialEq, Eq)]
371pub enum VmInput {
360pub enum VmInput {
372 Bytes(Vec<u8>),
361 Bytes(Vec<u8>),
373 Shutdown,
362 Shutdown,
@@ -375,6 +364,7 @@ pub enum VmInput {
376enum VmOutput {
365enum VmOutput {
377 LoginActionTimeout { action: String, timeout: Duration },
366 LoginActionTimeout { action: String, timeout: Duration },
367+ LoginActionFailed { action: String, reason: String },
380#[derive(Default)]
370#[derive(Default)]
@@ -411,6 +401,41 @@ impl OutputMonitor {
411 WaitResult::Found
401 WaitResult::Found
405+ fn wait_for_any(&self, needles: &[&str], timeout: Duration) -> WaitAnyResult {
406+ let mut found: Option<usize> = None;
407+ let (_unused, timeout_result) = self
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();
420+ if timeout_result.timed_out() {
421+ WaitAnyResult::Timeout
423+ WaitAnyResult::Found(found.unwrap_or(0))
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);
416#[derive(Debug)]
441#[derive(Debug)]
@@ -459,18 +484,16 @@ impl IoControl {
459fn ensure_base_image(
484fn ensure_base_image(
460 base_raw: &Path,
485 base_raw: &Path,
461 base_compressed: &Path,
486 base_compressed: &Path,
462− status: Option<&StatusFile>,
487+ status: Option<&StatusEmitter<'_>>,
463−) -> Result<(), Box<dyn std::error::Error>> {
488+) -> Result<()> {
464 if base_raw.exists() {
489 if base_raw.exists() {
465 return Ok(());
490 return Ok(());
468 if !base_compressed.exists()
493 if !base_compressed.exists()
469− || 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
471− if let Some(status) = status {
472− status.update("downloading base image...");
496+ emit_status(status, "downloading base image...");
474 tracing::info!("downloading base image");
497 tracing::info!("downloading base image");
475 let status = Command::new("curl")
498 let status = Command::new("curl")
@@ -485,15 +508,14 @@ fn ensure_base_image(
486 .status()?;
509 .status()?;
487 if !status.success() {
510 if !status.success() {
488− return Err("Failed to download base image".into());
511+ bail!("failed to download base image");
492 // Check SHA
515 // Check SHA
494− if let Some(status) = status {
517+ emit_status(status, "verifying base image...");
495− status.update("verifying base image...");
518+ tracing::info!("verifying base image...");
497 let input = format!("{} {}\n", DEBIAN_COMPRESSED_SHA, base_compressed.display());
519 let input = format!("{} {}\n", DEBIAN_COMPRESSED_SHA, base_compressed.display());
499 let mut child = Command::new("/usr/bin/shasum")
521 let mut child = Command::new("/usr/bin/shasum")
@@ -511,25 +533,25 @@ fn ensure_base_image(
512 let status = child.wait().expect("failed to wait on child");
534 let status = child.wait().expect("failed to wait on child");
513 if !status.success() {
535 if !status.success() {
514− return Err(format!("SHA validation failed for {DEBIAN_COMPRESSED_DISK_URL}").into());
537+ "SHA validation failed for {DEBIAN_COMPRESSED_DISK_URL}"
518− if let Some(status) = status {
519− status.update("decompressing base image...");
542+ emit_status(status, "decompressing base image...");
521− tracing::info!("decompressing base image");
543+ tracing::info!("decompressing base image...");
522 let status = Command::new("tar")
544 let status = Command::new("tar")
525 &base_compressed.to_string_lossy(),
547 &base_compressed.to_string_lossy(),
526 BASE_DISK_RAW_NAME,
548 BASE_DISK_RAW_NAME,
528− .stdout(std::fs::File::create(base_raw)?)
550+ .stdout(fs::File::create(base_raw)?)
529 .status()?;
551 .status()?;
531 if !status.success() {
553 if !status.success() {
532− return Err("Failed to decompress base image".into());
554+ bail!("Failed to decompress base image");
@@ -540,29 +562,56 @@ fn ensure_default_image(
540 base_compressed: &Path,
562 base_compressed: &Path,
541 default_raw: &Path,
563 default_raw: &Path,
542 directory_shares: &[DirectoryShare],
564 directory_shares: &[DirectoryShare],
565+ provision_log: Option<&Path>,
543− status: Option<&StatusFile>,
566+ status: Option<&StatusEmitter<'_>>,
544−) -> Result<(), Box<dyn std::error::Error>> {
567+) -> Result<()> {
545 if default_raw.exists() {
568 if default_raw.exists() {
546 return Ok(());
569 return Ok(());
549 ensure_base_image(base_raw, base_compressed, status)?;
572 ensure_base_image(base_raw, base_compressed, status)?;
551− if let Some(status) = status {
552− status.update("configuring base image...");
574+ emit_status(status, "configuring base image...");
554− tracing::info!("configuring base image");
575+ tracing::info!("configuring base image...");
555 fs::copy(base_raw, default_raw)?;
576 fs::copy(base_raw, default_raw)?;
557− let provision_command = script_command_from_content(PROVISION_SCRIPT_NAME, PROVISION_SCRIPT)?;
578+ let provision_command = script_command_from_content("provision.sh", PROVISION_SCRIPT)?;
558− run_vm(
579+ let provision_actions = [
560− &[Send(provision_command)],
580+ Send(provision_command),
582+ success: "VIBEBOX_PROVISION_OK".to_string(),
583+ failure: "VIBEBOX_PROVISION_FAILED".to_string(),
584+ timeout: PROVISION_EXPECT_TIMEOUT,
587+ let provision_result = if let Some(log_path) = provision_log {
588+ let log_path = log_path.to_path_buf();
593+ BoxConfig::default().cpu_count,
594+ BoxConfig::default().ram_size.as_u64(),
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)
561− directory_shares,
604+ directory_shares,
562− DEFAULT_CPU_COUNT,
605+ BoxConfig::default().cpu_count,
563− DEFAULT_RAM_BYTES,
606+ BoxConfig::default().ram_size.as_u64(),
611+ if let Err(err) = provision_result {
612+ let _ = fs::remove_file(default_raw);
@@ -570,19 +619,47 @@ fn ensure_default_image(
570fn ensure_instance_disk(
619fn ensure_instance_disk(
571 instance_raw: &Path,
620 instance_raw: &Path,
572 template_raw: &Path,
621 template_raw: &Path,
622+ target_bytes: ByteSize,
573− status: Option<&StatusFile>,
623+ status: Option<&StatusEmitter<'_>>,
574−) -> Result<(), Box<dyn std::error::Error>> {
624+) -> Result<bool> {
575 if instance_raw.exists() {
625 if instance_raw.exists() {
626+ let current_size = ByteSize(fs::metadata(instance_raw)?.len());
627+ if current_size != target_bytes {
628+ let current_gb = current_size;
629+ let target_gb = target_bytes;
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.",
576− return Ok(());
636+ return Ok(false);
579− if let Some(status) = status {
639+ let template_size = ByteSize(fs::metadata(template_raw)?.len());
580− status.update("creating instance disk...");
640+ if target_bytes < template_size {
642+ "Requested disk size {} is smaller than base image size {}",
643+ target_bytes, template_size
646+ let target_size = target_bytes;
647+ let needs_resize = target_size > template_size;
649+ emit_status(status, "creating instance disk...");
650+ tracing::info!("creating instance disk...");
582 tracing::info!(path = %template_raw.display(), "creating instance disk");
651 tracing::info!(path = %template_raw.display(), "creating instance disk");
583− std::fs::create_dir_all(instance_raw.parent().unwrap())?;
652+ fs::create_dir_all(instance_raw.parent().unwrap())?;
653+ if target_size == template_size {
584− fs::copy(template_raw, instance_raw)?;
654+ fs::copy(template_raw, instance_raw)?;
585− Ok(())
655+ return Ok(needs_resize);
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)?;
661+ std::io::copy(&mut src, &mut dst)?;
588pub struct IoContext {
665pub struct IoContext {
@@ -598,18 +675,17 @@ pub fn create_pipe() -> (OwnedFd, OwnedFd) {
598 (read_stream.into(), write_stream.into())
675 (read_stream.into(), write_stream.into())
601−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,
602 output_monitor: Arc<OutputMonitor>,
682 output_monitor: Arc<OutputMonitor>,
603 vm_output_fd: OwnedFd,
683 vm_output_fd: OwnedFd,
604 vm_input_fd: OwnedFd,
684 vm_input_fd: OwnedFd,
605 io_control: Arc<IoControl>,
685 io_control: Arc<IoControl>,
606 mut on_line: F,
686 mut on_line: F,
607 mut on_output: G,
687 mut on_output: G,
608−) -> IoContext
688+) -> IoContext {
610− F: FnMut(&str) -> bool + ::std::marker::Send + 'static,
611− G: FnMut(&[u8]) + ::std::marker::Send + 'static,
613 let (input_tx, input_rx): (Sender<VmInput>, Receiver<VmInput>) = mpsc::channel();
689 let (input_tx, input_rx): (Sender<VmInput>, Receiver<VmInput>) = mpsc::channel();
615 // raw_guard is set when we've put the user's terminal into raw mode because we've attached stdin/stdout to the VM.
691 // raw_guard is set when we've put the user's terminal into raw mode because we've attached stdin/stdout to the VM.
@@ -757,14 +833,14 @@ where
757 PollResult::Spurious => continue,
833 PollResult::Spurious => continue,
758 PollResult::Ready(bytes) => {
834 PollResult::Ready(bytes) => {
759 if io_control.forward_output() {
835 if io_control.forward_output() {
760− // enable raw mode, if we haven't already
836+ // enable raw mode if we haven't already
761 if raw_guard.lock().unwrap().is_none()
837 if raw_guard.lock().unwrap().is_none()
762 && let Ok(guard) = enable_raw_mode(libc::STDIN_FILENO)
838 && let Ok(guard) = enable_raw_mode(libc::STDIN_FILENO)
764 *raw_guard.lock().unwrap() = Some(guard);
840 *raw_guard.lock().unwrap() = Some(guard);
767− let mut stdout = std::io::stdout().lock();
843+ let mut stdout = io::stdout().lock();
768 if stdout.write_all(bytes).is_err() {
844 if stdout.write_all(bytes).is_err() {
@@ -780,7 +856,7 @@ where
781 // Copies data from mpsc channel into VM, so vibe can "type" stuff and run scripts.
857 // Copies data from mpsc channel into VM, so vibe can "type" stuff and run scripts.
782 let mux_thread = thread::spawn(move || {
858 let mux_thread = thread::spawn(move || {
783− let mut vm_writer = std::fs::File::from(vm_input_fd);
859+ let mut vm_writer = fs::File::from(vm_input_fd);
785 match input_rx.recv() {
861 match input_rx.recv() {
786 Ok(VmInput::Bytes(data)) => {
862 Ok(VmInput::Bytes(data)) => {
@@ -810,7 +886,7 @@ pub fn spawn_vm_io_with_line_handler<F>(
810 on_line: F,
886 on_line: F,
811) -> IoContext
887) -> IoContext
813− F: FnMut(&str) -> bool + ::std::marker::Send + 'static,
889+ F: FnMut(&str) -> bool + std::marker::Send + 'static,
815 spawn_vm_io_with_hooks(
891 spawn_vm_io_with_hooks(
816 output_monitor,
892 output_monitor,
@@ -830,6 +906,36 @@ pub fn spawn_vm_io(
830 spawn_vm_io_with_line_handler(output_monitor, vm_output_fd, vm_input_fd, |_| false)
906 spawn_vm_io_with_line_handler(output_monitor, vm_output_fd, vm_input_fd, |_| false)
909+fn spawn_vm_io_with_log(
910+ output_monitor: Arc<OutputMonitor>,
911+ vm_output_fd: OwnedFd,
912+ vm_input_fd: OwnedFd,
915+ let log_file = fs::OpenOptions::new()
921+ .map(|file| Arc::new(Mutex::new(file)));
923+ spawn_vm_io_with_hooks(
930+ if let Some(log) = &log_file
931+ && let Ok(mut file) = log.lock()
933+ let _ = file.write_all(bytes);
833impl IoContext {
939impl IoContext {
834 pub fn shutdown(self) {
940 pub fn shutdown(self) {
835 let _ = self.input_tx.send(VmInput::Shutdown);
941 let _ = self.input_tx.send(VmInput::Shutdown);
@@ -847,7 +953,7 @@ fn create_vm_configuration(
847 vm_writes_to_fd: OwnedFd,
953 vm_writes_to_fd: OwnedFd,
848 cpu_count: usize,
954 cpu_count: usize,
849 ram_bytes: u64,
955 ram_bytes: u64,
850−) -> Result<Retained<VZVirtualMachineConfiguration>, Box<dyn std::error::Error>> {
956+) -> Result<Retained<VZVirtualMachineConfiguration>> {
852 let platform =
958 let platform =
853 VZGenericPlatformConfiguration::init(VZGenericPlatformConfiguration::alloc());
959 VZGenericPlatformConfiguration::init(VZGenericPlatformConfiguration::alloc());
@@ -881,7 +987,7 @@ fn create_vm_configuration(
882 VZDiskImageCachingMode::Automatic,
988 VZDiskImageCachingMode::Automatic,
883 VZDiskImageSynchronizationMode::Full,
989 VZDiskImageSynchronizationMode::Full,
886 let disk_device = VZVirtioBlockDeviceConfiguration::initWithAttachment(
992 let disk_device = VZVirtioBlockDeviceConfiguration::initWithAttachment(
887 VZVirtioBlockDeviceConfiguration::alloc(),
993 VZVirtioBlockDeviceConfiguration::alloc(),
@@ -968,7 +1074,7 @@ fn create_vm_configuration(
968 // Validate
1074 // Validate
969 config.validateWithError().map_err(|e| {
1075 config.validateWithError().map_err(|e| {
970 io::Error::other(format!(
1076 io::Error::other(format!(
971− "Invalid VM configuration: {:?}",
1077+ "invalid VM configuration: {:?}",
972 e.localizedDescription()
1078 e.localizedDescription()
@@ -977,9 +1083,9 @@ fn create_vm_configuration(
980−fn load_efi_variable_store() -> Result<Retained<VZEFIVariableStore>, Box<dyn std::error::Error>> {
1086+fn load_efi_variable_store() -> Result<Retained<VZEFIVariableStore>> {
981 unsafe {
1087 unsafe {
982− let temp_dir = std::env::temp_dir();
1088+ let temp_dir = env::temp_dir();
983 let temp_path = temp_dir.join(format!("efi_variable_store_{}.efivars", std::process::id()));
1089 let temp_path = temp_dir.join(format!("efi_variable_store_{}.efivars", std::process::id()));
984 let url = nsurl_from_path(&temp_path)?;
1090 let url = nsurl_from_path(&temp_path)?;
985 let options = VZEFIVariableStoreInitializationOptions::AllowOverwrite;
1091 let options = VZEFIVariableStoreInitializationOptions::AllowOverwrite;
@@ -995,8 +1101,8 @@ fn load_efi_variable_store() -> Result<Retained<VZEFIVariableStore>, Box<dyn std
995fn spawn_login_actions_thread(
1101fn spawn_login_actions_thread(
996 login_actions: Vec<LoginAction>,
1102 login_actions: Vec<LoginAction>,
997 output_monitor: Arc<OutputMonitor>,
1103 output_monitor: Arc<OutputMonitor>,
998− input_tx: mpsc::Sender<VmInput>,
1104+ input_tx: Sender<VmInput>,
999− vm_output_tx: mpsc::Sender<VmOutput>,
1105+ vm_output_tx: Sender<VmOutput>,
1000) -> thread::JoinHandle<()> {
1106) -> thread::JoinHandle<()> {
1001 thread::spawn(move || {
1107 thread::spawn(move || {
1002 for a in login_actions {
1108 for a in login_actions {
@@ -1010,22 +1116,31 @@ fn spawn_login_actions_thread(
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),
1132+ WaitAnyResult::Timeout => {
1133+ let _ = vm_output_tx.send(VmOutput::LoginActionTimeout {
1134+ action: format!("expect '{}'", success),
1013 Send(mut text) => {
1140 Send(mut text) => {
1014 text.push('\n'); // Type the newline so the command is actually submitted.
1141 text.push('\n'); // Type the newline so the command is actually submitted.
1015 input_tx.send(VmInput::Bytes(text.into_bytes())).unwrap();
1142 input_tx.send(VmInput::Bytes(text.into_bytes())).unwrap();
1017− Script { path, index } => {
1018− let command = match script_command_from_path(&path, index) {
1019− Ok(command) => command,
1021− tracing::error!(error = %err, "failed to build login script command");
1025− let mut text = command;
1027− input_tx.send(VmInput::Bytes(text.into_bytes())).unwrap();
@@ -1037,9 +1152,9 @@ fn run_vm_with_io<F>(
1037 directory_shares: &[DirectoryShare],
1152 directory_shares: &[DirectoryShare],
1038 cpu_count: usize,
1153 cpu_count: usize,
1039 ram_bytes: u64,
1154 ram_bytes: u64,
1040− status: Option<&StatusFile>,
1155+ status: Option<&StatusEmitter<'_>>,
1041 io_handler: F,
1156 io_handler: F,
1042−) -> Result<(), Box<dyn std::error::Error>>
1157+) -> Result<()>
1044 F: FnOnce(Arc<OutputMonitor>, OwnedFd, OwnedFd) -> IoContext,
1159 F: FnOnce(Arc<OutputMonitor>, OwnedFd, OwnedFd) -> IoContext,
@@ -1086,24 +1201,22 @@ where
1087 match rx.try_recv() {
1202 match rx.try_recv() {
1088 Ok(result) => {
1203 Ok(result) => {
1089− result.map_err(|e| format!("Failed to start VM: {}", e))?;
1204+ result.map_err(|e| Error::msg(format!("Failed to start VM: {}", e)))?;
1092 Err(mpsc::TryRecvError::Empty) => continue,
1207 Err(mpsc::TryRecvError::Empty) => continue,
1093 Err(mpsc::TryRecvError::Disconnected) => {
1208 Err(mpsc::TryRecvError::Disconnected) => {
1094− return Err("VM start channel disconnected".into());
1209+ bail!("VM start channel disconnected");
1099 if Instant::now() >= start_deadline {
1214 if Instant::now() >= start_deadline {
1100− return Err("Timed out waiting for VM to start".into());
1215+ bail!("Timed out waiting for VM to start");
1103− if let Some(status) = status {
1218+ emit_status(status, "vm booting... go vibecoder!");
1104− status.update("vm booting... go vibecoder!");
1219+ tracing::info!("vm booting... go vibecoder!");
1107 tracing::info!("vm booting");
1220 tracing::info!("vm booting");
1109 let output_monitor = Arc::new(OutputMonitor::default());
1222 let output_monitor = Arc::new(OutputMonitor::default());
@@ -1149,7 +1262,7 @@ where
1151 let mut last_state = None;
1264 let mut last_state = None;
1152− let mut exit_result = Ok(());
1265+ let mut exit_result: Result<(), String> = Ok(());
1154 unsafe {
1267 unsafe {
1155 NSRunLoop::mainRunLoop().runMode_beforeDate(
1268 NSRunLoop::mainRunLoop().runMode_beforeDate(
@@ -1168,8 +1281,24 @@ where
1168 exit_result = Err(format!(
1281 exit_result = Err(format!(
1169 "Login action ({}) timed out after {:?}; shutting down.",
1282 "Login action ({}) timed out after {:?}; shutting down.",
1170 action, timeout
1283 action, timeout
1286+ if vm.canRequestStop() {
1287+ if let Err(err) = vm.requestStopWithError() {
1288+ tracing::error!(error = ?err, "failed to request VM stop");
1290+ } else if vm.canStop() {
1291+ let handler = RcBlock::new(|_error: *mut NSError| {});
1292+ vm.stopWithCompletionHandler(&handler);
1297+ Ok(VmOutput::LoginActionFailed { action, reason }) => {
1298+ exit_result = Err(format!(
1299+ "Login action ({}) failed: {}; shutting down.",
1173 unsafe {
1302 unsafe {
1174 if vm.canRequestStop() {
1303 if vm.canRequestStop() {
1175 if let Err(err) = vm.requestStopWithError() {
1304 if let Err(err) = vm.requestStopWithError() {
@@ -1185,7 +1314,7 @@ where
1185 Err(mpsc::TryRecvError::Empty) => {}
1314 Err(mpsc::TryRecvError::Empty) => {}
1186 Err(mpsc::TryRecvError::Disconnected) => {}
1315 Err(mpsc::TryRecvError::Disconnected) => {}
1188− if state != objc2_virtualization::VZVirtualMachineState::Running {
1317+ if state != VZVirtualMachineState::Running {
1189 //eprintln!("VM stopped with state: {:?}", state);
1318 //eprintln!("VM stopped with state: {:?}", state);
@@ -1195,7 +1324,7 @@ where
1196 io_ctx.shutdown();
1325 io_ctx.shutdown();
1198− exit_result
1327+ exit_result.map_err(Error::msg)
1201fn run_vm(
1330fn run_vm(
@@ -1204,8 +1333,8 @@ fn run_vm(
1204 directory_shares: &[DirectoryShare],
1333 directory_shares: &[DirectoryShare],
1205 cpu_count: usize,
1334 cpu_count: usize,
1206 ram_bytes: u64,
1335 ram_bytes: u64,
1207− status: Option<&StatusFile>,
1336+ status: Option<&StatusEmitter<'_>>,
1208−) -> Result<(), Box<dyn std::error::Error>> {
1337+) -> Result<()> {
1209 run_vm_with_io(
1338 run_vm_with_io(
1210 disk_path,
1339 disk_path,
1211 login_actions,
1340 login_actions,
@@ -1217,7 +1346,7 @@ fn run_vm(
1220−fn nsurl_from_path(path: &Path) -> Result<Retained<NSURL>, Box<dyn std::error::Error>> {
1349+fn nsurl_from_path(path: &Path) -> Result<Retained<NSURL>> {
1221 let abs_path = if path.is_absolute() {
1350 let abs_path = if path.is_absolute() {
1222 path.to_path_buf()
1351 path.to_path_buf()
1223 } else {
1352 } else {
@@ -1226,7 +1355,7 @@ fn nsurl_from_path(path: &Path) -> Result<Retained<NSURL>, Box<dyn std::error::E
1226 let ns_path = NSString::from_str(
1355 let ns_path = NSString::from_str(
1227 abs_path
1356 abs_path
1228 .to_str()
1357 .to_str()
1229− .ok_or("Non-UTF8 path encountered while building NSURL")?,
1358+ .with_context(|| "non-UTF8 path encountered while building NSURL")?,
1231 Ok(NSURL::fileURLWithPath(&ns_path))
1360 Ok(NSURL::fileURLWithPath(&ns_path))
@@ -1241,7 +1370,7 @@ fn enable_raw_mode(fd: i32) -> io::Result<RawModeGuard> {
1241 let original = attributes;
1370 let original = attributes;
1243 // Disable translation of carriage return to newline on input
1372 // Disable translation of carriage return to newline on input
1244− attributes.c_iflag &= !(libc::ICRNL);
1373+ attributes.c_iflag &= !libc::ICRNL;
1245 // Disable canonical mode (line buffering), echo, and signal generation
1374 // Disable canonical mode (line buffering), echo, and signal generation
1246 attributes.c_lflag &= !(libc::ICANON | libc::ECHO | libc::ISIG);
1375 attributes.c_lflag &= !(libc::ICANON | libc::ECHO | libc::ISIG);
1247 attributes.c_cc[libc::VMIN] = 0;
1376 attributes.c_cc[libc::VMIN] = 0;
@@ -1269,10 +1398,10 @@ impl Drop for RawModeGuard {
1270// Ensure the running binary has com.apple.security.virtualization entitlements by checking and, if not, signing and relaunching.
1399// Ensure the running binary has com.apple.security.virtualization entitlements by checking and, if not, signing and relaunching.
1271pub fn ensure_signed() {
1400pub fn ensure_signed() {
1272− if std::env::var("VIBEBOX_SKIP_CODESIGN").as_deref() == Ok("1") {
1401+ if env::var("VIBEBOX_SKIP_CODESIGN").as_deref() == Ok("1") {
1275− 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");
1276 let exe_str = exe.to_str().expect("exe path not valid utf-8");
1405 let exe_str = exe.to_str().expect("exe path not valid utf-8");
1278 let has_required_entitlements = {
1407 let has_required_entitlements = {
@@ -1294,8 +1423,8 @@ pub fn ensure_signed() {
1296 const ENTITLEMENTS: &str = include_str!("entitlements.plist");
1425 const ENTITLEMENTS: &str = include_str!("entitlements.plist");
1297− let entitlements_path = std::env::temp_dir().join("entitlements.plist");
1426+ let entitlements_path = env::temp_dir().join("entitlements.plist");
1298− std::fs::write(&entitlements_path, ENTITLEMENTS).expect("failed to write entitlements");
1427+ fs::write(&entitlements_path, ENTITLEMENTS).expect("failed to write entitlements");
1300 let output = Command::new("codesign")
1429 let output = Command::new("codesign")
@@ -1308,7 +1437,7 @@ pub fn ensure_signed() {
1309 .output();
1438 .output();
1311− let _ = std::fs::remove_file(&entitlements_path);
1440+ let _ = fs::remove_file(&entitlements_path);
1313 match output {
1442 match output {
1314 Ok(o) if o.status.success() => {
1443 Ok(o) if o.status.success() => {
@@ -1316,7 +1445,7 @@ pub fn ensure_signed() {
1316 if !stderr.trim().is_empty() {
1445 if !stderr.trim().is_empty() {
1317 tracing::debug!(codesign_stderr = %stderr.trim(), "codesign output");
1446 tracing::debug!(codesign_stderr = %stderr.trim(), "codesign output");
1319− 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();
1320 tracing::error!(error = %err, "failed to re-exec after signing");
1449 tracing::error!(error = %err, "failed to re-exec after signing");
1321 std::process::exit(1);
1450 std::process::exit(1);