@@ -1,7 +1,11 @@
1−use crate::session_manager::{GLOBAL_CACHE_DIR_NAME, INSTANCE_DIR_NAME};
2−use anyhow::{Context, Error, Result, bail};
1+mod session_manager;
2+
3+pub use session_manager::{SessionError, SessionManager, SessionRecord};
4+
35use std::{
4− env, fs,
6+ env,
7+ ffi::OsString,
8+ fs,
59 io::{self, Write},
610 os::{
711 fd::RawFd,
@@ -15,7 +19,6 @@ use std::{
1519 process::{Command, Stdio},
1620 sync::{
1721 Arc, Condvar, Mutex,
18− atomic::{AtomicBool, Ordering},
1922 mpsc::{self, Receiver, Sender},
2023 },
2124 thread,
@@ -23,8 +26,8 @@ use std::{
2326};
2427
2528use block2::RcBlock;
26−use bytesize::ByteSize;
2729use dispatch2::DispatchQueue;
30+use lexopt::prelude::*;
2831use objc2::{AnyThread, rc::Retained, runtime::ProtocolObject};
2932use objc2_foundation::*;
3033use objc2_virtualization::*;
@@ -33,46 +36,39 @@ const DEBIAN_COMPRESSED_DISK_URL: &str = "https://cloud.debian.org/images/cloud/
3336const DEBIAN_COMPRESSED_SHA: &str = "6ab9be9e6834adc975268367f2f0235251671184345c34ee13031749fdfbf66fe4c3aafd949a2d98550426090e9ac645e79009c51eb0eefc984c15786570bb38";
3437const DEBIAN_COMPRESSED_SIZE_BYTES: u64 = 280901576;
3538const SHARED_DIRECTORIES_TAG: &str = "shared";
36−pub const PROJECT_GUEST_BASE: &str = "/usr/local/vibebox-mounts";
3739
40+const BYTES_PER_MB: u64 = 1024 * 1024;
41+const DEFAULT_CPU_COUNT: usize = 2;
42+const DEFAULT_RAM_MB: u64 = 2048;
43+const DEFAULT_RAM_BYTES: u64 = DEFAULT_RAM_MB * BYTES_PER_MB;
3844const START_TIMEOUT: Duration = Duration::from_secs(60);
45+const DEFAULT_EXPECT_TIMEOUT: Duration = Duration::from_secs(30);
3946const 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");
4347const 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";
4848
4949#[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− },
50+enum LoginAction {
51+ Expect { text: String, timeout: Duration },
6052 Send(String),
53+ Script { path: PathBuf, index: usize },
6154}
62−use crate::config::BoxConfig;
6355use LoginAction::*;
6456
6557#[derive(Clone)]
66−pub struct DirectoryShare {
58+struct DirectoryShare {
6759 host: PathBuf,
6860 guest: PathBuf,
6961 read_only: bool,
7062}
7163
7264impl DirectoryShare {
73− pub fn new(host: PathBuf, mut guest: PathBuf, read_only: bool) -> Result<Self> {
65+ fn new(
66+ host: PathBuf,
67+ mut guest: PathBuf,
68+ read_only: bool,
69+ ) -> Result<Self, Box<dyn std::error::Error>> {
7470 if !host.exists() {
75− bail!(format!("host path does not exist: {}", host.display()));
71+ return Err(format!("Host path does not exist: {}", host.display()).into());
7672 }
7773 if !guest.is_absolute() {
7874 guest = PathBuf::from("/root").join(guest);
@@ -84,22 +80,23 @@ impl DirectoryShare {
8480 })
8581 }
8682
87− pub fn from_mount_spec(spec: &str) -> Result<Self> {
83+ fn from_mount_spec(spec: &str) -> Result<Self, Box<dyn std::error::Error>> {
8884 let parts: Vec<&str> = spec.split(':').collect();
8985 if parts.len() < 2 || parts.len() > 3 {
90− bail!(format!("invalid mount spec: {spec}"));
86+ return Err(format!("Invalid mount spec: {spec}").into());
9187 }
92− let host = expand_tilde_path(parts[0]);
88+ let host = PathBuf::from(parts[0]);
9389 let guest = PathBuf::from(parts[1]);
9490 let read_only = if parts.len() == 3 {
9591 match parts[2] {
9692 "read-only" => true,
9793 "read-write" => false,
9894 _ => {
99− bail!(format!(
95+ return Err(format!(
10096 "Invalid mount mode '{}'; expected read-only or read-write",
10197 parts[2]
102− ));
98+ )
99+ .into());
103100 }
104101 }
105102 } else {
@@ -122,58 +119,47 @@ impl DirectoryShare {
122119 }
123120}
124121
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;
122+fn main() -> Result<(), Box<dyn std::error::Error>> {
123+ let args = parse_cli()?;
147124
148−fn emit_status(status: Option<&StatusEmitter<'_>>, message: &str) {
149− if let Some(status) = status {
150− status(message);
125+ if args.version {
126+ println!("Vibe");
127+ println!("https://github.com/lynaghk/vibe/");
128+ println!("Git SHA: {}", env!("GIT_SHA"));
129+ std::process::exit(0);
151130 }
152−}
153131
154−pub fn run_with_args<F>(args: VmArg, io_handler: F) -> Result<()>
155−where
156− F: FnOnce(Arc<OutputMonitor>, OwnedFd, OwnedFd) -> IoContext,
157−{
158− run_with_args_and_extras(args, io_handler, Vec::new(), Vec::new(), None)
159−}
132+ if args.help {
133+ println!(
134+ "Vibe is a quick way to spin up a Linux virtual machine on Mac to sandbox LLM agents.
135+
136+vibe [OPTIONS] [disk-image.raw]
137+
138+Options
139+
140+ --help Print this help message.
141+ --version Print the version (commit SHA).
142+ --no-default-mounts Disable all default mounts.
143+ --mount host-path:guest-path[:read-only | :read-write] Mount `host-path` inside VM at `guest-path`.
144+ Defaults to read-write.
145+ Errors if host-path does not exist.
146+ --cpus <count> Number of virtual CPUs (default {DEFAULT_CPU_COUNT}).
147+ --ram <megabytes> RAM size in megabytes (default {DEFAULT_RAM_MB}).
148+ --script <path/to/script.sh> Run script in VM.
149+ --send <some-command> Type `some-command` followed by newline into the VM.
150+ --expect <string> [timeout-seconds] Wait for `string` to appear in console output before executing next `--script` or `--send`.
151+ If `string` does not appear within timeout (default 30 seconds), shutdown VM with error.
152+"
153+ );
154+ std::process::exit(0);
155+ }
160156
161−pub fn run_with_args_and_extras<F>(
162− args: VmArg,
163− io_handler: F,
164− extra_login_actions: Vec<LoginAction>,
165− extra_directory_shares: Vec<DirectoryShare>,
166− status: Option<&StatusEmitter<'_>>,
167−) -> Result<()>
168−where
169− F: FnOnce(Arc<OutputMonitor>, OwnedFd, OwnedFd) -> IoContext,
170−{
171157 ensure_signed();
172158
173159 let project_root = env::current_dir()?;
174160 let project_name = project_root
175161 .file_name()
176− .with_context(|| "Project directory has no name")?
162+ .ok_or("Project directory has no name")?
177163 .to_string_lossy()
178164 .into_owned();
179165
@@ -181,14 +167,10 @@ where
181167 let cache_home = env::var("XDG_CACHE_HOME")
182168 .map(PathBuf::from)
183169 .unwrap_or_else(|_| home.join(".cache"));
184− let cache_dir = cache_home.join(GLOBAL_CACHE_DIR_NAME);
170+ let cache_dir = cache_home.join("vibe");
185171 let guest_mise_cache = cache_dir.join(".guest-mise-cache");
186172
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");
173+ let instance_dir = project_root.join(".vibe");
192174
193175 let basename_compressed = DEBIAN_COMPRESSED_DISK_URL.rsplit('/').next().unwrap();
194176 let base_compressed = cache_dir.join(basename_compressed);
@@ -197,8 +179,8 @@ where
197179 basename_compressed.trim_end_matches(".tar.xz")
198180 ));
199181
200− let default_raw = cache_dir.join(DEFAULT_RAW_NAME);
201− let instance_raw = instance_dir.join(INSTANCE_RAW_NAME);
182+ let default_raw = cache_dir.join("default.raw");
183+ let instance_raw = instance_dir.join("instance.raw");
202184
203185 // Prepare system-wide directories
204186 fs::create_dir_all(&cache_dir)?;
@@ -207,31 +189,28 @@ where
207189 let mise_directory_share =
208190 DirectoryShare::new(guest_mise_cache, "/root/.local/share/mise".into(), false)?;
209191
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;
192+ let disk_path = if let Some(path) = args.disk {
193+ if !path.exists() {
194+ return Err(format!("Disk image does not exist: {}", path.display()).into());
195+ }
196+ path
197+ } else {
198+ ensure_default_image(
199+ &base_raw,
200+ &base_compressed,
201+ &default_raw,
202+ std::slice::from_ref(&mise_directory_share),
203+ )?;
204+ ensure_instance_disk(&instance_raw, &default_raw)?;
205+
206+ instance_raw
207+ };
228208
229209 let mut login_actions = Vec::new();
230210 let mut directory_shares = Vec::new();
231211
232212 if !args.no_default_mounts {
233− let project_guest_dir = PathBuf::from(PROJECT_GUEST_BASE).join(project_name);
234− login_actions.push(Send(format!("cd {}", project_guest_dir.display())));
213+ login_actions.push(Send(format!("cd {project_name}")));
235214
236215 // 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.
237216 // I couldn't find an alternative way to do this --- the MacOS sandbox doesn't apply to the Apple Virtualization system
@@ -239,55 +218,170 @@ where
239218 login_actions.push(Send(r"mount -t tmpfs tmpfs .git/".into()));
240219 }
241220
221+ directory_shares.push(
222+ DirectoryShare::new(
223+ project_root,
224+ PathBuf::from("/root/").join(project_name),
225+ false,
226+ )
227+ .expect("Project directory must exist"),
228+ );
229+
242230 directory_shares.push(mise_directory_share);
243− }
244231
245− directory_shares.extend(extra_directory_shares);
232+ // Add default shares, if they exist
233+ for share in [
234+ DirectoryShare::new(home.join(".m2"), "/root/.m2".into(), false),
235+ DirectoryShare::new(
236+ home.join(".cargo/registry"),
237+ "/root/.cargo/registry".into(),
238+ false,
239+ ),
240+ DirectoryShare::new(home.join(".codex"), "/root/.codex".into(), false),
241+ DirectoryShare::new(home.join(".claude"), "/root/.claude".into(), false),
242+ ]
243+ .into_iter()
244+ .flatten()
245+ {
246+ directory_shares.push(share)
247+ }
248+ }
246249
247250 for spec in &args.mounts {
248251 directory_shares.push(DirectoryShare::from_mount_spec(spec)?);
249252 }
250253
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−
256254 if let Some(motd_action) = motd_login_action(&directory_shares) {
257255 login_actions.push(motd_action);
258256 }
259257
260− login_actions.extend(extra_login_actions);
258+ // Any user-provided login actions must come after our system ones
259+ login_actions.extend(args.login_actions);
261260
262− run_vm_with_io(
261+ run_vm(
263262 &disk_path,
264263 &login_actions,
265264 &directory_shares[..],
266265 args.cpu_count,
267266 args.ram_bytes,
268− status,
269− io_handler,
270267 )
271268}
272269
273−pub fn script_command_from_content(label: &str, script: &str) -> Result<String> {
270+struct CliArgs {
271+ disk: Option<PathBuf>,
272+ version: bool,
273+ help: bool,
274+ no_default_mounts: bool,
275+ mounts: Vec<String>,
276+ login_actions: Vec<LoginAction>,
277+ cpu_count: usize,
278+ ram_bytes: u64,
279+}
280+
281+fn parse_cli() -> Result<CliArgs, Box<dyn std::error::Error>> {
282+ fn os_to_string(value: OsString, flag: &str) -> Result<String, Box<dyn std::error::Error>> {
283+ value
284+ .into_string()
285+ .map_err(|_| format!("{flag} expects valid UTF-8").into())
286+ }
287+
288+ let mut parser = lexopt::Parser::from_env();
289+ let mut disk = None;
290+ let mut version = false;
291+ let mut help = false;
292+ let mut no_default_mounts = false;
293+ let mut mounts = Vec::new();
294+ let mut login_actions = Vec::new();
295+ let mut script_index = 0;
296+ let mut cpu_count = DEFAULT_CPU_COUNT;
297+ let mut ram_bytes = DEFAULT_RAM_BYTES;
298+
299+ while let Some(arg) = parser.next()? {
300+ match arg {
301+ Long("version") => version = true,
302+ Long("help") | Short('h') => help = true,
303+ Long("no-default-mounts") => no_default_mounts = true,
304+ Long("cpus") => {
305+ let value = os_to_string(parser.value()?, "--cpus")?.parse()?;
306+ if value == 0 {
307+ return Err("--cpus must be >= 1".into());
308+ }
309+ cpu_count = value;
310+ }
311+ Long("ram") => {
312+ let value: u64 = os_to_string(parser.value()?, "--ram")?.parse()?;
313+ if value == 0 {
314+ return Err("--ram must be >= 1".into());
315+ }
316+ ram_bytes = value * BYTES_PER_MB;
317+ }
318+ Long("mount") => {
319+ mounts.push(os_to_string(parser.value()?, "--mount")?);
320+ }
321+ Long("script") => {
322+ login_actions.push(Script {
323+ path: os_to_string(parser.value()?, "--script")?.into(),
324+ index: script_index,
325+ });
326+ script_index += 1;
327+ }
328+ Long("send") => {
329+ login_actions.push(Send(os_to_string(parser.value()?, "--send")?));
330+ }
331+ Long("expect") => {
332+ let text = os_to_string(parser.value()?, "--expect")?;
333+ let timeout = match parser.optional_value() {
334+ Some(value) => Duration::from_secs(os_to_string(value, "--expect")?.parse()?),
335+ None => DEFAULT_EXPECT_TIMEOUT,
336+ };
337+ login_actions.push(Expect { text, timeout });
338+ }
339+ Value(value) => {
340+ if disk.is_some() {
341+ return Err("Only one disk path may be provided".into());
342+ }
343+ disk = Some(PathBuf::from(value));
344+ }
345+ _ => return Err(arg.unexpected().into()),
346+ }
347+ }
348+
349+ Ok(CliArgs {
350+ disk,
351+ version,
352+ help,
353+ no_default_mounts,
354+ mounts,
355+ login_actions,
356+ cpu_count,
357+ ram_bytes,
358+ })
359+}
360+
361+fn script_command_from_path(
362+ path: &Path,
363+ index: usize,
364+) -> Result<String, Box<dyn std::error::Error>> {
365+ let script = fs::read_to_string(path)
366+ .map_err(|err| format!("Failed to read script {}: {err}", path.display()))?;
367+ let label = format!("{}_{}", index, path.file_name().unwrap().display());
368+ script_command_from_content(&label, &script)
369+}
370+
371+fn script_command_from_content(
372+ label: &str,
373+ script: &str,
374+) -> Result<String, Box<dyn std::error::Error>> {
274375 let marker = "VIBE_SCRIPT_EOF";
275376 let guest_dir = "/tmp/vibe-scripts";
276377 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);
284378 let command = format!(
285− "mkdir -p {guest_dir}\ncat >{guest_path} <<'{marker}'\n{wrapped_script}\n{marker}\nchmod +x {guest_path}\n{guest_path}"
379+ "mkdir -p {guest_dir}\ncat >{guest_path} <<'{marker}'\n{script}\n{marker}\nchmod +x {guest_path}\n{guest_path}"
286380 );
287381 if script.contains(marker) {
288− bail!(format!(
289− "Script '{label}' contains marker '{marker}', cannot safely upload"
290− ));
382+ return Err(
383+ format!("Script '{label}' contains marker '{marker}', cannot safely upload").into(),
384+ );
291385 }
292386 Ok(command)
293387}
@@ -321,6 +415,18 @@ fn motd_login_action(directory_shares: &[DirectoryShare]) -> Option<LoginAction>
321415 }
322416
323417 let mut output = String::new();
418+ output.push_str(
419+ "
420+░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░▒▓███████▓▒░░▒▓████████▓▒░
421+░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░
422+ ░▒▓█▓▒▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░
423+ ░▒▓█▓▒▒▓█▓▒░░▒▓█▓▒░▒▓███████▓▒░░▒▓██████▓▒░
424+ ░▒▓█▓▓█▓▒░ ░▒▓█▓▒░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░
425+ ░▒▓█▓▓█▓▒░ ░▒▓█▓▒░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░
426+ ░▒▓██▓▒░ ░▒▓█▓▒░▒▓███████▓▒░░▒▓████████▓▒░
427+
428+",
429+ );
324430 output.push_str(&format!(
325431 "{host_header:<host_width$} {guest_header:<guest_width$} {mode_header}\n",
326432 host_width = host_width
@@ -351,12 +457,6 @@ enum WaitResult {
351457 Found,
352458}
353459
354−#[derive(PartialEq, Eq)]
355−enum WaitAnyResult {
356− Timeout,
357− Found(usize),
358−}
359−
360460pub enum VmInput {
361461 Bytes(Vec<u8>),
362462 Shutdown,
@@ -364,7 +464,6 @@ pub enum VmInput {
364464
365465enum VmOutput {
366466 LoginActionTimeout { action: String, timeout: Duration },
367− LoginActionFailed { action: String, reason: String },
368467}
369468
370469#[derive(Default)]
@@ -401,100 +500,20 @@ impl OutputMonitor {
401500 WaitResult::Found
402501 }
403502 }
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
439−}
440−
441−#[derive(Debug)]
442−pub struct IoControl {
443− forward_input: AtomicBool,
444− forward_output: AtomicBool,
445− restore_terminal: AtomicBool,
446−}
447−
448−impl IoControl {
449− pub fn new() -> Arc<Self> {
450− Arc::new(Self {
451− forward_input: AtomicBool::new(true),
452− forward_output: AtomicBool::new(true),
453− restore_terminal: AtomicBool::new(false),
454− })
455− }
456−
457− pub fn set_forward_input(&self, enabled: bool) {
458− self.forward_input.store(enabled, Ordering::SeqCst);
459− }
460−
461− pub fn set_forward_output(&self, enabled: bool) {
462− self.forward_output.store(enabled, Ordering::SeqCst);
463− }
464−
465− pub fn request_terminal_restore(&self) {
466− self.restore_terminal.store(true, Ordering::SeqCst);
467− }
468−
469− fn forward_input(&self) -> bool {
470− self.forward_input.load(Ordering::SeqCst)
471− }
472−
473− fn forward_output(&self) -> bool {
474− self.forward_output.load(Ordering::SeqCst)
475− }
476−
477− fn take_restore_terminal(&self) -> bool {
478− self.restore_terminal
479− .compare_exchange(true, false, Ordering::SeqCst, Ordering::SeqCst)
480− .is_ok()
481− }
482503}
483504
484505fn ensure_base_image(
485506 base_raw: &Path,
486507 base_compressed: &Path,
487− status: Option<&StatusEmitter<'_>>,
488−) -> Result<()> {
508+) -> Result<(), Box<dyn std::error::Error>> {
489509 if base_raw.exists() {
490510 return Ok(());
491511 }
492512
493513 if !base_compressed.exists()
494− || fs::metadata(base_compressed).map(|m| m.len())? < DEBIAN_COMPRESSED_SIZE_BYTES
514+ || std::fs::metadata(base_compressed).map(|m| m.len())? < DEBIAN_COMPRESSED_SIZE_BYTES
495515 {
496− emit_status(status, "downloading base image...");
497− tracing::info!("downloading base image");
516+ println!("Downloading base image...");
498517 let status = Command::new("curl")
499518 .args([
500519 "--continue-at",
@@ -508,14 +527,12 @@ fn ensure_base_image(
508527 ])
509528 .status()?;
510529 if !status.success() {
511− bail!("failed to download base image");
530+ return Err("Failed to download base image".into());
512531 }
513532 }
514533
515534 // Check SHA
516535 {
517− emit_status(status, "verifying base image...");
518− tracing::info!("verifying base image...");
519536 let input = format!("{} {}\n", DEBIAN_COMPRESSED_SHA, base_compressed.display());
520537
521538 let mut child = Command::new("/usr/bin/shasum")
@@ -533,25 +550,18 @@ fn ensure_base_image(
533550
534551 let status = child.wait().expect("failed to wait on child");
535552 if !status.success() {
536− bail!(format!(
537− "SHA validation failed for {DEBIAN_COMPRESSED_DISK_URL}"
538− ));
553+ return Err(format!("SHA validation failed for {DEBIAN_COMPRESSED_DISK_URL}").into());
539554 }
540555 }
541556
542− emit_status(status, "decompressing base image...");
543− tracing::info!("decompressing base image...");
557+ println!("Decompressing base image...");
544558 let status = Command::new("tar")
545− .args([
546− "-xOf",
547− &base_compressed.to_string_lossy(),
548− BASE_DISK_RAW_NAME,
549− ])
550− .stdout(fs::File::create(base_raw)?)
559+ .args(["-xOf", &base_compressed.to_string_lossy(), "disk.raw"])
560+ .stdout(std::fs::File::create(base_raw)?)
551561 .status()?;
552562
553563 if !status.success() {
554− bail!("Failed to decompress base image");
564+ return Err("Failed to decompress base image".into());
555565 }
556566
557567 Ok(())
@@ -562,56 +572,24 @@ fn ensure_default_image(
562572 base_compressed: &Path,
563573 default_raw: &Path,
564574 directory_shares: &[DirectoryShare],
565− provision_log: Option<&Path>,
566− status: Option<&StatusEmitter<'_>>,
567−) -> Result<()> {
575+) -> Result<(), Box<dyn std::error::Error>> {
568576 if default_raw.exists() {
569577 return Ok(());
570578 }
571579
572− ensure_base_image(base_raw, base_compressed, status)?;
580+ ensure_base_image(base_raw, base_compressed)?;
573581
574− emit_status(status, "configuring base image...");
575− tracing::info!("configuring base image...");
582+ println!("Configuring base image...");
576583 fs::copy(base_raw, default_raw)?;
577584
578585 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− }
586+ run_vm(
587+ default_raw,
588+ &[Send(provision_command)],
589+ directory_shares,
590+ DEFAULT_CPU_COUNT,
591+ DEFAULT_RAM_BYTES,
592+ )?;
615593
616594 Ok(())
617595}
@@ -619,47 +597,15 @@ fn ensure_default_image(
619597fn ensure_instance_disk(
620598 instance_raw: &Path,
621599 template_raw: &Path,
622− target_bytes: ByteSize,
623− status: Option<&StatusEmitter<'_>>,
624−) -> Result<bool> {
600+) -> Result<(), Box<dyn std::error::Error>> {
625601 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;
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);
637− }
638−
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);
602+ return Ok(());
656603 }
657604
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)
605+ println!("Creating instance disk from {}...", template_raw.display());
606+ std::fs::create_dir_all(instance_raw.parent().unwrap())?;
607+ fs::copy(template_raw, instance_raw)?;
608+ Ok(())
663609}
664610
665611pub struct IoContext {
@@ -675,16 +621,10 @@ 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(
682625 output_monitor: Arc<OutputMonitor>,
683626 vm_output_fd: OwnedFd,
684627 vm_input_fd: OwnedFd,
685− io_control: Arc<IoControl>,
686− mut on_line: F,
687− mut on_output: G,
688628) -> IoContext {
689629 let (input_tx, input_rx): (Sender<VmInput>, Receiver<VmInput>) = mpsc::channel();
690630
@@ -700,12 +640,7 @@ pub fn spawn_vm_io_with_hooks<
700640 Error,
701641 }
702642
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> {
643+ fn poll_with_wakeup<'a>(main_fd: RawFd, wakeup_fd: RawFd, buf: &'a mut [u8]) -> PollResult<'a> {
709644 let mut fds = [
710645 libc::pollfd {
711646 fd: main_fd,
@@ -719,12 +654,8 @@ pub fn spawn_vm_io_with_hooks<
719654 },
720655 ];
721656
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 {
657+ let ret = unsafe { libc::poll(fds.as_mut_ptr(), 2, -1) };
658+ if ret <= 0 || fds[1].revents & libc::POLLIN != 0 {
728659 PollResult::Shutdown
729660 } else if fds[0].revents & libc::POLLIN != 0 {
730661 let n = unsafe { libc::read(main_fd, buf.as_mut_ptr() as *mut _, buf.len()) };
@@ -740,68 +671,23 @@ pub fn spawn_vm_io_with_hooks<
740671 }
741672 }
742673
743− fn poll_wakeup_only(wakeup_fd: RawFd, timeout_ms: i32) -> bool {
744− let mut fds = [libc::pollfd {
745− fd: wakeup_fd,
746− events: libc::POLLIN,
747− revents: 0,
748− }];
749−
750− let ret = unsafe { libc::poll(fds.as_mut_ptr(), 1, timeout_ms) };
751− ret > 0 && fds[0].revents & libc::POLLIN != 0
752− }
753−
754674 // Copies from stdin to the VM; also polls wakeup_read to exit the thread when it's time to shutdown.
755675 let stdin_thread = thread::spawn({
756676 let input_tx = input_tx.clone();
757677 let raw_guard = raw_guard.clone();
758678 let wakeup_read = wakeup_read.try_clone().unwrap();
759− let io_control = io_control.clone();
760679
761680 move || {
762681 let mut buf = [0u8; 1024];
763− let mut pending_command: Vec<u8> = Vec::new();
764− let mut command_mode = false;
765682 loop {
766− if !io_control.forward_input() {
767− if poll_wakeup_only(wakeup_read.as_raw_fd(), 100) {
768− break;
769− }
770− continue;
771− }
772−
773− match poll_with_wakeup(libc::STDIN_FILENO, wakeup_read.as_raw_fd(), &mut buf, -1) {
683+ match poll_with_wakeup(libc::STDIN_FILENO, wakeup_read.as_raw_fd(), &mut buf) {
774684 PollResult::Shutdown | PollResult::Error => break,
775685 PollResult::Spurious => continue,
776686 PollResult::Ready(bytes) => {
777− let mut send_buf: Vec<u8> = Vec::new();
778− for &b in bytes {
779− if pending_command.is_empty() && !command_mode && b == b':' {
780− command_mode = true;
781− }
782−
783− if command_mode {
784− pending_command.push(b);
785− } else {
786− send_buf.push(b);
787− }
788−
789− if b == b'\n' && command_mode {
790− let line = String::from_utf8_lossy(&pending_command);
791− let trimmed = line.trim_end_matches(&['\r', '\n'][..]);
792− let consumed = on_line(trimmed);
793− if !consumed {
794− send_buf.extend_from_slice(&pending_command);
795− }
796− pending_command.clear();
797− command_mode = false;
798− }
799− }
800687 if raw_guard.lock().unwrap().is_none() {
801688 continue;
802689 }
803− if !send_buf.is_empty() && input_tx.send(VmInput::Bytes(send_buf)).is_err()
804− {
690+ if input_tx.send(VmInput::Bytes(bytes.to_vec())).is_err() {
805691 break;
806692 }
807693 }
@@ -814,40 +700,28 @@ pub fn spawn_vm_io_with_hooks<
814700 let stdout_thread = thread::spawn({
815701 let raw_guard = raw_guard.clone();
816702 let wakeup_read = wakeup_read.try_clone().unwrap();
817− let io_control = io_control.clone();
818703
819704 move || {
705+ let mut stdout = std::io::stdout().lock();
820706 let mut buf = [0u8; 1024];
821707 loop {
822− if io_control.take_restore_terminal() {
823− let mut guard = raw_guard.lock().unwrap();
824− *guard = None;
825− }
826− match poll_with_wakeup(
827− vm_output_fd.as_raw_fd(),
828− wakeup_read.as_raw_fd(),
829− &mut buf,
830− 100,
831− ) {
708+ match poll_with_wakeup(vm_output_fd.as_raw_fd(), wakeup_read.as_raw_fd(), &mut buf)
709+ {
832710 PollResult::Shutdown | PollResult::Error => break,
833711 PollResult::Spurious => continue,
834712 PollResult::Ready(bytes) => {
835− if io_control.forward_output() {
836− // enable raw mode if we haven't already
837− if raw_guard.lock().unwrap().is_none()
838− && let Ok(guard) = enable_raw_mode(libc::STDIN_FILENO)
839− {
840− *raw_guard.lock().unwrap() = Some(guard);
841− }
842−
843− let mut stdout = io::stdout().lock();
844− if stdout.write_all(bytes).is_err() {
845− break;
846− }
847− let _ = stdout.flush();
713+ // enable raw mode, if we haven't already
714+ if raw_guard.lock().unwrap().is_none()
715+ && let Ok(guard) = enable_raw_mode(libc::STDIN_FILENO)
716+ {
717+ *raw_guard.lock().unwrap() = Some(guard);
718+ }
719+
720+ if stdout.write_all(bytes).is_err() {
721+ break;
848722 }
723+ let _ = stdout.flush();
849724 output_monitor.push(bytes);
850− on_output(bytes);
851725 }
852726 }
853727 }
@@ -856,7 +730,7 @@ pub fn spawn_vm_io_with_hooks<
856730
857731 // Copies data from mpsc channel into VM, so vibe can "type" stuff and run scripts.
858732 let mux_thread = thread::spawn(move || {
859− let mut vm_writer = fs::File::from(vm_input_fd);
733+ let mut vm_writer = std::fs::File::from(vm_input_fd);
860734 loop {
861735 match input_rx.recv() {
862736 Ok(VmInput::Bytes(data)) => {
@@ -879,63 +753,6 @@ pub fn spawn_vm_io_with_hooks<
879753 }
880754}
881755
882−pub fn spawn_vm_io_with_line_handler<F>(
883− output_monitor: Arc<OutputMonitor>,
884− vm_output_fd: OwnedFd,
885− vm_input_fd: OwnedFd,
886− on_line: F,
887−) -> IoContext
888−where
889− F: FnMut(&str) -> bool + std::marker::Send + 'static,
890−{
891− spawn_vm_io_with_hooks(
892− output_monitor,
893− vm_output_fd,
894− vm_input_fd,
895− IoControl::new(),
896− on_line,
897− |_| {},
898− )
899−}
900−
901−pub fn spawn_vm_io(
902− output_monitor: Arc<OutputMonitor>,
903− vm_output_fd: OwnedFd,
904− vm_input_fd: OwnedFd,
905−) -> IoContext {
906− spawn_vm_io_with_line_handler(output_monitor, vm_output_fd, vm_input_fd, |_| false)
907−}
908−
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−
939756impl IoContext {
940757 pub fn shutdown(self) {
941758 let _ = self.input_tx.send(VmInput::Shutdown);
@@ -953,7 +770,7 @@ fn create_vm_configuration(
953770 vm_writes_to_fd: OwnedFd,
954771 cpu_count: usize,
955772 ram_bytes: u64,
956−) -> Result<Retained<VZVirtualMachineConfiguration>> {
773+) -> Result<Retained<VZVirtualMachineConfiguration>, Box<dyn std::error::Error>> {
957774 unsafe {
958775 let platform =
959776 VZGenericPlatformConfiguration::init(VZGenericPlatformConfiguration::alloc());
@@ -987,7 +804,7 @@ fn create_vm_configuration(
987804 false,
988805 VZDiskImageCachingMode::Automatic,
989806 VZDiskImageSynchronizationMode::Full,
990− )?;
807+ ).unwrap();
991808
992809 let disk_device = VZVirtioBlockDeviceConfiguration::initWithAttachment(
993810 VZVirtioBlockDeviceConfiguration::alloc(),
@@ -1074,7 +891,7 @@ fn create_vm_configuration(
1074891 // Validate
1075892 config.validateWithError().map_err(|e| {
1076893 io::Error::other(format!(
1077− "invalid VM configuration: {:?}",
894+ "Invalid VM configuration: {:?}",
1078895 e.localizedDescription()
1079896 ))
1080897 })?;
@@ -1083,9 +900,9 @@ fn create_vm_configuration(
1083900 }
1084901}
1085902
1086−fn load_efi_variable_store() -> Result<Retained<VZEFIVariableStore>> {
903+fn load_efi_variable_store() -> Result<Retained<VZEFIVariableStore>, Box<dyn std::error::Error>> {
1087904 unsafe {
1088− let temp_dir = env::temp_dir();
905+ let temp_dir = std::env::temp_dir();
1089906 let temp_path = temp_dir.join(format!("efi_variable_store_{}.efivars", std::process::id()));
1090907 let url = nsurl_from_path(&temp_path)?;
1091908 let options = VZEFIVariableStoreInitializationOptions::AllowOverwrite;
@@ -1101,8 +918,8 @@ fn load_efi_variable_store() -> Result<Retained<VZEFIVariableStore>> {
1101918fn spawn_login_actions_thread(
1102919 login_actions: Vec<LoginAction>,
1103920 output_monitor: Arc<OutputMonitor>,
1104− input_tx: Sender<VmInput>,
1105− vm_output_tx: Sender<VmOutput>,
921+ input_tx: mpsc::Sender<VmInput>,
922+ vm_output_tx: mpsc::Sender<VmOutput>,
1106923) -> thread::JoinHandle<()> {
1107924 thread::spawn(move || {
1108925 for a in login_actions {
@@ -1116,48 +933,34 @@ fn spawn_login_actions_thread(
1116933 return;
1117934 }
1118935 }
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− },
1140936 Send(mut text) => {
1141937 text.push('\n'); // Type the newline so the command is actually submitted.
1142938 input_tx.send(VmInput::Bytes(text.into_bytes())).unwrap();
1143939 }
940+ Script { path, index } => {
941+ let command = match script_command_from_path(&path, index) {
942+ Ok(command) => command,
943+ Err(err) => {
944+ eprintln!("{err}");
945+ return;
946+ }
947+ };
948+ let mut text = command;
949+ text.push('\n');
950+ input_tx.send(VmInput::Bytes(text.into_bytes())).unwrap();
951+ }
1144952 }
1145953 }
1146954 })
1147955}
1148956
1149−fn run_vm_with_io<F>(
957+fn run_vm(
1150958 disk_path: &Path,
1151959 login_actions: &[LoginAction],
1152960 directory_shares: &[DirectoryShare],
1153961 cpu_count: usize,
1154962 ram_bytes: u64,
1155− status: Option<&StatusEmitter<'_>>,
1156− io_handler: F,
1157−) -> Result<()>
1158−where
1159− F: FnOnce(Arc<OutputMonitor>, OwnedFd, OwnedFd) -> IoContext,
1160−{
963+) -> Result<(), Box<dyn std::error::Error>> {
1161964 let (vm_reads_from, we_write_to) = create_pipe();
1162965 let (we_read_from, vm_writes_to) = create_pipe();
1163966
@@ -1201,26 +1004,24 @@ where
12011004
12021005 match rx.try_recv() {
12031006 Ok(result) => {
1204− result.map_err(|e| Error::msg(format!("Failed to start VM: {}", e)))?;
1007+ result.map_err(|e| format!("Failed to start VM: {}", e))?;
12051008 break;
12061009 }
12071010 Err(mpsc::TryRecvError::Empty) => continue,
12081011 Err(mpsc::TryRecvError::Disconnected) => {
1209− bail!("VM start channel disconnected");
1012+ return Err("VM start channel disconnected".into());
12101013 }
12111014 }
12121015 }
12131016
12141017 if Instant::now() >= start_deadline {
1215− bail!("Timed out waiting for VM to start");
1018+ return Err("Timed out waiting for VM to start".into());
12161019 }
12171020
1218− emit_status(status, "vm booting... go vibecoder!");
1219− tracing::info!("vm booting... go vibecoder!");
1220− tracing::info!("vm booting");
1021+ println!("VM booting...");
12211022
12221023 let output_monitor = Arc::new(OutputMonitor::default());
1223− let io_ctx = io_handler(output_monitor.clone(), we_read_from, we_write_to);
1024+ let io_ctx = spawn_vm_io(output_monitor.clone(), we_read_from, we_write_to);
12241025
12251026 let mut all_login_actions = vec![
12261027 Expect {
@@ -1262,7 +1063,7 @@ where
12621063 );
12631064
12641065 let mut last_state = None;
1265− let mut exit_result: Result<(), String> = Ok(());
1066+ let mut exit_result = Ok(());
12661067 loop {
12671068 unsafe {
12681069 NSRunLoop::mainRunLoop().runMode_beforeDate(
@@ -1281,28 +1082,12 @@ where
12811082 exit_result = Err(format!(
12821083 "Login action ({}) timed out after {:?}; shutting down.",
12831084 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− ));
1085+ )
1086+ .into());
13021087 unsafe {
13031088 if vm.canRequestStop() {
13041089 if let Err(err) = vm.requestStopWithError() {
1305− tracing::error!(error = ?err, "failed to request VM stop");
1090+ eprintln!("Failed to request VM stop: {:?}", err);
13061091 }
13071092 } else if vm.canStop() {
13081093 let handler = RcBlock::new(|_error: *mut NSError| {});
@@ -1314,7 +1099,7 @@ where
13141099 Err(mpsc::TryRecvError::Empty) => {}
13151100 Err(mpsc::TryRecvError::Disconnected) => {}
13161101 }
1317− if state != VZVirtualMachineState::Running {
1102+ if state != objc2_virtualization::VZVirtualMachineState::Running {
13181103 //eprintln!("VM stopped with state: {:?}", state);
13191104 break;
13201105 }
@@ -1324,29 +1109,10 @@ where
13241109
13251110 io_ctx.shutdown();
13261111
1327− exit_result.map_err(Error::msg)
1112+ exit_result
13281113}
13291114
1330−fn run_vm(
1331− disk_path: &Path,
1332− login_actions: &[LoginAction],
1333− directory_shares: &[DirectoryShare],
1334− cpu_count: usize,
1335− ram_bytes: u64,
1336− status: Option<&StatusEmitter<'_>>,
1337−) -> Result<()> {
1338− run_vm_with_io(
1339− disk_path,
1340− login_actions,
1341− directory_shares,
1342− cpu_count,
1343− ram_bytes,
1344− status,
1345− spawn_vm_io,
1346− )
1347−}
1348−
1349−fn nsurl_from_path(path: &Path) -> Result<Retained<NSURL>> {
1115+fn nsurl_from_path(path: &Path) -> Result<Retained<NSURL>, Box<dyn std::error::Error>> {
13501116 let abs_path = if path.is_absolute() {
13511117 path.to_path_buf()
13521118 } else {
@@ -1355,7 +1121,7 @@ fn nsurl_from_path(path: &Path) -> Result<Retained<NSURL>> {
13551121 let ns_path = NSString::from_str(
13561122 abs_path
13571123 .to_str()
1358− .with_context(|| "non-UTF8 path encountered while building NSURL")?,
1124+ .ok_or("Non-UTF8 path encountered while building NSURL")?,
13591125 );
13601126 Ok(NSURL::fileURLWithPath(&ns_path))
13611127}
@@ -1370,7 +1136,7 @@ fn enable_raw_mode(fd: i32) -> io::Result<RawModeGuard> {
13701136 let original = attributes;
13711137
13721138 // Disable translation of carriage return to newline on input
1373− attributes.c_iflag &= !libc::ICRNL;
1139+ attributes.c_iflag &= !(libc::ICRNL);
13741140 // Disable canonical mode (line buffering), echo, and signal generation
13751141 attributes.c_lflag &= !(libc::ICANON | libc::ECHO | libc::ISIG);
13761142 attributes.c_cc[libc::VMIN] = 0;
@@ -1398,10 +1164,7 @@ impl Drop for RawModeGuard {
13981164
13991165// Ensure the running binary has com.apple.security.virtualization entitlements by checking and, if not, signing and relaunching.
14001166pub fn ensure_signed() {
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");
1167+ let exe = std::env::current_exe().expect("failed to get current exe path");
14051168 let exe_str = exe.to_str().expect("exe path not valid utf-8");
14061169
14071170 let has_required_entitlements = {
@@ -1423,10 +1186,10 @@ pub fn ensure_signed() {
14231186 }
14241187
14251188 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");
1189+ let entitlements_path = std::env::temp_dir().join("entitlements.plist");
1190+ std::fs::write(&entitlements_path, ENTITLEMENTS).expect("failed to write entitlements");
14281191
1429− let output = Command::new("codesign")
1192+ let status = Command::new("codesign")
14301193 .args([
14311194 "--sign",
14321195 "-",
@@ -1435,27 +1198,22 @@ pub fn ensure_signed() {
14351198 entitlements_path.to_str().unwrap(),
14361199 exe_str,
14371200 ])
1438− .output();
1201+ .status();
14391202
1440− let _ = fs::remove_file(&entitlements_path);
1203+ let _ = std::fs::remove_file(&entitlements_path);
14411204
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");
1205+ match status {
1206+ Ok(s) if s.success() => {
1207+ let err = Command::new(&exe).args(std::env::args_os().skip(1)).exec();
1208+ eprintln!("failed to re-exec after signing: {err}");
14501209 std::process::exit(1);
14511210 }
1452− Ok(o) => {
1453− let stderr = String::from_utf8_lossy(&o.stderr);
1454− tracing::error!(status = %o.status, codesign_stderr = %stderr.trim(), "codesign failed");
1211+ Ok(s) => {
1212+ eprintln!("codesign failed with status: {s}");
14551213 std::process::exit(1);
14561214 }
14571215 Err(e) => {
1458− tracing::error!(error = %e, "failed to run codesign");
1216+ eprintln!("failed to run codesign: {e}");
14591217 std::process::exit(1);
14601218 }
14611219 }