@@ -1,3 +1,15 @@
1+use crate::instance::{VmLiveness, vm_liveness};
2+use crate::session_manager::INSTANCE_DIR_NAME;
3+use crate::{
4+ config::CONFIG_PATH_ENV,
5+ instance::{
6+ InstanceConfig, STATUS_VM_ERROR_PREFIX, build_ssh_login_actions, ensure_instance_dir,
7+ ensure_ssh_keypair, extract_ipv4, load_or_create_instance_config, write_instance_config,
8+ },
9+ session_manager::{GLOBAL_DIR_NAME, VM_MANAGER_PID_NAME, VM_MANAGER_SOCKET_NAME},
10+ vm::{self, DirectoryShare, LoginAction, PROJECT_GUEST_BASE, VmInput},
11+};
12+use anyhow::{Error, Result, anyhow, bail};
113use std::{
214 env, fs,
315 io::{Read, Write},
@@ -5,7 +17,6 @@ use std::{
517 fs::PermissionsExt,
618 io::AsRawFd,
719 net::{UnixListener, UnixStream},
8− process::CommandExt,
920 },
1021 path::{Path, PathBuf},
1122 process::{Command, Stdio},
@@ -14,36 +25,44 @@ use std::{
1425 time::{Duration, Instant},
1526};
1627
17−use crate::{
18− config::CONFIG_PATH_ENV,
19− instance::SERIAL_LOG_NAME,
20− instance::{
21− InstanceConfig, build_ssh_login_actions, ensure_instance_dir, ensure_ssh_keypair,
22− extract_ipv4, load_or_create_instance_config, write_instance_config,
23− },
24− session_manager::{
25− GLOBAL_DIR_NAME, INSTANCE_FILENAME, VM_MANAGER_PID_NAME, VM_MANAGER_SOCKET_NAME,
26− },
27− vm::{self, DirectoryShare, LoginAction, VmInput},
28−};
29−
28+#[cfg_attr(feature = "mock-vm", allow(dead_code))]
29+const VM_ROOT_LOG_NAME: &str = "vm_root.log";
3030const VM_MANAGER_LOCK_NAME: &str = "vm.lock";
3131const VM_MANAGER_LOG_NAME: &str = "vm_manager.log";
32+const SHUTDOWN_RETRY_MS: u64 = 500;
33+#[cfg(test)]
34+const HARD_SHUTDOWN_TIMEOUT_MS: u64 = 1_000;
35+#[cfg(not(test))]
36+const HARD_SHUTDOWN_TIMEOUT_MS: u64 = 12_000;
37+const STATUS_PREFIX: &str = "status:";
38+
39+type ClientStreams = Arc<Mutex<Vec<UnixStream>>>;
40+type SharedStatus = Arc<Mutex<String>>;
41+
42+#[cfg(not(test))]
43+fn force_exit(_reason: &str) -> ! {
44+ std::process::exit(1);
45+}
46+
47+#[cfg(test)]
48+fn force_exit(reason: &str) -> ! {
49+ panic!("{reason}");
50+}
3251
3352pub fn ensure_manager(
3453 raw_args: &[std::ffi::OsString],
3554 auto_shutdown_ms: u64,
3655 config_path: Option<&Path>,
37−) -> Result<UnixStream, Box<dyn std::error::Error>> {
56+) -> Result<UnixStream> {
3857 let project_root = env::current_dir()?;
3958 tracing::debug!(root = %project_root.display(), "ensure vm manager");
4059 let instance_dir = ensure_instance_dir(&project_root)?;
41− cleanup_stale_manager(&instance_dir);
60+ cleanup_stale_manager(&project_root)?;
4261 let socket_path = instance_dir.join(VM_MANAGER_SOCKET_NAME);
4362
4463 if let Ok(stream) = UnixStream::connect(&socket_path) {
4564 send_client_pid(&stream);
46− tracing::info!(path = %socket_path.display(), "connected to existing vm manager");
65+ tracing::info!(path = %socket_path.display(), "connected to an existing vm manager");
4766 return Ok(stream);
4867 }
4968
@@ -81,12 +100,11 @@ pub fn ensure_manager(
81100 drop(lock_file.take());
82101 let _ = fs::remove_file(&lock_path);
83102 }
84− return Err(format!(
85− "Timed out waiting for vm manager socket: {} ({})",
103+ bail!(format!(
104+ "timed out waiting for vm manager socket: {} ({})",
86105 socket_path.display(),
87106 err
88− )
89− .into());
107+ ));
90108 }
91109 thread::sleep(Duration::from_millis(100));
92110 }
@@ -94,24 +112,49 @@ pub fn ensure_manager(
94112 }
95113}
96114
97−pub fn run_manager(
98− args: vm::VmArg,
99− auto_shutdown_ms: u64,
100−) -> Result<(), Box<dyn std::error::Error>> {
115+pub fn run_manager(args: vm::VmArg, auto_shutdown_ms: u64) -> Result<()> {
101116 let project_root = env::current_dir()?;
102117 tracing::info!(root = %project_root.display(), "vm manager starting");
118+ #[cfg(not(feature = "mock-vm"))]
119+ {
120+ unsafe {
121+ env::remove_var("VIBEBOX_SKIP_CODESIGN");
122+ }
123+ vm::ensure_signed();
124+ unsafe {
125+ env::set_var("VIBEBOX_SKIP_CODESIGN", "1");
126+ }
127+ }
103128 let _pid_guard = ensure_pid_file(&project_root)?;
104− run_manager_with(
105− &project_root,
106− args,
107− auto_shutdown_ms,
108− &RealVmExecutor,
109− ManagerOptions {
110− ensure_signed: true,
111− detach: true,
112− prepare_vm: true,
113− },
114− )
129+ #[cfg(feature = "mock-vm")]
130+ tracing::info!("vm manager using mock executor");
131+ let executor: &dyn VmExecutor = {
132+ #[cfg(feature = "mock-vm")]
133+ {
134+ &MockVmExecutor
135+ }
136+ #[cfg(not(feature = "mock-vm"))]
137+ {
138+ &RealVmExecutor
139+ }
140+ };
141+ let options = {
142+ #[cfg(feature = "mock-vm")]
143+ {
144+ ManagerOptions {
145+ detach: true,
146+ prepare_vm: false,
147+ }
148+ }
149+ #[cfg(not(feature = "mock-vm"))]
150+ {
151+ ManagerOptions {
152+ detach: true,
153+ prepare_vm: true,
154+ }
155+ }
156+ };
157+ run_manager_with(&project_root, args, auto_shutdown_ms, executor, options)
115158}
116159
117160fn spawn_manager_process(
@@ -119,30 +162,28 @@ fn spawn_manager_process(
119162 auto_shutdown_ms: u64,
120163 instance_dir: &Path,
121164 config_path: Option<&Path>,
122−) -> Result<(), Box<dyn std::error::Error>> {
165+) -> Result<()> {
123166 let exe = env::current_exe()?;
124167 let mut supervisor_exe = exe.clone();
125168 supervisor_exe.set_file_name("vibebox-supervisor");
126− let use_supervisor = supervisor_exe.exists();
127− let mut cmd = if use_supervisor {
128− Command::new(supervisor_exe)
129− } else {
130− let mut cmd = Command::new(exe);
131− cmd.arg0("vibebox-supervisor");
132− cmd
133− };
169+ // intentional
170+ if !supervisor_exe.exists() {
171+ bail!(format!(
172+ "vibebox-supervisor not found at {}",
173+ supervisor_exe.display()
174+ ));
175+ }
176+ let mut cmd = Command::new(supervisor_exe);
134177 if raw_args.len() > 1 {
135178 cmd.args(&raw_args[1..]);
136179 }
137− if !use_supervisor {
138− cmd.env("VIBEBOX_VM_MANAGER", "1");
139− }
180+ cmd.env("VIBEBOX_INTERNAL", "1");
140181 cmd.env("VIBEBOX_LOG_NO_COLOR", "1");
141182 cmd.env("VIBEBOX_AUTO_SHUTDOWN_MS", auto_shutdown_ms.to_string());
142183 if let Some(path) = config_path {
143184 cmd.env(CONFIG_PATH_ENV, path);
144185 }
145− tracing::info!(auto_shutdown_ms, "vm manager process spawn requested");
186+ tracing::debug!(auto_shutdown_ms, "vm manager process spawn requested");
146187 let log_path = instance_dir.join(VM_MANAGER_LOG_NAME);
147188 let log_file = fs::OpenOptions::new()
148189 .create(true)
@@ -164,32 +205,172 @@ fn spawn_manager_process(
164205 Ok(())
165206}
166207
167−fn ensure_pid_file(project_root: &Path) -> Result<PidFileGuard, Box<dyn std::error::Error>> {
208+fn ensure_pid_file(project_root: &Path) -> Result<PidFileGuard> {
168209 let instance_dir = ensure_instance_dir(project_root)?;
169210 let pid_path = instance_dir.join(VM_MANAGER_PID_NAME);
170− if let Ok(content) = fs::read_to_string(&pid_path) {
171− if let Ok(pid) = content.trim().parse::<u32>() {
172− if pid_is_alive(pid) {
173− return Err(format!("vm manager already running (pid {pid})").into());
174− }
211+ let socket_path = instance_dir.join(VM_MANAGER_SOCKET_NAME);
212+ match vm_liveness(project_root)? {
213+ VmLiveness::RunningWithSocket { pid } => {
214+ bail!("vm manager already running (pid {pid})");
175215 }
176− let _ = fs::remove_file(&pid_path);
216+ VmLiveness::RunningWithoutSocket { pid } => {
217+ tracing::warn!(
218+ pid,
219+ path = %socket_path.display(),
220+ "stale pid file detected with missing socket"
221+ );
222+ }
223+ VmLiveness::NotRunningOrMissing => {}
177224 }
225+ let _ = fs::remove_file(&pid_path);
178226 fs::write(&pid_path, format!("{}\n", std::process::id()))?;
179227 let _ = fs::set_permissions(&pid_path, fs::Permissions::from_mode(0o600));
180228 Ok(PidFileGuard { path: pid_path })
181229}
182230
183−fn cleanup_stale_manager(instance_dir: &Path) {
184− let pid_path = instance_dir.join(VM_MANAGER_PID_NAME);
185− if let Ok(content) = fs::read_to_string(&pid_path) {
186− if let Ok(pid) = content.trim().parse::<u32>() {
187− if pid_is_alive(pid) {
188− return;
189− }
190− }
231+fn cleanup_stale_manager(project_root: &Path) -> Result<()> {
232+ let pid_path = project_root
233+ .join(INSTANCE_DIR_NAME)
234+ .join(VM_MANAGER_PID_NAME);
235+ if matches!(
236+ vm_liveness(project_root)?,
237+ VmLiveness::RunningWithSocket { .. } | VmLiveness::RunningWithoutSocket { .. }
238+ ) {
239+ return Ok(());
191240 }
192241 let _ = fs::remove_file(&pid_path);
242+ Ok(())
243+}
244+
245+fn inject_project_mount(
246+ mounts: &mut Vec<String>,
247+ project_root: &Path,
248+ ssh_user: &str,
249+ project_name: &str,
250+) {
251+ let guest_tilde = format!("~/{project_name}");
252+ let guest_home = format!("/home/{ssh_user}/{project_name}");
253+ let guest_base = format!("{PROJECT_GUEST_BASE}/{project_name}");
254+ let already_mapped = mounts.iter().any(|spec| {
255+ let parts: Vec<&str> = spec.split(':').collect();
256+ if parts.len() < 2 {
257+ return false;
258+ }
259+ let guest = parts[1];
260+ guest == guest_tilde || guest == guest_home || guest == guest_base
261+ });
262+ if already_mapped {
263+ return;
264+ }
265+ let host = project_root.display();
266+ mounts.insert(0, format!("{host}:{guest_tilde}:read-write"));
267+}
268+
269+fn prepare_mounts_and_links(mut args: vm::VmArg, ssh_user: &str) -> (vm::VmArg, String) {
270+ let mut links = Vec::new();
271+ let mut mounts = Vec::with_capacity(args.mounts.len());
272+ for spec in args.mounts {
273+ let (rewritten, link) = rewrite_mount_spec(&spec, ssh_user);
274+ if let Some(link) = link {
275+ links.push(link);
276+ }
277+ mounts.push(rewritten);
278+ }
279+ args.mounts = mounts;
280+ let script = render_home_links_script(&links, ssh_user);
281+ (args, script)
282+}
283+
284+struct HomeLink {
285+ source: String,
286+ target: String,
287+}
288+
289+fn rewrite_mount_spec(spec: &str, ssh_user: &str) -> (String, Option<HomeLink>) {
290+ let parts: Vec<&str> = spec.split(':').collect();
291+ if parts.len() < 2 || parts.len() > 3 {
292+ return (spec.to_string(), None);
293+ }
294+ let host = parts[0];
295+ let guest = parts[1];
296+ let mode = parts.get(2).copied();
297+
298+ let home_prefix = format!("/home/{ssh_user}");
299+ let (rel, is_home) = if guest == "~" {
300+ (String::new(), true)
301+ } else if let Some(stripped) = guest.strip_prefix("~/") {
302+ (stripped.to_string(), true)
303+ } else if guest == home_prefix {
304+ (String::new(), true)
305+ } else if let Some(stripped) = guest.strip_prefix(&(home_prefix.clone() + "/")) {
306+ (stripped.to_string(), true)
307+ } else {
308+ (String::new(), false)
309+ };
310+
311+ if !is_home {
312+ return (spec.to_string(), None);
313+ }
314+
315+ let root_base = PROJECT_GUEST_BASE;
316+ let root_path = if rel.is_empty() {
317+ root_base.to_string()
318+ } else {
319+ format!("{root_base}/{rel}")
320+ };
321+ let target = if rel.is_empty() {
322+ home_prefix
323+ } else {
324+ format!("{home_prefix}/{rel}")
325+ };
326+
327+ let rewritten = match mode {
328+ Some(mode) => format!("{host}:{root_path}:{mode}"),
329+ None => format!("{host}:{root_path}"),
330+ };
331+
332+ (
333+ rewritten,
334+ Some(HomeLink {
335+ source: root_path,
336+ target,
337+ }),
338+ )
339+}
340+
341+fn render_home_links_script(links: &[HomeLink], ssh_user: &str) -> String {
342+ if links.is_empty() {
343+ return String::new();
344+ }
345+ let mut lines = Vec::new();
346+ lines.push("link_home() {".to_string());
347+ lines.push(" src=\"$1\"".to_string());
348+ lines.push(" dest=\"$2\"".to_string());
349+ lines.push(" if [ -L \"$dest\" ]; then".to_string());
350+ lines.push(" current=\"$(readlink \"$dest\" || true)\"".to_string());
351+ lines.push(" if [ \"$current\" != \"$src\" ]; then".to_string());
352+ lines.push(" rm -f \"$dest\"".to_string());
353+ lines.push(" fi".to_string());
354+ lines.push(" fi".to_string());
355+ lines.push(" if [ ! -e \"$dest\" ]; then".to_string());
356+ lines.push(" mkdir -p \"$(dirname \"$dest\")\"".to_string());
357+ lines.push(" ln -s \"$src\" \"$dest\"".to_string());
358+ lines.push(" fi".to_string());
359+ lines.push(format!(
360+ " chown -h \"{ssh_user}:{ssh_user}\" \"$dest\" 2>/dev/null || true"
361+ ));
362+ lines.push("}".to_string());
363+ for link in links {
364+ let src = shell_escape(&link.source);
365+ let dest = shell_escape(&link.target);
366+ lines.push(format!("link_home {src} {dest}"));
367+ }
368+ lines.join("\n")
369+}
370+
371+fn shell_escape(value: &str) -> String {
372+ let escaped = value.replace('\'', "'\"'\"'");
373+ format!("'{escaped}'")
193374}
194375
195376struct PidFileGuard {
@@ -228,6 +409,30 @@ fn wait_for_disconnect(mut stream: UnixStream) {
228409 }
229410}
230411
412+fn remove_client(streams: &ClientStreams, fd: std::os::fd::RawFd) {
413+ if let Ok(mut clients) = streams.lock() {
414+ clients.retain(|stream| stream.as_raw_fd() != fd);
415+ }
416+}
417+
418+fn send_status_line(stream: &mut UnixStream, status: &str) -> bool {
419+ let mut payload = String::with_capacity(STATUS_PREFIX.len() + status.len() + 1);
420+ payload.push_str(STATUS_PREFIX);
421+ payload.push_str(status);
422+ payload.push('\n');
423+ stream.write_all(payload.as_bytes()).is_ok()
424+}
425+
426+#[cfg_attr(feature = "mock-vm", allow(dead_code))]
427+fn broadcast_status(streams: &ClientStreams, latest_status: &SharedStatus, status: &str) {
428+ if let Ok(mut current) = latest_status.lock() {
429+ *current = status.to_string();
430+ }
431+ if let Ok(mut clients) = streams.lock() {
432+ clients.retain_mut(|stream| send_status_line(stream, status));
433+ }
434+}
435+
231436fn send_client_pid(stream: &UnixStream) {
232437 let pid = std::process::id();
233438 let payload = format!("pid={pid}\n");
@@ -237,7 +442,7 @@ fn send_client_pid(stream: &UnixStream) {
237442 }
238443}
239444
240−fn acquire_spawn_lock(lock_path: &Path) -> Result<Option<fs::File>, Box<dyn std::error::Error>> {
445+fn acquire_spawn_lock(lock_path: &Path) -> Result<Option<fs::File>> {
241446 match fs::OpenOptions::new()
242447 .write(true)
243448 .create_new(true)
@@ -271,6 +476,12 @@ fn is_lock_stale(lock_path: &Path) -> bool {
271476 }
272477}
273478
479+fn read_lock_pid(lock_path: &Path) -> Option<u32> {
480+ let content = fs::read_to_string(lock_path).ok()?;
481+ let line = content.lines().next()?;
482+ line.strip_prefix("pid=")?.trim().parse::<u32>().ok()
483+}
484+
274485fn pid_is_alive(pid: u32) -> bool {
275486 let pid = pid as libc::pid_t;
276487 let result = unsafe { libc::kill(pid, 0) };
@@ -284,12 +495,6 @@ fn pid_is_alive(pid: u32) -> bool {
284495 }
285496}
286497
287−fn read_lock_pid(lock_path: &Path) -> Option<u32> {
288− let content = fs::read_to_string(lock_path).ok()?;
289− let line = content.lines().next()?;
290− line.strip_prefix("pid=")?.trim().parse::<u32>().ok()
291−}
292−
293498fn read_client_pid(stream: &UnixStream) -> Option<u32> {
294499 let mut stream = stream.try_clone().ok()?;
295500 let _ = stream.set_read_timeout(Some(Duration::from_millis(200)));
@@ -300,7 +505,7 @@ fn read_client_pid(stream: &UnixStream) -> Option<u32> {
300505 Ok(0) => break,
301506 Ok(n) => {
302507 len += n;
303− if buf[..len].iter().any(|b| *b == b'\n') || len == buf.len() {
508+ if buf[..len].contains(&b'\n') || len == buf.len() {
304509 break;
305510 }
306511 }
@@ -322,14 +527,17 @@ fn read_client_pid(stream: &UnixStream) -> Option<u32> {
322527 }
323528}
324529
530+#[cfg_attr(feature = "mock-vm", allow(dead_code))]
325531fn spawn_manager_io(
326532 config: Arc<Mutex<InstanceConfig>>,
327− instance_dir: PathBuf,
533+ project_dir: PathBuf,
534+ clients: ClientStreams,
535+ latest_status: SharedStatus,
328536 output_monitor: Arc<vm::OutputMonitor>,
329537 vm_output_fd: std::os::unix::io::OwnedFd,
330538 vm_input_fd: std::os::unix::io::OwnedFd,
331539) -> vm::IoContext {
332− let log_path = instance_dir.join(SERIAL_LOG_NAME);
540+ let log_path = project_dir.join(INSTANCE_DIR_NAME).join(VM_ROOT_LOG_NAME);
333541 let log_file = fs::OpenOptions::new()
334542 .create(true)
335543 .write(true)
@@ -338,16 +546,15 @@ fn spawn_manager_io(
338546 .ok()
339547 .map(|file| Arc::new(Mutex::new(file)));
340548
341− let instance_path = instance_dir.join(INSTANCE_FILENAME);
342549 let config_for_output = config.clone();
343550 let log_for_output = log_file.clone();
344551 let mut line_buf = String::new();
345552
346553 let on_output = move |bytes: &[u8]| {
347− if let Some(log) = &log_for_output {
348− if let Ok(mut file) = log.lock() {
349− let _ = file.write_all(bytes);
350− }
554+ if let Some(log) = &log_for_output
555+ && let Ok(mut file) = log.lock()
556+ {
557+ let _ = file.write_all(bytes);
351558 }
352559
353560 let text = String::from_utf8_lossy(bytes);
@@ -360,17 +567,27 @@ fn spawn_manager_io(
360567 }
361568 line_buf.drain(..=pos);
362569
363− let cleaned = line.trim_start_matches(|c: char| c == '\r' || c == ' ');
570+ let cleaned = line.trim_start_matches(['\r', ' ']);
571+ if let Some(script_failure) = cleaned.strip_prefix("VIBEBOX_SCRIPT_ERROR:") {
572+ let failure = script_failure.trim();
573+ if !failure.is_empty() {
574+ tracing::error!(script_failure = %failure, "[vm] script reported failure");
575+ broadcast_status(
576+ &clients,
577+ &latest_status,
578+ &format!("{STATUS_VM_ERROR_PREFIX} {failure}"),
579+ );
580+ }
581+ }
364582 if let Some(pos) = cleaned.find("VIBEBOX_IPV4=") {
365583 let ip_raw = &cleaned[(pos + "VIBEBOX_IPV4=".len())..];
366584 let ip = extract_ipv4(ip_raw).unwrap_or_default();
367− if !ip.is_empty() {
368− if let Ok(mut cfg) = config_for_output.lock() {
369− if cfg.vm_ipv4.as_deref() != Some(ip.as_str()) {
370− cfg.vm_ipv4 = Some(ip.clone());
371− let _ = write_instance_config(&instance_path, &cfg);
372− }
373− }
585+ if !ip.is_empty()
586+ && let Ok(mut cfg) = config_for_output.lock()
587+ && cfg.vm_ipv4.as_deref() != Some(ip.as_str())
588+ {
589+ cfg.vm_ipv4 = Some(ip.clone());
590+ let _ = write_instance_config(&project_dir, &cfg);
374591 }
375592 }
376593 }
@@ -392,51 +609,13 @@ enum ManagerEvent {
392609 VmExited(Option<String>),
393610}
394611
395−#[cfg(test)]
396−mod tests {
397− use super::*;
398− use std::{sync::mpsc, time::Duration};
399−
400− #[test]
401− fn manager_powers_off_after_grace_when_no_refs() {
402− let _temp = tempfile::Builder::new()
403− .prefix("vb")
404− .tempdir_in("/tmp")
405− .expect("tempdir");
406−
407− let (event_tx, event_rx) = mpsc::channel::<ManagerEvent>();
408− let (vm_tx, vm_rx) = mpsc::channel::<VmInput>();
409− let vm_input_tx = Arc::new(Mutex::new(Some(vm_tx)));
410−
411− let manager_thread = thread::spawn(move || {
412− manager_event_loop(event_rx, vm_input_tx, 50).expect("event loop");
413− });
414−
415− event_tx.send(ManagerEvent::Inc(None)).unwrap();
416− assert!(vm_rx.recv_timeout(Duration::from_millis(100)).is_err());
417−
418− event_tx.send(ManagerEvent::Dec(None)).unwrap();
419− let msg = vm_rx
420− .recv_timeout(Duration::from_secs(2))
421− .expect("poweroff");
422− match msg {
423− VmInput::Bytes(data) => {
424− assert_eq!(data, b"systemctl poweroff\n");
425− }
426− _ => panic!("unexpected vm input"),
427− }
428− let _ = event_tx.send(ManagerEvent::VmExited(None));
429− let _ = manager_thread.join();
430− }
431−}
432−
433612struct ManagerOptions {
434− ensure_signed: bool,
435613 detach: bool,
436614 prepare_vm: bool,
437615}
438616
439617trait VmExecutor {
618+ #[allow(clippy::too_many_arguments)]
440619 fn run_vm(
441620 &self,
442621 args: vm::VmArg,
@@ -444,10 +623,13 @@ trait VmExecutor {
444623 extra_shares: Vec<DirectoryShare>,
445624 config: Arc<Mutex<InstanceConfig>>,
446625 instance_dir: PathBuf,
626+ clients: ClientStreams,
627+ latest_status: SharedStatus,
447628 vm_input_tx: Arc<Mutex<Option<mpsc::Sender<VmInput>>>>,
448− ) -> Result<(), Box<dyn std::error::Error>>;
629+ ) -> Result<()>;
449630}
450631
632+#[cfg_attr(feature = "mock-vm", allow(dead_code))]
451633struct RealVmExecutor;
452634
453635impl VmExecutor for RealVmExecutor {
@@ -457,15 +639,22 @@ impl VmExecutor for RealVmExecutor {
457639 extra_login_actions: Vec<LoginAction>,
458640 extra_shares: Vec<DirectoryShare>,
459641 config: Arc<Mutex<InstanceConfig>>,
460− instance_dir: PathBuf,
642+ project_dir: PathBuf,
643+ clients: ClientStreams,
644+ latest_status: SharedStatus,
461645 vm_input_tx: Arc<Mutex<Option<mpsc::Sender<VmInput>>>>,
462− ) -> Result<(), Box<dyn std::error::Error>> {
463− let result = vm::run_with_args_and_extras(
646+ ) -> Result<()> {
647+ let status_callback = |status: &str| {
648+ broadcast_status(&clients, &latest_status, status);
649+ };
650+ vm::run_with_args_and_extras(
464651 args,
465652 |output_monitor, vm_output_fd, vm_input_fd| {
466653 let io_ctx = spawn_manager_io(
467654 config.clone(),
468− instance_dir.clone(),
655+ project_dir.clone(),
656+ clients.clone(),
657+ latest_status.clone(),
469658 output_monitor,
470659 vm_output_fd,
471660 vm_input_fd,
@@ -475,35 +664,60 @@ impl VmExecutor for RealVmExecutor {
475664 },
476665 extra_login_actions,
477666 extra_shares,
478− );
479− result
667+ Some(&status_callback),
668+ )
669+ }
670+}
671+
672+#[cfg(feature = "mock-vm")]
673+struct MockVmExecutor;
674+
675+#[cfg(feature = "mock-vm")]
676+impl VmExecutor for MockVmExecutor {
677+ fn run_vm(
678+ &self,
679+ _args: vm::VmArg,
680+ _extra_login_actions: Vec<LoginAction>,
681+ _extra_shares: Vec<DirectoryShare>,
682+ _config: Arc<Mutex<InstanceConfig>>,
683+ _instance_dir: PathBuf,
684+ _clients: ClientStreams,
685+ _latest_status: SharedStatus,
686+ vm_input_tx: Arc<Mutex<Option<mpsc::Sender<VmInput>>>>,
687+ ) -> Result<()> {
688+ let (tx, rx) = mpsc::channel::<VmInput>();
689+ *vm_input_tx.lock().unwrap() = Some(tx);
690+ tracing::info!("mock vm executor running");
691+ while let Ok(input) = rx.recv() {
692+ match input {
693+ VmInput::Shutdown => break,
694+ VmInput::Bytes(bytes) => {
695+ let text = String::from_utf8_lossy(&bytes);
696+ if text.contains("systemctl poweroff") {
697+ break;
698+ }
699+ }
700+ }
701+ }
702+ tracing::info!("mock vm executor exiting");
703+ Ok(())
480704 }
481705}
482706
483707fn run_manager_with(
484708 project_root: &Path,
485− args: vm::VmArg,
709+ mut args: vm::VmArg,
486710 auto_shutdown_ms: u64,
487711 executor: &dyn VmExecutor,
488712 options: ManagerOptions,
489−) -> Result<(), Box<dyn std::error::Error>> {
490− if options.ensure_signed {
491− let _had_skip = env::var("VIBEBOX_SKIP_CODESIGN").ok();
492− unsafe {
493− env::remove_var("VIBEBOX_SKIP_CODESIGN");
494− }
495− vm::ensure_signed();
496− unsafe {
497− env::set_var("VIBEBOX_SKIP_CODESIGN", "1");
498− }
499− }
713+) -> Result<()> {
500714 if options.detach {
501715 detach_from_terminal();
502716 }
503717
504718 let project_name = project_root
505719 .file_name()
506− .ok_or("Project directory has no name")?
720+ .ok_or_else(|| anyhow!("Project directory has no name"))?
507721 .to_string_lossy()
508722 .into_owned();
509723 let instance_dir = ensure_instance_dir(project_root)?;
@@ -511,21 +725,35 @@ fn run_manager_with(
511725 let _ = ensure_ssh_keypair(&instance_dir)?;
512726 }
513727
514− let mut config = load_or_create_instance_config(&instance_dir)?;
728+ let mut config = load_or_create_instance_config(project_root)?;
515729 if config.vm_ipv4.is_some() {
516730 config.vm_ipv4 = None;
517− write_instance_config(&instance_dir.join(INSTANCE_FILENAME), &config)?;
731+ write_instance_config(project_root, &config)?;
518732 }
519733 let config = Arc::new(Mutex::new(config));
734+ let ssh_user = config
735+ .lock()
736+ .map(|cfg| cfg.ssh_user.clone())
737+ .map_err(|_| anyhow!("failed to acquire ssh user display"))?;
738+ if !args.no_default_mounts {
739+ inject_project_mount(&mut args.mounts, project_root, &ssh_user, &project_name);
740+ }
741+ let (args, home_links_script) = prepare_mounts_and_links(args, &ssh_user);
520742
743+ let project_guest_dir = format!("{PROJECT_GUEST_BASE}/{project_name}");
521744 let ssh_guest_dir = format!("/root/{}", GLOBAL_DIR_NAME);
522− let extra_shares = vec![DirectoryShare::new(
523− instance_dir.clone(),
524− ssh_guest_dir.clone().into(),
525− true,
526− )?];
527− let extra_login_actions =
528− build_ssh_login_actions(&config, &project_name, ssh_guest_dir.as_str(), "ssh_key");
745+ let extra_shares = vec![
746+ DirectoryShare::new(instance_dir.clone(), ssh_guest_dir.clone().into(), true)
747+ .map_err(|err| anyhow!(err.to_string()))?,
748+ ];
749+ let extra_login_actions = build_ssh_login_actions(
750+ &config,
751+ &project_name,
752+ &project_guest_dir,
753+ ssh_guest_dir.as_str(),
754+ "ssh_key",
755+ &home_links_script,
756+ );
529757
530758 let socket_path = instance_dir.join(VM_MANAGER_SOCKET_NAME);
531759 if let Ok(stream) = UnixStream::connect(&socket_path) {
@@ -540,17 +768,43 @@ fn run_manager_with(
540768 let _ = fs::set_permissions(&socket_path, fs::Permissions::from_mode(0o600));
541769 tracing::info!(path = %socket_path.display(), "vm manager socket bound");
542770
771+ let clients: ClientStreams = Arc::new(Mutex::new(Vec::new()));
772+ let latest_status: SharedStatus = Arc::new(Mutex::new(String::new()));
543773 let (event_tx, event_rx) = mpsc::channel::<ManagerEvent>();
544774 let event_tx_accept = event_tx.clone();
775+ let clients_accept = clients.clone();
776+ let latest_status_accept = latest_status.clone();
545777 thread::spawn(move || {
546778 for stream in listener.incoming() {
547779 match stream {
548780 Ok(stream) => {
781+ let mut client_fd: Option<std::os::fd::RawFd> = None;
782+ let latest_status_snapshot = latest_status_accept
783+ .lock()
784+ .ok()
785+ .map(|status| status.clone());
786+ if let Ok(writer) = stream.try_clone() {
787+ let writer_fd = writer.as_raw_fd();
788+ if let Ok(mut connected) = clients_accept.lock() {
789+ connected.push(writer);
790+ client_fd = Some(writer_fd);
791+ if let Some(last) = connected.last_mut()
792+ && let Some(status) = latest_status_snapshot.as_deref()
793+ && !status.is_empty()
794+ {
795+ let _ = send_status_line(last, status);
796+ }
797+ }
798+ }
549799 let event_tx_conn = event_tx_accept.clone();
800+ let clients_conn = clients_accept.clone();
550801 thread::spawn(move || {
551802 let pid = read_client_pid(&stream);
552803 let _ = event_tx_conn.send(ManagerEvent::Inc(pid));
553804 wait_for_disconnect(stream);
805+ if let Some(fd) = client_fd {
806+ remove_client(&clients_conn, fd);
807+ }
554808 let _ = event_tx_conn.send(ManagerEvent::Dec(pid));
555809 });
556810 }
@@ -570,43 +824,59 @@ fn run_manager_with(
570824 extra_login_actions,
571825 extra_shares,
572826 config.clone(),
573− instance_dir.clone(),
827+ project_root.to_path_buf(),
828+ clients.clone(),
829+ latest_status.clone(),
574830 vm_input_tx.clone(),
575831 );
576832 tracing::info!("vm manager vm run completed");
577833 let vm_err = vm_result.err().map(|e| e.to_string());
834+ if let Some(err) = &vm_err {
835+ broadcast_status(
836+ &clients,
837+ &latest_status,
838+ &format!("{STATUS_VM_ERROR_PREFIX} {err}"),
839+ );
840+ }
578841 let _ = event_tx.send(ManagerEvent::VmExited(vm_err.clone()));
579− let event_loop_result: Result<(), String> = event_loop_handle
842+ let event_loop_result = event_loop_handle
580843 .join()
581− .unwrap_or_else(|_| Err("vm manager event loop panicked".into()))
844+ .unwrap_or_else(|_| Err(Error::msg("vm manager event loop panicked")))
582845 .map_err(|err| err.to_string());
583846 let _ = fs::remove_file(&socket_path);
584847 if let Err(err) = &event_loop_result {
585848 tracing::error!(error = %err, "vm manager exiting due to event loop error");
586− return Err(err.to_string().into());
849+ bail!(err.to_string());
587850 }
588851 if let Some(err) = vm_err {
589852 tracing::error!(error = %err, "vm manager exiting due to vm error");
590− return Err(err.into());
853+ bail!(err);
591854 }
592855 tracing::info!("vm manager exiting");
593− Ok(event_loop_result?)
856+ event_loop_result.map_err(Error::msg)
594857}
595858
596859fn manager_event_loop(
597860 event_rx: mpsc::Receiver<ManagerEvent>,
598861 vm_input_tx: Arc<Mutex<Option<mpsc::Sender<VmInput>>>>,
599862 auto_shutdown_ms: u64,
600−) -> Result<(), String> {
863+) -> Result<()> {
601864 let mut ref_count: usize = 0;
602865 let mut shutdown_deadline: Option<Instant> = None;
603866 let mut shutdown_sent = false;
867+ let mut hard_deadline: Option<Instant> = None;
604868 let grace = Duration::from_millis(auto_shutdown_ms.max(1));
869+ let hard_timeout = Duration::from_millis(HARD_SHUTDOWN_TIMEOUT_MS);
605870
606871 loop {
607− let timeout = match shutdown_deadline {
608− Some(deadline) => deadline.saturating_duration_since(Instant::now()),
609− None => Duration::from_secs(1),
872+ let timeout = match (shutdown_deadline, hard_deadline) {
873+ (Some(shutdown), Some(hard)) => {
874+ let next = if shutdown <= hard { shutdown } else { hard };
875+ next.saturating_duration_since(Instant::now())
876+ }
877+ (Some(shutdown), None) => shutdown.saturating_duration_since(Instant::now()),
878+ (None, Some(hard)) => hard.saturating_duration_since(Instant::now()),
879+ (None, None) => Duration::from_secs(1),
610880 };
611881
612882 match event_rx.recv_timeout(timeout) {
@@ -620,11 +890,10 @@ fn manager_event_loop(
620890 );
621891 shutdown_deadline = None;
622892 shutdown_sent = false;
893+ hard_deadline = None;
623894 }
624895 Ok(ManagerEvent::Dec(pid)) => {
625− if ref_count > 0 {
626− ref_count -= 1;
627− }
896+ ref_count = ref_count.saturating_sub(1);
628897 tracing::info!(
629898 ref_count,
630899 pid = pid.unwrap_or(0),
@@ -643,15 +912,52 @@ fn manager_event_loop(
643912 break;
644913 }
645914 Err(mpsc::RecvTimeoutError::Timeout) => {
646− if let Some(deadline) = shutdown_deadline {
647− if Instant::now() >= deadline && !shutdown_sent {
648− if let Some(tx) = vm_input_tx.lock().unwrap().clone() {
649− let _ = tx.send(VmInput::Bytes(b"systemctl poweroff\n".to_vec()));
915+ if let Some(deadline) = shutdown_deadline
916+ && Instant::now() >= deadline
917+ && !shutdown_sent
918+ {
919+ if hard_deadline.is_none() {
920+ hard_deadline = Some(Instant::now() + hard_timeout);
921+ }
922+ let mut sent = false;
923+ if let Some(tx) = vm_input_tx.lock().unwrap().clone() {
924+ if tx
925+ .send(VmInput::Bytes(b"systemctl poweroff\n".to_vec()))
926+ .is_ok()
927+ {
928+ sent = true;
929+ } else {
930+ tracing::warn!("shutdown command failed to send");
650931 }
932+ } else {
933+ tracing::warn!("shutdown command deferred; vm input not ready");
934+ }
935+ if sent {
651936 tracing::info!("shutdown command sent");
652937 shutdown_sent = true;
653938 shutdown_deadline = None;
939+ hard_deadline = Some(Instant::now() + hard_timeout);
940+ } else {
941+ shutdown_deadline =
942+ Some(Instant::now() + Duration::from_millis(SHUTDOWN_RETRY_MS));
943+ }
944+ }
945+ if ref_count == 0
946+ && let Some(deadline) = hard_deadline
947+ && Instant::now() >= deadline
948+ {
949+ if shutdown_sent {
950+ tracing::warn!(
951+ timeout_ms = HARD_SHUTDOWN_TIMEOUT_MS,
952+ "force exiting: VM did not stop after shutdown timeout"
953+ );
954+ } else {
955+ tracing::warn!(
956+ timeout_ms = HARD_SHUTDOWN_TIMEOUT_MS,
957+ "force exiting: VM input not ready after shutdown timeout"
958+ );
654959 }
960+ force_exit("vm manager forced exit");
655961 }
656962 }
657963 Err(mpsc::RecvTimeoutError::Disconnected) => break,
@@ -660,3 +966,112 @@ fn manager_event_loop(
660966
661967 Ok(())
662968}
969+
970+#[cfg(test)]
971+mod tests {
972+ use super::*;
973+ use std::{fs, sync::mpsc, thread, time::Duration};
974+
975+ #[test]
976+ fn manager_powers_off_after_grace_when_no_refs() {
977+ let _temp = tempfile::Builder::new()
978+ .prefix("vb")
979+ .tempdir_in("/tmp")
980+ .expect("tempdir");
981+
982+ let (event_tx, event_rx) = mpsc::channel::<ManagerEvent>();
983+ let (vm_tx, vm_rx) = mpsc::channel::<VmInput>();
984+ let vm_input_tx = Arc::new(Mutex::new(Some(vm_tx)));
985+
986+ let manager_thread = thread::spawn(move || {
987+ manager_event_loop(event_rx, vm_input_tx, 50).expect("event loop");
988+ });
989+
990+ event_tx.send(ManagerEvent::Inc(None)).unwrap();
991+ assert!(vm_rx.recv_timeout(Duration::from_millis(100)).is_err());
992+
993+ event_tx.send(ManagerEvent::Dec(None)).unwrap();
994+ let msg = vm_rx
995+ .recv_timeout(Duration::from_secs(2))
996+ .expect("poweroff");
997+ match msg {
998+ VmInput::Bytes(data) => {
999+ assert_eq!(data, b"systemctl poweroff\n");
1000+ }
1001+ _ => panic!("unexpected vm input"),
1002+ }
1003+ let _ = event_tx.send(ManagerEvent::VmExited(None));
1004+ let _ = manager_thread.join();
1005+ }
1006+
1007+ #[test]
1008+ fn manager_force_exits_when_vm_input_never_ready() {
1009+ let (event_tx, event_rx) = mpsc::channel::<ManagerEvent>();
1010+ let vm_input_tx = Arc::new(Mutex::new(None));
1011+
1012+ let manager_thread = thread::spawn(move || {
1013+ let _ = manager_event_loop(event_rx, vm_input_tx, 10);
1014+ });
1015+
1016+ event_tx.send(ManagerEvent::Inc(None)).unwrap();
1017+ event_tx.send(ManagerEvent::Dec(None)).unwrap();
1018+
1019+ let join_result = manager_thread.join();
1020+ assert!(
1021+ join_result.is_err(),
1022+ "expected manager to force-exit when vm input never becomes ready"
1023+ );
1024+ }
1025+
1026+ #[test]
1027+ fn manager_sends_shutdown_after_vm_input_becomes_ready() {
1028+ let (event_tx, event_rx) = mpsc::channel::<ManagerEvent>();
1029+ let (vm_tx, vm_rx) = mpsc::channel::<VmInput>();
1030+ let vm_input_tx = Arc::new(Mutex::new(None));
1031+ let vm_input_for_thread = vm_input_tx.clone();
1032+
1033+ let manager_thread = thread::spawn(move || {
1034+ manager_event_loop(event_rx, vm_input_for_thread, 10).expect("event loop");
1035+ });
1036+
1037+ event_tx.send(ManagerEvent::Inc(None)).unwrap();
1038+ event_tx.send(ManagerEvent::Dec(None)).unwrap();
1039+
1040+ thread::sleep(Duration::from_millis(100));
1041+ *vm_input_tx.lock().unwrap() = Some(vm_tx);
1042+
1043+ let msg = vm_rx
1044+ .recv_timeout(Duration::from_secs(2))
1045+ .expect("poweroff");
1046+ match msg {
1047+ VmInput::Bytes(data) => {
1048+ assert_eq!(data, b"systemctl poweroff\n");
1049+ }
1050+ _ => panic!("unexpected vm input"),
1051+ }
1052+ let _ = event_tx.send(ManagerEvent::VmExited(None));
1053+ let _ = manager_thread.join();
1054+ }
1055+
1056+ #[test]
1057+ fn lock_is_not_stale_when_owner_pid_is_alive() {
1058+ let temp = tempfile::Builder::new()
1059+ .prefix("vb")
1060+ .tempdir_in("/tmp")
1061+ .expect("tempdir");
1062+ let lock_path = temp.path().join("vm.lock");
1063+ fs::write(&lock_path, format!("pid={}\n", std::process::id())).expect("write lock");
1064+ assert!(!is_lock_stale(&lock_path));
1065+ }
1066+
1067+ #[test]
1068+ fn lock_is_stale_when_owner_pid_is_missing() {
1069+ let temp = tempfile::Builder::new()
1070+ .prefix("vb")
1071+ .tempdir_in("/tmp")
1072+ .expect("tempdir");
1073+ let lock_path = temp.path().join("vm.lock");
1074+ fs::write(&lock_path, "pid=999999\n").expect("write lock");
1075+ assert!(is_lock_stale(&lock_path));
1076+ }
1077+}