@@ -1,7 +1,7 @@
1+use crate::session_manager::{GLOBAL_CACHE_DIR_NAME, INSTANCE_DIR_NAME};
2+use anyhow::{Context, Error, Result, bail};
13use std::{
2− env,
3− ffi::OsString,
4− fs,
4+ env, fs,
55 io::{self, Write},
66 os::{
77 fd::RawFd,
@@ -23,8 +23,8 @@ use std::{
2323};
2424
2525use block2::RcBlock;
26+use bytesize::ByteSize;
2627use dispatch2::DispatchQueue;
27−use lexopt::prelude::*;
2828use objc2::{AnyThread, rc::Retained, runtime::ProtocolObject};
2929use objc2_foundation::*;
3030use objc2_virtualization::*;
@@ -33,39 +33,46 @@ const DEBIAN_COMPRESSED_DISK_URL: &str = "https://cloud.debian.org/images/cloud/
3333const DEBIAN_COMPRESSED_SHA: &str = "6ab9be9e6834adc975268367f2f0235251671184345c34ee13031749fdfbf66fe4c3aafd949a2d98550426090e9ac645e79009c51eb0eefc984c15786570bb38";
3434const DEBIAN_COMPRESSED_SIZE_BYTES: u64 = 280901576;
3535const SHARED_DIRECTORIES_TAG: &str = "shared";
36+pub 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);
42−const DEFAULT_EXPECT_TIMEOUT: Duration = Duration::from_secs(30);
4339const LOGIN_EXPECT_TIMEOUT: Duration = Duration::from_secs(120);
40+const PROVISION_EXPECT_TIMEOUT: Duration = Duration::from_secs(900);
41+
42+const ERROR_REPORT_SCRIPT: &str = include_str!("error_report.sh");
4443const PROVISION_SCRIPT: &str = include_str!("provision.sh");
44+const RESIZE_DISK_SCRIPT: &str = include_str!("resize_disk.sh");
45+const DEFAULT_RAW_NAME: &str = "default.raw";
46+const INSTANCE_RAW_NAME: &str = "instance.raw";
47+const BASE_DISK_RAW_NAME: &str = "disk.raw";
4548
4649#[derive(Clone)]
47−pub(crate) enum LoginAction {
48− 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+ },
4960 Send(String),
50− Script { path: PathBuf, index: usize },
5161}
62+use crate::config::BoxConfig;
5263use LoginAction::*;
5364
5465#[derive(Clone)]
55−pub(crate) struct DirectoryShare {
66+pub struct DirectoryShare {
5667 host: PathBuf,
5768 guest: PathBuf,
5869 read_only: bool,
5970}
6071
6172impl DirectoryShare {
62− pub(crate) fn new(
63− host: PathBuf,
64− mut guest: PathBuf,
65− read_only: bool,
66− ) -> Result<Self, Box<dyn std::error::Error>> {
73+ pub fn new(host: PathBuf, mut guest: PathBuf, read_only: bool) -> Result<Self> {
6774 if !host.exists() {
68− return Err(format!("Host path does not exist: {}", host.display()).into());
75+ bail!(format!("host path does not exist: {}", host.display()));
6976 }
7077 if !guest.is_absolute() {
7178 guest = PathBuf::from("/root").join(guest);
@@ -77,23 +84,22 @@ impl DirectoryShare {
7784 })
7885 }
7986
80− 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> {
8188 let parts: Vec<&str> = spec.split(':').collect();
8289 if parts.len() < 2 || parts.len() > 3 {
83− return Err(format!("Invalid mount spec: {spec}").into());
90+ bail!(format!("invalid mount spec: {spec}"));
8491 }
85− let host = PathBuf::from(parts[0]);
92+ let host = expand_tilde_path(parts[0]);
8693 let guest = PathBuf::from(parts[1]);
8794 let read_only = if parts.len() == 3 {
8895 match parts[2] {
8996 "read-only" => true,
9097 "read-write" => false,
9198 _ => {
92− return Err(format!(
99+ bail!(format!(
93100 "Invalid mount mode '{}'; expected read-only or read-write",
94101 parts[2]
95− )
96− .into());
102+ ));
97103 }
98104 }
99105 } else {
@@ -116,19 +122,49 @@ impl DirectoryShare {
116122 }
117123}
118124
119−pub fn run_with_args<F>(args: CliArgs, io_handler: F) -> Result<(), Box<dyn std::error::Error>>
125+fn expand_tilde_path(value: &str) -> PathBuf {
126+ if let Some(stripped) = value.strip_prefix("~/") {
127+ if let Ok(home) = env::var("HOME") {
128+ return PathBuf::from(home).join(stripped);
129+ }
130+ } else if value == "~"
131+ && let Ok(home) = env::var("HOME")
132+ {
133+ return PathBuf::from(home);
134+ }
135+ PathBuf::from(value)
136+}
137+
138+pub struct VmArg {
139+ pub cpu_count: usize,
140+ pub ram_bytes: u64,
141+ pub disk_bytes: u64,
142+ pub no_default_mounts: bool,
143+ pub mounts: Vec<String>,
144+}
145+
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<()>
120155where
121156 F: FnOnce(Arc<OutputMonitor>, OwnedFd, OwnedFd) -> IoContext,
122157{
123− 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)
124159}
125160
126−pub(crate) fn run_with_args_and_extras<F>(
127− args: CliArgs,
161+pub fn run_with_args_and_extras<F>(
162+ args: VmArg,
128163 io_handler: F,
129164 extra_login_actions: Vec<LoginAction>,
130165 extra_directory_shares: Vec<DirectoryShare>,
131−) -> Result<(), Box<dyn std::error::Error>>
166+ status: Option<&StatusEmitter<'_>>,
167+) -> Result<()>
132168where
133169 F: FnOnce(Arc<OutputMonitor>, OwnedFd, OwnedFd) -> IoContext,
134170{
@@ -137,7 +173,7 @@ where
137173 let project_root = env::current_dir()?;
138174 let project_name = project_root
139175 .file_name()
140− .ok_or("Project directory has no name")?
176+ .with_context(|| "Project directory has no name")?
141177 .to_string_lossy()
142178 .into_owned();
143179
@@ -145,10 +181,14 @@ where
145181 let cache_home = env::var("XDG_CACHE_HOME")
146182 .map(PathBuf::from)
147183 .unwrap_or_else(|_| home.join(".cache"));
148− let cache_dir = cache_home.join("vibe");
184+ let cache_dir = cache_home.join(GLOBAL_CACHE_DIR_NAME);
149185 let guest_mise_cache = cache_dir.join(".guest-mise-cache");
150186
151− let instance_dir = project_root.join(".vibe");
187+ 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");
152192
153193 let basename_compressed = DEBIAN_COMPRESSED_DISK_URL.rsplit('/').next().unwrap();
154194 let base_compressed = cache_dir.join(basename_compressed);
@@ -157,8 +197,8 @@ where
157197 basename_compressed.trim_end_matches(".tar.xz")
158198 ));
159199
160− let default_raw = cache_dir.join("default.raw");
161− let instance_raw = instance_dir.join("instance.raw");
200+ let default_raw = cache_dir.join(DEFAULT_RAW_NAME);
201+ let instance_raw = instance_dir.join(INSTANCE_RAW_NAME);
162202
163203 // Prepare system-wide directories
164204 fs::create_dir_all(&cache_dir)?;
@@ -167,28 +207,31 @@ where
167207 let mise_directory_share =
168208 DirectoryShare::new(guest_mise_cache, "/root/.local/share/mise".into(), false)?;
169209
170− let disk_path = if let Some(path) = args.disk {
171− if !path.exists() {
172− return Err(format!("Disk image does not exist: {}", path.display()).into());
173− }
174− path
175− } else {
176− ensure_default_image(
177− &base_raw,
178− &base_compressed,
179− &default_raw,
180− std::slice::from_ref(&mise_directory_share),
181− )?;
182− ensure_instance_disk(&instance_raw, &default_raw)?;
183−
184− instance_raw
185− };
210+ ensure_default_image(
211+ &base_raw,
212+ &base_compressed,
213+ &default_raw,
214+ std::slice::from_ref(&mise_directory_share),
215+ Some(&provision_log),
216+ status,
217+ )?;
218+ let _ = ensure_instance_disk(
219+ &instance_raw,
220+ &default_raw,
221+ ByteSize(args.disk_bytes),
222+ status,
223+ )?;
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;
227+ let disk_path = instance_raw;
186228
187229 let mut login_actions = Vec::new();
188230 let mut directory_shares = Vec::new();
189231
190232 if !args.no_default_mounts {
191− login_actions.push(Send(format!("cd {project_name}")));
233+ let project_guest_dir = PathBuf::from(PROJECT_GUEST_BASE).join(project_name);
234+ login_actions.push(Send(format!("cd {}", project_guest_dir.display())));
192235
193236 // 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.
194237 // I couldn't find an alternative way to do this --- the MacOS sandbox doesn't apply to the Apple Virtualization system
@@ -196,38 +239,7 @@ where
196239 login_actions.push(Send(r"mount -t tmpfs tmpfs .git/".into()));
197240 }
198241
199− directory_shares.push(
200− DirectoryShare::new(
201− project_root,
202− PathBuf::from("/root/").join(project_name),
203− false,
204− )
205− .expect("Project directory must exist"),
206− );
207−
208242 directory_shares.push(mise_directory_share);
209−
210− // Add default shares, if they exist
211− for share in [
212− DirectoryShare::new(home.join(".m2"), "/root/.m2".into(), false),
213− DirectoryShare::new(
214− home.join(".cargo/registry"),
215− "/root/.cargo/registry".into(),
216− false,
217− ),
218− DirectoryShare::new(home.join(".codex"), "/root/.codex".into(), false),
219− DirectoryShare::new(home.join(".claude"), "/root/.claude".into(), false),
220− DirectoryShare::new(
221− "/Users/zhangjie/Documents/Code/CompletePrograms/vibebox/.ssh".into(),
222− "/root/.ssh".into(),
223− true,
224− ),
225− ]
226− .into_iter()
227− .flatten()
228− {
229− directory_shares.push(share)
230− }
231243 }
232244
233245 directory_shares.extend(extra_directory_shares);
@@ -236,199 +248,46 @@ where
236248 directory_shares.push(DirectoryShare::from_mount_spec(spec)?);
237249 }
238250
251+ if needs_resize {
252+ let resize_cmd = script_command_from_content("resize_disk.sh", RESIZE_DISK_SCRIPT)?;
253+ login_actions.push(Send(resize_cmd));
254+ }
255+
239256 if let Some(motd_action) = motd_login_action(&directory_shares) {
240257 login_actions.push(motd_action);
241258 }
242259
243260 login_actions.extend(extra_login_actions);
244261
245− // Any user-provided login actions must come after our system ones
246− login_actions.extend(args.login_actions);
247−
248262 run_vm_with_io(
249263 &disk_path,
250264 &login_actions,
251265 &directory_shares[..],
252266 args.cpu_count,
253267 args.ram_bytes,
268+ status,
254269 io_handler,
255270 )
256271}
257272
258−pub fn print_help() {
259− println!(
260− "Vibe is a quick way to spin up a Linux virtual machine on Mac to sandbox LLM agents.
261−
262−vibe [OPTIONS] [disk-image.raw]
263−
264−Options
265−
266− --help Print this help message.
267− --version Print the version (commit SHA).
268− --no-default-mounts Disable all default mounts.
269− --mount host-path:guest-path[:read-only | :read-write] Mount `host-path` inside VM at `guest-path`.
270− Defaults to read-write.
271− Errors if host-path does not exist.
272− --cpus <count> Number of virtual CPUs (default {DEFAULT_CPU_COUNT}).
273− --ram <megabytes> RAM size in megabytes (default {DEFAULT_RAM_MB}).
274− --script <path/to/script.sh> Run script in VM.
275− --send <some-command> Type `some-command` followed by newline into the VM.
276− --expect <string> [timeout-seconds] Wait for `string` to appear in console output before executing next `--script` or `--send`.
277− If `string` does not appear within timeout (default 30 seconds), shutdown VM with error.
278−"
279− );
280−}
281−
282−pub fn print_version() {
283− println!("Vibe");
284− println!("https://github.com/lynaghk/vibe/");
285− println!("Git SHA: {}", env!("GIT_SHA"));
286−}
287−
288−pub struct CliArgs {
289− disk: Option<PathBuf>,
290− version: bool,
291− help: bool,
292− no_default_mounts: bool,
293− mounts: Vec<String>,
294− login_actions: Vec<LoginAction>,
295− cpu_count: usize,
296− ram_bytes: u64,
297−}
298−
299−impl CliArgs {
300− pub fn version(&self) -> bool {
301− self.version
302− }
303−
304− pub fn help(&self) -> bool {
305− self.help
306− }
307−
308− pub fn cpu_count(&self) -> usize {
309− self.cpu_count
310− }
311−
312− pub fn ram_bytes(&self) -> u64 {
313− self.ram_bytes
314− }
315−
316− pub fn ram_mb(&self) -> u64 {
317− self.ram_bytes / BYTES_PER_MB
318− }
319−}
320−
321−pub fn parse_cli() -> Result<CliArgs, Box<dyn std::error::Error>> {
322− parse_cli_from(env::args_os())
323−}
324−
325−pub fn parse_cli_from<I>(args: I) -> Result<CliArgs, Box<dyn std::error::Error>>
326−where
327− I: IntoIterator<Item = OsString>,
328−{
329− fn os_to_string(value: OsString, flag: &str) -> Result<String, Box<dyn std::error::Error>> {
330− value
331− .into_string()
332− .map_err(|_| format!("{flag} expects valid UTF-8").into())
333− }
334−
335− let mut parser = lexopt::Parser::from_iter(args);
336− let mut disk = None;
337− let mut version = false;
338− let mut help = false;
339− let mut no_default_mounts = false;
340− let mut mounts = Vec::new();
341− let mut login_actions = Vec::new();
342− let mut script_index = 0;
343− let mut cpu_count = DEFAULT_CPU_COUNT;
344− let mut ram_bytes = DEFAULT_RAM_BYTES;
345−
346− while let Some(arg) = parser.next()? {
347− match arg {
348− Long("version") => version = true,
349− Long("help") | Short('h') => help = true,
350− Long("no-default-mounts") => no_default_mounts = true,
351− Long("cpus") => {
352− let value = os_to_string(parser.value()?, "--cpus")?.parse()?;
353− if value == 0 {
354− return Err("--cpus must be >= 1".into());
355− }
356− cpu_count = value;
357− }
358− Long("ram") => {
359− let value: u64 = os_to_string(parser.value()?, "--ram")?.parse()?;
360− if value == 0 {
361− return Err("--ram must be >= 1".into());
362− }
363− ram_bytes = value * BYTES_PER_MB;
364− }
365− Long("mount") => {
366− mounts.push(os_to_string(parser.value()?, "--mount")?);
367− }
368− Long("script") => {
369− login_actions.push(Script {
370− path: os_to_string(parser.value()?, "--script")?.into(),
371− index: script_index,
372− });
373− script_index += 1;
374− }
375− Long("send") => {
376− login_actions.push(Send(os_to_string(parser.value()?, "--send")?));
377− }
378− Long("expect") => {
379− let text = os_to_string(parser.value()?, "--expect")?;
380− let timeout = match parser.optional_value() {
381− Some(value) => Duration::from_secs(os_to_string(value, "--expect")?.parse()?),
382− None => DEFAULT_EXPECT_TIMEOUT,
383− };
384− login_actions.push(Expect { text, timeout });
385− }
386− Value(value) => {
387− if disk.is_some() {
388− return Err("Only one disk path may be provided".into());
389− }
390− disk = Some(PathBuf::from(value));
391− }
392− _ => return Err(arg.unexpected().into()),
393− }
394− }
395−
396− Ok(CliArgs {
397− disk,
398− version,
399− help,
400− no_default_mounts,
401− mounts,
402− login_actions,
403− cpu_count,
404− ram_bytes,
405− })
406−}
407−
408−fn script_command_from_path(
409− path: &Path,
410− index: usize,
411−) -> Result<String, Box<dyn std::error::Error>> {
412− let script = fs::read_to_string(path)
413− .map_err(|err| format!("Failed to read script {}: {err}", path.display()))?;
414− let label = format!("{}_{}", index, path.file_name().unwrap().display());
415− script_command_from_content(&label, &script)
416−}
417−
418−fn script_command_from_content(
419− label: &str,
420− script: &str,
421−) -> Result<String, Box<dyn std::error::Error>> {
273+pub fn script_command_from_content(label: &str, script: &str) -> Result<String> {
422274 let marker = "VIBE_SCRIPT_EOF";
423275 let guest_dir = "/tmp/vibe-scripts";
424276 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);
425284 let command = format!(
426− "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}"
427286 );
428287 if script.contains(marker) {
429− return Err(
430− format!("Script '{label}' contains marker '{marker}', cannot safely upload").into(),
431− );
288+ bail!(format!(
289+ "Script '{label}' contains marker '{marker}', cannot safely upload"
290+ ));
432291 }
433292 Ok(command)
434293}
@@ -492,6 +351,12 @@ enum WaitResult {
492351 Found,
493352}
494353
354+#[derive(PartialEq, Eq)]
355+enum WaitAnyResult {
356+ Timeout,
357+ Found(usize),
358+}
359+
495360pub enum VmInput {
496361 Bytes(Vec<u8>),
497362 Shutdown,
@@ -499,6 +364,7 @@ pub enum VmInput {
499364
500365enum VmOutput {
501366 LoginActionTimeout { action: String, timeout: Duration },
367+ LoginActionFailed { action: String, reason: String },
502368}
503369
504370#[derive(Default)]
@@ -535,6 +401,41 @@ impl OutputMonitor {
535401 WaitResult::Found
536402 }
537403 }
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
538439}
539440
540441#[derive(Debug)]
@@ -583,15 +484,17 @@ impl IoControl {
583484fn ensure_base_image(
584485 base_raw: &Path,
585486 base_compressed: &Path,
586−) -> Result<(), Box<dyn std::error::Error>> {
487+ status: Option<&StatusEmitter<'_>>,
488+) -> Result<()> {
587489 if base_raw.exists() {
588490 return Ok(());
589491 }
590492
591493 if !base_compressed.exists()
592− || 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
593495 {
594− println!("Downloading base image...");
496+ emit_status(status, "downloading base image...");
497+ tracing::info!("downloading base image");
595498 let status = Command::new("curl")
596499 .args([
597500 "--continue-at",
@@ -605,12 +508,14 @@ fn ensure_base_image(
605508 ])
606509 .status()?;
607510 if !status.success() {
608− return Err("Failed to download base image".into());
511+ bail!("failed to download base image");
609512 }
610513 }
611514
612515 // Check SHA
613516 {
517+ emit_status(status, "verifying base image...");
518+ tracing::info!("verifying base image...");
614519 let input = format!("{} {}\n", DEBIAN_COMPRESSED_SHA, base_compressed.display());
615520
616521 let mut child = Command::new("/usr/bin/shasum")
@@ -628,18 +533,25 @@ fn ensure_base_image(
628533
629534 let status = child.wait().expect("failed to wait on child");
630535 if !status.success() {
631− 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+ ));
632539 }
633540 }
634541
635− println!("Decompressing base image...");
542+ emit_status(status, "decompressing base image...");
543+ tracing::info!("decompressing base image...");
636544 let status = Command::new("tar")
637− .args(["-xOf", &base_compressed.to_string_lossy(), "disk.raw"])
638− .stdout(std::fs::File::create(base_raw)?)
545+ .args([
546+ "-xOf",
547+ &base_compressed.to_string_lossy(),
548+ BASE_DISK_RAW_NAME,
549+ ])
550+ .stdout(fs::File::create(base_raw)?)
639551 .status()?;
640552
641553 if !status.success() {
642− return Err("Failed to decompress base image".into());
554+ bail!("Failed to decompress base image");
643555 }
644556
645557 Ok(())
@@ -650,24 +562,56 @@ fn ensure_default_image(
650562 base_compressed: &Path,
651563 default_raw: &Path,
652564 directory_shares: &[DirectoryShare],
653−) -> Result<(), Box<dyn std::error::Error>> {
565+ provision_log: Option<&Path>,
566+ status: Option<&StatusEmitter<'_>>,
567+) -> Result<()> {
654568 if default_raw.exists() {
655569 return Ok(());
656570 }
657571
658− ensure_base_image(base_raw, base_compressed)?;
572+ ensure_base_image(base_raw, base_compressed, status)?;
659573
660− println!("Configuring base image...");
574+ emit_status(status, "configuring base image...");
575+ tracing::info!("configuring base image...");
661576 fs::copy(base_raw, default_raw)?;
662577
663578 let provision_command = script_command_from_content("provision.sh", PROVISION_SCRIPT)?;
664− run_vm(
665− default_raw,
666− &[Send(provision_command)],
667− directory_shares,
668− DEFAULT_CPU_COUNT,
669− DEFAULT_RAM_BYTES,
670− )?;
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+ }
671615
672616 Ok(())
673617}
@@ -675,15 +619,47 @@ fn ensure_default_image(
675619fn ensure_instance_disk(
676620 instance_raw: &Path,
677621 template_raw: &Path,
678−) -> Result<(), Box<dyn std::error::Error>> {
622+ target_bytes: ByteSize,
623+ status: Option<&StatusEmitter<'_>>,
624+) -> Result<bool> {
679625 if instance_raw.exists() {
680− return Ok(());
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;
630+ 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.",
632+ current_gb,
633+ target_gb
634+ );
635+ }
636+ return Ok(false);
681637 }
682638
683− println!("Creating instance disk from {}...", template_raw.display());
684− std::fs::create_dir_all(instance_raw.parent().unwrap())?;
685− fs::copy(template_raw, instance_raw)?;
686− Ok(())
639+ let template_size = ByteSize(fs::metadata(template_raw)?.len());
640+ if target_bytes < template_size {
641+ bail!(format!(
642+ "Requested disk size {} is smaller than base image size {}",
643+ target_bytes, template_size
644+ ));
645+ }
646+ let target_size = target_bytes;
647+ let needs_resize = target_size > template_size;
648+
649+ emit_status(status, "creating instance disk...");
650+ tracing::info!("creating instance disk...");
651+ tracing::info!(path = %template_raw.display(), "creating instance disk");
652+ fs::create_dir_all(instance_raw.parent().unwrap())?;
653+ if target_size == template_size {
654+ fs::copy(template_raw, instance_raw)?;
655+ return Ok(needs_resize);
656+ }
657+
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)?;
662+ Ok(needs_resize)
687663}
688664
689665pub struct IoContext {
@@ -699,18 +675,17 @@ pub fn create_pipe() -> (OwnedFd, OwnedFd) {
699675 (read_stream.into(), write_stream.into())
700676}
701677
702−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+>(
703682 output_monitor: Arc<OutputMonitor>,
704683 vm_output_fd: OwnedFd,
705684 vm_input_fd: OwnedFd,
706685 io_control: Arc<IoControl>,
707686 mut on_line: F,
708687 mut on_output: G,
709−) -> IoContext
710−where
711− F: FnMut(&str) -> bool + ::std::marker::Send + 'static,
712− G: FnMut(&[u8]) + ::std::marker::Send + 'static,
713−{
688+) -> IoContext {
714689 let (input_tx, input_rx): (Sender<VmInput>, Receiver<VmInput>) = mpsc::channel();
715690
716691 // raw_guard is set when we've put the user's terminal into raw mode because we've attached stdin/stdout to the VM.
@@ -725,7 +700,12 @@ where
725700 Error,
726701 }
727702
728− fn poll_with_wakeup<'a>(main_fd: RawFd, wakeup_fd: RawFd, buf: &'a mut [u8]) -> PollResult<'a> {
703+ fn poll_with_wakeup<'a>(
704+ main_fd: RawFd,
705+ wakeup_fd: RawFd,
706+ buf: &'a mut [u8],
707+ timeout_ms: i32,
708+ ) -> PollResult<'a> {
729709 let mut fds = [
730710 libc::pollfd {
731711 fd: main_fd,
@@ -739,8 +719,12 @@ where
739719 },
740720 ];
741721
742− let ret = unsafe { libc::poll(fds.as_mut_ptr(), 2, -1) };
743− if ret <= 0 || fds[1].revents & libc::POLLIN != 0 {
722+ let ret = unsafe { libc::poll(fds.as_mut_ptr(), 2, timeout_ms) };
723+ if ret == 0 {
724+ PollResult::Spurious
725+ } else if ret < 0 {
726+ PollResult::Error
727+ } else if fds[1].revents & libc::POLLIN != 0 {
744728 PollResult::Shutdown
745729 } else if fds[0].revents & libc::POLLIN != 0 {
746730 let n = unsafe { libc::read(main_fd, buf.as_mut_ptr() as *mut _, buf.len()) };
@@ -786,7 +770,7 @@ where
786770 continue;
787771 }
788772
789− match poll_with_wakeup(libc::STDIN_FILENO, wakeup_read.as_raw_fd(), &mut buf) {
773+ match poll_with_wakeup(libc::STDIN_FILENO, wakeup_read.as_raw_fd(), &mut buf, -1) {
790774 PollResult::Shutdown | PollResult::Error => break,
791775 PollResult::Spurious => continue,
792776 PollResult::Ready(bytes) => {
@@ -839,20 +823,24 @@ where
839823 let mut guard = raw_guard.lock().unwrap();
840824 *guard = None;
841825 }
842− match poll_with_wakeup(vm_output_fd.as_raw_fd(), wakeup_read.as_raw_fd(), &mut buf)
843− {
826+ match poll_with_wakeup(
827+ vm_output_fd.as_raw_fd(),
828+ wakeup_read.as_raw_fd(),
829+ &mut buf,
830+ 100,
831+ ) {
844832 PollResult::Shutdown | PollResult::Error => break,
845833 PollResult::Spurious => continue,
846834 PollResult::Ready(bytes) => {
847835 if io_control.forward_output() {
848− // enable raw mode, if we haven't already
836+ // enable raw mode if we haven't already
849837 if raw_guard.lock().unwrap().is_none()
850838 && let Ok(guard) = enable_raw_mode(libc::STDIN_FILENO)
851839 {
852840 *raw_guard.lock().unwrap() = Some(guard);
853841 }
854842
855− let mut stdout = std::io::stdout().lock();
843+ let mut stdout = io::stdout().lock();
856844 if stdout.write_all(bytes).is_err() {
857845 break;
858846 }
@@ -868,7 +856,7 @@ where
868856
869857 // Copies data from mpsc channel into VM, so vibe can "type" stuff and run scripts.
870858 let mux_thread = thread::spawn(move || {
871− let mut vm_writer = std::fs::File::from(vm_input_fd);
859+ let mut vm_writer = fs::File::from(vm_input_fd);
872860 loop {
873861 match input_rx.recv() {
874862 Ok(VmInput::Bytes(data)) => {
@@ -898,7 +886,7 @@ pub fn spawn_vm_io_with_line_handler<F>(
898886 on_line: F,
899887) -> IoContext
900888where
901− F: FnMut(&str) -> bool + ::std::marker::Send + 'static,
889+ F: FnMut(&str) -> bool + std::marker::Send + 'static,
902890{
903891 spawn_vm_io_with_hooks(
904892 output_monitor,
@@ -918,6 +906,36 @@ pub fn spawn_vm_io(
918906 spawn_vm_io_with_line_handler(output_monitor, vm_output_fd, vm_input_fd, |_| false)
919907}
920908
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+
921939impl IoContext {
922940 pub fn shutdown(self) {
923941 let _ = self.input_tx.send(VmInput::Shutdown);
@@ -935,7 +953,7 @@ fn create_vm_configuration(
935953 vm_writes_to_fd: OwnedFd,
936954 cpu_count: usize,
937955 ram_bytes: u64,
938−) -> Result<Retained<VZVirtualMachineConfiguration>, Box<dyn std::error::Error>> {
956+) -> Result<Retained<VZVirtualMachineConfiguration>> {
939957 unsafe {
940958 let platform =
941959 VZGenericPlatformConfiguration::init(VZGenericPlatformConfiguration::alloc());
@@ -969,7 +987,7 @@ fn create_vm_configuration(
969987 false,
970988 VZDiskImageCachingMode::Automatic,
971989 VZDiskImageSynchronizationMode::Full,
972− ).unwrap();
990+ )?;
973991
974992 let disk_device = VZVirtioBlockDeviceConfiguration::initWithAttachment(
975993 VZVirtioBlockDeviceConfiguration::alloc(),
@@ -1056,7 +1074,7 @@ fn create_vm_configuration(
10561074 // Validate
10571075 config.validateWithError().map_err(|e| {
10581076 io::Error::other(format!(
1059− "Invalid VM configuration: {:?}",
1077+ "invalid VM configuration: {:?}",
10601078 e.localizedDescription()
10611079 ))
10621080 })?;
@@ -1065,9 +1083,9 @@ fn create_vm_configuration(
10651083 }
10661084}
10671085
1068−fn load_efi_variable_store() -> Result<Retained<VZEFIVariableStore>, Box<dyn std::error::Error>> {
1086+fn load_efi_variable_store() -> Result<Retained<VZEFIVariableStore>> {
10691087 unsafe {
1070− let temp_dir = std::env::temp_dir();
1088+ let temp_dir = env::temp_dir();
10711089 let temp_path = temp_dir.join(format!("efi_variable_store_{}.efivars", std::process::id()));
10721090 let url = nsurl_from_path(&temp_path)?;
10731091 let options = VZEFIVariableStoreInitializationOptions::AllowOverwrite;
@@ -1083,8 +1101,8 @@ fn load_efi_variable_store() -> Result<Retained<VZEFIVariableStore>, Box<dyn std
10831101fn spawn_login_actions_thread(
10841102 login_actions: Vec<LoginAction>,
10851103 output_monitor: Arc<OutputMonitor>,
1086− input_tx: mpsc::Sender<VmInput>,
1087− vm_output_tx: mpsc::Sender<VmOutput>,
1104+ input_tx: Sender<VmInput>,
1105+ vm_output_tx: Sender<VmOutput>,
10881106) -> thread::JoinHandle<()> {
10891107 thread::spawn(move || {
10901108 for a in login_actions {
@@ -1098,22 +1116,31 @@ fn spawn_login_actions_thread(
10981116 return;
10991117 }
11001118 }
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+ },
11011140 Send(mut text) => {
11021141 text.push('\n'); // Type the newline so the command is actually submitted.
11031142 input_tx.send(VmInput::Bytes(text.into_bytes())).unwrap();
11041143 }
1105− Script { path, index } => {
1106− let command = match script_command_from_path(&path, index) {
1107− Ok(command) => command,
1108− Err(err) => {
1109− eprintln!("{err}");
1110− return;
1111− }
1112− };
1113− let mut text = command;
1114− text.push('\n');
1115− input_tx.send(VmInput::Bytes(text.into_bytes())).unwrap();
1116− }
11171144 }
11181145 }
11191146 })
@@ -1125,8 +1152,9 @@ fn run_vm_with_io<F>(
11251152 directory_shares: &[DirectoryShare],
11261153 cpu_count: usize,
11271154 ram_bytes: u64,
1155+ status: Option<&StatusEmitter<'_>>,
11281156 io_handler: F,
1129−) -> Result<(), Box<dyn std::error::Error>>
1157+) -> Result<()>
11301158where
11311159 F: FnOnce(Arc<OutputMonitor>, OwnedFd, OwnedFd) -> IoContext,
11321160{
@@ -1173,21 +1201,23 @@ where
11731201
11741202 match rx.try_recv() {
11751203 Ok(result) => {
1176− result.map_err(|e| format!("Failed to start VM: {}", e))?;
1204+ result.map_err(|e| Error::msg(format!("Failed to start VM: {}", e)))?;
11771205 break;
11781206 }
11791207 Err(mpsc::TryRecvError::Empty) => continue,
11801208 Err(mpsc::TryRecvError::Disconnected) => {
1181− return Err("VM start channel disconnected".into());
1209+ bail!("VM start channel disconnected");
11821210 }
11831211 }
11841212 }
11851213
11861214 if Instant::now() >= start_deadline {
1187− return Err("Timed out waiting for VM to start".into());
1215+ bail!("Timed out waiting for VM to start");
11881216 }
11891217
1190− println!("VM booting...");
1218+ emit_status(status, "vm booting... go vibecoder!");
1219+ tracing::info!("vm booting... go vibecoder!");
1220+ tracing::info!("vm booting");
11911221
11921222 let output_monitor = Arc::new(OutputMonitor::default());
11931223 let io_ctx = io_handler(output_monitor.clone(), we_read_from, we_write_to);
@@ -1232,7 +1262,7 @@ where
12321262 );
12331263
12341264 let mut last_state = None;
1235− let mut exit_result = Ok(());
1265+ let mut exit_result: Result<(), String> = Ok(());
12361266 loop {
12371267 unsafe {
12381268 NSRunLoop::mainRunLoop().runMode_beforeDate(
@@ -1251,12 +1281,28 @@ where
12511281 exit_result = Err(format!(
12521282 "Login action ({}) timed out after {:?}; shutting down.",
12531283 action, timeout
1254− )
1255− .into());
1284+ ));
12561285 unsafe {
12571286 if vm.canRequestStop() {
12581287 if let Err(err) = vm.requestStopWithError() {
1259− eprintln!("Failed to request VM stop: {:?}", err);
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+ ));
1302+ unsafe {
1303+ if vm.canRequestStop() {
1304+ if let Err(err) = vm.requestStopWithError() {
1305+ tracing::error!(error = ?err, "failed to request VM stop");
12601306 }
12611307 } else if vm.canStop() {
12621308 let handler = RcBlock::new(|_error: *mut NSError| {});
@@ -1268,7 +1314,7 @@ where
12681314 Err(mpsc::TryRecvError::Empty) => {}
12691315 Err(mpsc::TryRecvError::Disconnected) => {}
12701316 }
1271− if state != objc2_virtualization::VZVirtualMachineState::Running {
1317+ if state != VZVirtualMachineState::Running {
12721318 //eprintln!("VM stopped with state: {:?}", state);
12731319 break;
12741320 }
@@ -1278,7 +1324,7 @@ where
12781324
12791325 io_ctx.shutdown();
12801326
1281− exit_result
1327+ exit_result.map_err(Error::msg)
12821328}
12831329
12841330fn run_vm(
@@ -1287,18 +1333,20 @@ fn run_vm(
12871333 directory_shares: &[DirectoryShare],
12881334 cpu_count: usize,
12891335 ram_bytes: u64,
1290−) -> Result<(), Box<dyn std::error::Error>> {
1336+ status: Option<&StatusEmitter<'_>>,
1337+) -> Result<()> {
12911338 run_vm_with_io(
12921339 disk_path,
12931340 login_actions,
12941341 directory_shares,
12951342 cpu_count,
12961343 ram_bytes,
1344+ status,
12971345 spawn_vm_io,
12981346 )
12991347}
13001348
1301−fn nsurl_from_path(path: &Path) -> Result<Retained<NSURL>, Box<dyn std::error::Error>> {
1349+fn nsurl_from_path(path: &Path) -> Result<Retained<NSURL>> {
13021350 let abs_path = if path.is_absolute() {
13031351 path.to_path_buf()
13041352 } else {
@@ -1307,7 +1355,7 @@ fn nsurl_from_path(path: &Path) -> Result<Retained<NSURL>, Box<dyn std::error::E
13071355 let ns_path = NSString::from_str(
13081356 abs_path
13091357 .to_str()
1310− .ok_or("Non-UTF8 path encountered while building NSURL")?,
1358+ .with_context(|| "non-UTF8 path encountered while building NSURL")?,
13111359 );
13121360 Ok(NSURL::fileURLWithPath(&ns_path))
13131361}
@@ -1322,7 +1370,7 @@ fn enable_raw_mode(fd: i32) -> io::Result<RawModeGuard> {
13221370 let original = attributes;
13231371
13241372 // Disable translation of carriage return to newline on input
1325− attributes.c_iflag &= !(libc::ICRNL);
1373+ attributes.c_iflag &= !libc::ICRNL;
13261374 // Disable canonical mode (line buffering), echo, and signal generation
13271375 attributes.c_lflag &= !(libc::ICANON | libc::ECHO | libc::ISIG);
13281376 attributes.c_cc[libc::VMIN] = 0;
@@ -1350,7 +1398,10 @@ impl Drop for RawModeGuard {
13501398
13511399// Ensure the running binary has com.apple.security.virtualization entitlements by checking and, if not, signing and relaunching.
13521400pub fn ensure_signed() {
1353− let exe = std::env::current_exe().expect("failed to get current exe path");
1401+ if env::var("VIBEBOX_SKIP_CODESIGN").as_deref() == Ok("1") {
1402+ return;
1403+ }
1404+ let exe = env::current_exe().expect("failed to get current exe path");
13541405 let exe_str = exe.to_str().expect("exe path not valid utf-8");
13551406
13561407 let has_required_entitlements = {
@@ -1372,10 +1423,10 @@ pub fn ensure_signed() {
13721423 }
13731424
13741425 const ENTITLEMENTS: &str = include_str!("entitlements.plist");
1375− let entitlements_path = std::env::temp_dir().join("entitlements.plist");
1376− 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");
13771428
1378− let status = Command::new("codesign")
1429+ let output = Command::new("codesign")
13791430 .args([
13801431 "--sign",
13811432 "-",
@@ -1384,22 +1435,27 @@ pub fn ensure_signed() {
13841435 entitlements_path.to_str().unwrap(),
13851436 exe_str,
13861437 ])
1387− .status();
1438+ .output();
13881439
1389− let _ = std::fs::remove_file(&entitlements_path);
1440+ let _ = fs::remove_file(&entitlements_path);
13901441
1391− match status {
1392− Ok(s) if s.success() => {
1393− let err = Command::new(&exe).args(std::env::args_os().skip(1)).exec();
1394− eprintln!("failed to re-exec after signing: {err}");
1442+ match output {
1443+ Ok(o) if o.status.success() => {
1444+ let stderr = String::from_utf8_lossy(&o.stderr);
1445+ if !stderr.trim().is_empty() {
1446+ tracing::debug!(codesign_stderr = %stderr.trim(), "codesign output");
1447+ }
1448+ let err = Command::new(&exe).args(env::args_os().skip(1)).exec();
1449+ tracing::error!(error = %err, "failed to re-exec after signing");
13951450 std::process::exit(1);
13961451 }
1397− Ok(s) => {
1398− eprintln!("codesign failed with status: {s}");
1452+ Ok(o) => {
1453+ let stderr = String::from_utf8_lossy(&o.stderr);
1454+ tracing::error!(status = %o.status, codesign_stderr = %stderr.trim(), "codesign failed");
13991455 std::process::exit(1);
14001456 }
14011457 Err(e) => {
1402− eprintln!("failed to run codesign: {e}");
1458+ tracing::error!(error = %e, "failed to run codesign");
14031459 std::process::exit(1);
14041460 }
14051461 }