@@ -1,15 +1,3 @@
1−use crate::instance::{VmLiveness, vm_liveness};
2−use crate::session_manager::INSTANCE_DIR_NAME;
4− config::CONFIG_PATH_ENV,
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,
9− session_manager::{GLOBAL_DIR_NAME, VM_MANAGER_PID_NAME, VM_MANAGER_SOCKET_NAME},
10− vm::{self, DirectoryShare, LoginAction, PROJECT_GUEST_BASE, VmInput},
12−use anyhow::{Error, Result, anyhow, bail};
15 io::{Read, Write},
3 io::{Read, Write},
@@ -17,6 +5,7 @@ use std::{
17 fs::PermissionsExt,
5 fs::PermissionsExt,
18 io::AsRawFd,
6 io::AsRawFd,
19 net::{UnixListener, UnixStream},
7 net::{UnixListener, UnixStream},
21 path::{Path, PathBuf},
10 path::{Path, PathBuf},
22 process::{Command, Stdio},
11 process::{Command, Stdio},
@@ -25,44 +14,36 @@ use std::{
25 time::{Duration, Instant},
14 time::{Duration, Instant},
28−#[cfg_attr(feature = "mock-vm", allow(dead_code))]
17+use crate::{
29−const VM_ROOT_LOG_NAME: &str = "vm_root.log";
18+ config::CONFIG_PATH_ENV,
19+ instance::SERIAL_LOG_NAME,
21+ InstanceConfig, build_ssh_login_actions, ensure_instance_dir, ensure_ssh_keypair,
22+ extract_ipv4, load_or_create_instance_config, write_instance_config,
25+ GLOBAL_DIR_NAME, INSTANCE_FILENAME, VM_MANAGER_PID_NAME, VM_MANAGER_SOCKET_NAME,
27+ vm::{self, DirectoryShare, LoginAction, VmInput},
30const VM_MANAGER_LOCK_NAME: &str = "vm.lock";
30const VM_MANAGER_LOCK_NAME: &str = "vm.lock";
31const VM_MANAGER_LOG_NAME: &str = "vm_manager.log";
31const VM_MANAGER_LOG_NAME: &str = "vm_manager.log";
32−const SHUTDOWN_RETRY_MS: u64 = 500;
34−const HARD_SHUTDOWN_TIMEOUT_MS: u64 = 1_000;
36−const HARD_SHUTDOWN_TIMEOUT_MS: u64 = 12_000;
37−const STATUS_PREFIX: &str = "status:";
39−type ClientStreams = Arc<Mutex<Vec<UnixStream>>>;
40−type SharedStatus = Arc<Mutex<String>>;
43−fn force_exit(_reason: &str) -> ! {
44− std::process::exit(1);
48−fn force_exit(reason: &str) -> ! {
52pub fn ensure_manager(
33pub fn ensure_manager(
53 raw_args: &[std::ffi::OsString],
34 raw_args: &[std::ffi::OsString],
54 auto_shutdown_ms: u64,
35 auto_shutdown_ms: u64,
55 config_path: Option<&Path>,
36 config_path: Option<&Path>,
56−) -> Result<UnixStream> {
37+) -> Result<UnixStream, Box<dyn std::error::Error>> {
57 let project_root = env::current_dir()?;
38 let project_root = env::current_dir()?;
58 tracing::debug!(root = %project_root.display(), "ensure vm manager");
39 tracing::debug!(root = %project_root.display(), "ensure vm manager");
59 let instance_dir = ensure_instance_dir(&project_root)?;
40 let instance_dir = ensure_instance_dir(&project_root)?;
60− cleanup_stale_manager(&project_root)?;
41+ cleanup_stale_manager(&instance_dir);
61 let socket_path = instance_dir.join(VM_MANAGER_SOCKET_NAME);
42 let socket_path = instance_dir.join(VM_MANAGER_SOCKET_NAME);
63 if let Ok(stream) = UnixStream::connect(&socket_path) {
44 if let Ok(stream) = UnixStream::connect(&socket_path) {
64 send_client_pid(&stream);
45 send_client_pid(&stream);
65− tracing::info!(path = %socket_path.display(), "connected to an existing vm manager");
46+ tracing::info!(path = %socket_path.display(), "connected to existing vm manager");
66 return Ok(stream);
47 return Ok(stream);
@@ -100,11 +81,12 @@ pub fn ensure_manager(
100 drop(lock_file.take());
81 drop(lock_file.take());
101 let _ = fs::remove_file(&lock_path);
82 let _ = fs::remove_file(&lock_path);
103− bail!(format!(
84+ return Err(format!(
104− "timed out waiting for vm manager socket: {} ({})",
85+ "Timed out waiting for vm manager socket: {} ({})",
105 socket_path.display(),
86 socket_path.display(),
109 thread::sleep(Duration::from_millis(100));
91 thread::sleep(Duration::from_millis(100));
@@ -112,49 +94,24 @@ pub fn ensure_manager(
115−pub fn run_manager(args: vm::VmArg, auto_shutdown_ms: u64) -> Result<()> {
99+ auto_shutdown_ms: u64,
100+) -> Result<(), Box<dyn std::error::Error>> {
116 let project_root = env::current_dir()?;
101 let project_root = env::current_dir()?;
117 tracing::info!(root = %project_root.display(), "vm manager starting");
102 tracing::info!(root = %project_root.display(), "vm manager starting");
118− #[cfg(not(feature = "mock-vm"))]
121− env::remove_var("VIBEBOX_SKIP_CODESIGN");
123− vm::ensure_signed();
125− env::set_var("VIBEBOX_SKIP_CODESIGN", "1");
128 let _pid_guard = ensure_pid_file(&project_root)?;
103 let _pid_guard = ensure_pid_file(&project_root)?;
129− #[cfg(feature = "mock-vm")]
130− tracing::info!("vm manager using mock executor");
131− let executor: &dyn VmExecutor = {
132− #[cfg(feature = "mock-vm")]
136− #[cfg(not(feature = "mock-vm"))]
142− #[cfg(feature = "mock-vm")]
149− #[cfg(not(feature = "mock-vm"))]
157− run_manager_with(&project_root, args, auto_shutdown_ms, executor, options)
104+ run_manager_with(
110+ ensure_signed: true,
160fn spawn_manager_process(
117fn spawn_manager_process(
@@ -162,28 +119,30 @@ fn spawn_manager_process(
162 auto_shutdown_ms: u64,
119 auto_shutdown_ms: u64,
163 instance_dir: &Path,
120 instance_dir: &Path,
164 config_path: Option<&Path>,
121 config_path: Option<&Path>,
165−) -> Result<()> {
122+) -> Result<(), Box<dyn std::error::Error>> {
166 let exe = env::current_exe()?;
123 let exe = env::current_exe()?;
167 let mut supervisor_exe = exe.clone();
124 let mut supervisor_exe = exe.clone();
168 supervisor_exe.set_file_name("vibebox-supervisor");
125 supervisor_exe.set_file_name("vibebox-supervisor");
169− // intentional
126+ let use_supervisor = supervisor_exe.exists();
127+ let mut cmd = if use_supervisor {
170− if !supervisor_exe.exists() {
128+ Command::new(supervisor_exe)
171− bail!(format!(
129+ } else {
130+ let mut cmd = Command::new(exe);
172− "vibebox-supervisor not found at {}",
131+ cmd.arg0("vibebox-supervisor");
173− supervisor_exe.display()
132+ cmd
176− let mut cmd = Command::new(supervisor_exe);
177 if raw_args.len() > 1 {
134 if raw_args.len() > 1 {
178 cmd.args(&raw_args[1..]);
135 cmd.args(&raw_args[1..]);
180− cmd.env("VIBEBOX_INTERNAL", "1");
137+ if !use_supervisor {
138+ cmd.env("VIBEBOX_VM_MANAGER", "1");
181 cmd.env("VIBEBOX_LOG_NO_COLOR", "1");
140 cmd.env("VIBEBOX_LOG_NO_COLOR", "1");
182 cmd.env("VIBEBOX_AUTO_SHUTDOWN_MS", auto_shutdown_ms.to_string());
141 cmd.env("VIBEBOX_AUTO_SHUTDOWN_MS", auto_shutdown_ms.to_string());
183 if let Some(path) = config_path {
142 if let Some(path) = config_path {
184 cmd.env(CONFIG_PATH_ENV, path);
143 cmd.env(CONFIG_PATH_ENV, path);
186− tracing::debug!(auto_shutdown_ms, "vm manager process spawn requested");
145+ tracing::info!(auto_shutdown_ms, "vm manager process spawn requested");
187 let log_path = instance_dir.join(VM_MANAGER_LOG_NAME);
146 let log_path = instance_dir.join(VM_MANAGER_LOG_NAME);
188 let log_file = fs::OpenOptions::new()
147 let log_file = fs::OpenOptions::new()
189 .create(true)
148 .create(true)
@@ -205,172 +164,32 @@ fn spawn_manager_process(
208−fn ensure_pid_file(project_root: &Path) -> Result<PidFileGuard> {
167+fn ensure_pid_file(project_root: &Path) -> Result<PidFileGuard, Box<dyn std::error::Error>> {
209 let instance_dir = ensure_instance_dir(project_root)?;
168 let instance_dir = ensure_instance_dir(project_root)?;
210 let pid_path = instance_dir.join(VM_MANAGER_PID_NAME);
169 let pid_path = instance_dir.join(VM_MANAGER_PID_NAME);
211− let socket_path = instance_dir.join(VM_MANAGER_SOCKET_NAME);
170+ if let Ok(content) = fs::read_to_string(&pid_path) {
212− match vm_liveness(project_root)? {
171+ if let Ok(pid) = content.trim().parse::<u32>() {
213− VmLiveness::RunningWithSocket { pid } => {
172+ if pid_is_alive(pid) {
214− bail!("vm manager already running (pid {pid})");
173+ return Err(format!("vm manager already running (pid {pid})").into());
216− VmLiveness::RunningWithoutSocket { pid } => {
219− path = %socket_path.display(),
220− "stale pid file detected with missing socket"
223− VmLiveness::NotRunningOrMissing => {}
176+ let _ = fs::remove_file(&pid_path);
225− let _ = fs::remove_file(&pid_path);
226 fs::write(&pid_path, format!("{}\n", std::process::id()))?;
178 fs::write(&pid_path, format!("{}\n", std::process::id()))?;
227 let _ = fs::set_permissions(&pid_path, fs::Permissions::from_mode(0o600));
179 let _ = fs::set_permissions(&pid_path, fs::Permissions::from_mode(0o600));
228 Ok(PidFileGuard { path: pid_path })
180 Ok(PidFileGuard { path: pid_path })
231−fn cleanup_stale_manager(project_root: &Path) -> Result<()> {
183+fn cleanup_stale_manager(instance_dir: &Path) {
232− let pid_path = project_root
233− .join(INSTANCE_DIR_NAME)
234− .join(VM_MANAGER_PID_NAME);
184+ let pid_path = instance_dir.join(VM_MANAGER_PID_NAME);
235− if matches!(
185+ if let Ok(content) = fs::read_to_string(&pid_path) {
236− vm_liveness(project_root)?,
186+ if let Ok(pid) = content.trim().parse::<u32>() {
237− VmLiveness::RunningWithSocket { .. } | VmLiveness::RunningWithoutSocket { .. }
187+ if pid_is_alive(pid) {
239− return Ok(());
189+ }
241− let _ = fs::remove_file(&pid_path);
245−fn inject_project_mount(
246− mounts: &mut Vec<String>,
247− project_root: &Path,
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 {
259− let guest = parts[1];
260− guest == guest_tilde || guest == guest_home || guest == guest_base
265− let host = project_root.display();
266− mounts.insert(0, format!("{host}:{guest_tilde}:read-write"));
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 {
277− mounts.push(rewritten);
279− args.mounts = mounts;
280− let script = render_home_links_script(&links, ssh_user);
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);
294− let host = parts[0];
192+ let _ = fs::remove_file(&pid_path);
295− let guest = parts[1];
296− let mode = parts.get(2).copied();
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)
308− (String::new(), false)
312− return (spec.to_string(), None);
315− let root_base = PROJECT_GUEST_BASE;
316− let root_path = if rel.is_empty() {
317− root_base.to_string()
319− format!("{root_base}/{rel}")
321− let target = if rel.is_empty() {
324− format!("{home_prefix}/{rel}")
327− let rewritten = match mode {
328− Some(mode) => format!("{host}:{root_path}:{mode}"),
329− None => format!("{host}:{root_path}"),
341−fn render_home_links_script(links: &[HomeLink], ssh_user: &str) -> String {
342− if links.is_empty() {
343− return String::new();
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());
360− " chown -h \"{ssh_user}:{ssh_user}\" \"$dest\" 2>/dev/null || true"
362− lines.push("}".to_string());
364− let src = shell_escape(&link.source);
365− let dest = shell_escape(&link.target);
366− lines.push(format!("link_home {src} {dest}"));
371−fn shell_escape(value: &str) -> String {
372− let escaped = value.replace('\'', "'\"'\"'");
373− format!("'{escaped}'")
376struct PidFileGuard {
195struct PidFileGuard {
@@ -409,30 +228,6 @@ fn wait_for_disconnect(mut stream: UnixStream) {
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);
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);
423− stream.write_all(payload.as_bytes()).is_ok()
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();
431− if let Ok(mut clients) = streams.lock() {
432− clients.retain_mut(|stream| send_status_line(stream, status));
436fn send_client_pid(stream: &UnixStream) {
231fn send_client_pid(stream: &UnixStream) {
437 let pid = std::process::id();
232 let pid = std::process::id();
438 let payload = format!("pid={pid}\n");
233 let payload = format!("pid={pid}\n");
@@ -442,7 +237,7 @@ fn send_client_pid(stream: &UnixStream) {
445−fn acquire_spawn_lock(lock_path: &Path) -> Result<Option<fs::File>> {
240+fn acquire_spawn_lock(lock_path: &Path) -> Result<Option<fs::File>, Box<dyn std::error::Error>> {
446 match fs::OpenOptions::new()
241 match fs::OpenOptions::new()
447 .write(true)
242 .write(true)
448 .create_new(true)
243 .create_new(true)
@@ -476,12 +271,6 @@ fn is_lock_stale(lock_path: &Path) -> bool {
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()
485fn pid_is_alive(pid: u32) -> bool {
274fn pid_is_alive(pid: u32) -> bool {
486 let pid = pid as libc::pid_t;
275 let pid = pid as libc::pid_t;
487 let result = unsafe { libc::kill(pid, 0) };
276 let result = unsafe { libc::kill(pid, 0) };
@@ -495,6 +284,12 @@ fn pid_is_alive(pid: u32) -> bool {
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()
498fn read_client_pid(stream: &UnixStream) -> Option<u32> {
293fn read_client_pid(stream: &UnixStream) -> Option<u32> {
499 let mut stream = stream.try_clone().ok()?;
294 let mut stream = stream.try_clone().ok()?;
500 let _ = stream.set_read_timeout(Some(Duration::from_millis(200)));
295 let _ = stream.set_read_timeout(Some(Duration::from_millis(200)));
@@ -505,7 +300,7 @@ fn read_client_pid(stream: &UnixStream) -> Option<u32> {
505 Ok(0) => break,
300 Ok(0) => break,
506 Ok(n) => {
301 Ok(n) => {
507 len += n;
302 len += n;
508− if buf[..len].contains(&b'\n') || len == buf.len() {
303+ if buf[..len].iter().any(|b| *b == b'\n') || len == buf.len() {
@@ -527,17 +322,14 @@ fn read_client_pid(stream: &UnixStream) -> Option<u32> {
530−#[cfg_attr(feature = "mock-vm", allow(dead_code))]
531fn spawn_manager_io(
325fn spawn_manager_io(
532 config: Arc<Mutex<InstanceConfig>>,
326 config: Arc<Mutex<InstanceConfig>>,
533− project_dir: PathBuf,
327+ instance_dir: PathBuf,
534− clients: ClientStreams,
535− latest_status: SharedStatus,
536 output_monitor: Arc<vm::OutputMonitor>,
328 output_monitor: Arc<vm::OutputMonitor>,
537 vm_output_fd: std::os::unix::io::OwnedFd,
329 vm_output_fd: std::os::unix::io::OwnedFd,
538 vm_input_fd: std::os::unix::io::OwnedFd,
330 vm_input_fd: std::os::unix::io::OwnedFd,
539) -> vm::IoContext {
331) -> vm::IoContext {
540− let log_path = project_dir.join(INSTANCE_DIR_NAME).join(VM_ROOT_LOG_NAME);
332+ let log_path = instance_dir.join(SERIAL_LOG_NAME);
541 let log_file = fs::OpenOptions::new()
333 let log_file = fs::OpenOptions::new()
542 .create(true)
334 .create(true)
543 .write(true)
335 .write(true)
@@ -546,15 +338,16 @@ fn spawn_manager_io(
547 .map(|file| Arc::new(Mutex::new(file)));
339 .map(|file| Arc::new(Mutex::new(file)));
341+ let instance_path = instance_dir.join(INSTANCE_FILENAME);
549 let config_for_output = config.clone();
342 let config_for_output = config.clone();
550 let log_for_output = log_file.clone();
343 let log_for_output = log_file.clone();
551 let mut line_buf = String::new();
344 let mut line_buf = String::new();
553 let on_output = move |bytes: &[u8]| {
346 let on_output = move |bytes: &[u8]| {
554− if let Some(log) = &log_for_output
347+ if let Some(log) = &log_for_output {
555− && let Ok(mut file) = log.lock()
348+ if let Ok(mut file) = log.lock() {
557− let _ = file.write_all(bytes);
349+ let _ = file.write_all(bytes);
560 let text = String::from_utf8_lossy(bytes);
353 let text = String::from_utf8_lossy(bytes);
@@ -567,27 +360,17 @@ fn spawn_manager_io(
568 line_buf.drain(..=pos);
361 line_buf.drain(..=pos);
570− let cleaned = line.trim_start_matches(['\r', ' ']);
363+ let cleaned = line.trim_start_matches(|c: char| c == '\r' || c == ' ');
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");
578− &format!("{STATUS_VM_ERROR_PREFIX} {failure}"),
582 if let Some(pos) = cleaned.find("VIBEBOX_IPV4=") {
364 if let Some(pos) = cleaned.find("VIBEBOX_IPV4=") {
583 let ip_raw = &cleaned[(pos + "VIBEBOX_IPV4=".len())..];
365 let ip_raw = &cleaned[(pos + "VIBEBOX_IPV4=".len())..];
584 let ip = extract_ipv4(ip_raw).unwrap_or_default();
366 let ip = extract_ipv4(ip_raw).unwrap_or_default();
585− if !ip.is_empty()
367+ if !ip.is_empty() {
586− && let Ok(mut cfg) = config_for_output.lock()
368+ if let Ok(mut cfg) = config_for_output.lock() {
587− && cfg.vm_ipv4.as_deref() != Some(ip.as_str())
369+ if cfg.vm_ipv4.as_deref() != Some(ip.as_str()) {
589− cfg.vm_ipv4 = Some(ip.clone());
370+ cfg.vm_ipv4 = Some(ip.clone());
590− let _ = write_instance_config(&project_dir, &cfg);
371+ let _ = write_instance_config(&instance_path, &cfg);
@@ -609,13 +392,51 @@ enum ManagerEvent {
609 VmExited(Option<String>),
392 VmExited(Option<String>),
398+ use std::{sync::mpsc, time::Duration};
401+ fn manager_powers_off_after_grace_when_no_refs() {
402+ let _temp = tempfile::Builder::new()
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)));
411+ let manager_thread = thread::spawn(move || {
412+ manager_event_loop(event_rx, vm_input_tx, 50).expect("event loop");
415+ event_tx.send(ManagerEvent::Inc(None)).unwrap();
416+ assert!(vm_rx.recv_timeout(Duration::from_millis(100)).is_err());
418+ event_tx.send(ManagerEvent::Dec(None)).unwrap();
420+ .recv_timeout(Duration::from_secs(2))
421+ .expect("poweroff");
423+ VmInput::Bytes(data) => {
424+ assert_eq!(data, b"systemctl poweroff\n");
426+ _ => panic!("unexpected vm input"),
428+ let _ = event_tx.send(ManagerEvent::VmExited(None));
429+ let _ = manager_thread.join();
612struct ManagerOptions {
433struct ManagerOptions {
434+ ensure_signed: bool,
613 detach: bool,
435 detach: bool,
614 prepare_vm: bool,
436 prepare_vm: bool,
617trait VmExecutor {
439trait VmExecutor {
618− #[allow(clippy::too_many_arguments)]
619 fn run_vm(
440 fn run_vm(
621 args: vm::VmArg,
442 args: vm::VmArg,
@@ -623,13 +444,10 @@ trait VmExecutor {
623 extra_shares: Vec<DirectoryShare>,
444 extra_shares: Vec<DirectoryShare>,
624 config: Arc<Mutex<InstanceConfig>>,
445 config: Arc<Mutex<InstanceConfig>>,
625 instance_dir: PathBuf,
446 instance_dir: PathBuf,
626− clients: ClientStreams,
627− latest_status: SharedStatus,
628 vm_input_tx: Arc<Mutex<Option<mpsc::Sender<VmInput>>>>,
447 vm_input_tx: Arc<Mutex<Option<mpsc::Sender<VmInput>>>>,
629− ) -> Result<()>;
448+ ) -> Result<(), Box<dyn std::error::Error>>;
632−#[cfg_attr(feature = "mock-vm", allow(dead_code))]
633struct RealVmExecutor;
451struct RealVmExecutor;
635impl VmExecutor for RealVmExecutor {
453impl VmExecutor for RealVmExecutor {
@@ -639,22 +457,15 @@ impl VmExecutor for RealVmExecutor {
639 extra_login_actions: Vec<LoginAction>,
457 extra_login_actions: Vec<LoginAction>,
640 extra_shares: Vec<DirectoryShare>,
458 extra_shares: Vec<DirectoryShare>,
641 config: Arc<Mutex<InstanceConfig>>,
459 config: Arc<Mutex<InstanceConfig>>,
642− project_dir: PathBuf,
460+ instance_dir: PathBuf,
643− clients: ClientStreams,
644− latest_status: SharedStatus,
645 vm_input_tx: Arc<Mutex<Option<mpsc::Sender<VmInput>>>>,
461 vm_input_tx: Arc<Mutex<Option<mpsc::Sender<VmInput>>>>,
646− ) -> Result<()> {
462+ ) -> Result<(), Box<dyn std::error::Error>> {
647− let status_callback = |status: &str| {
648− broadcast_status(&clients, &latest_status, status);
650− vm::run_with_args_and_extras(
463+ let result = vm::run_with_args_and_extras(
652 |output_monitor, vm_output_fd, vm_input_fd| {
465 |output_monitor, vm_output_fd, vm_input_fd| {
653 let io_ctx = spawn_manager_io(
466 let io_ctx = spawn_manager_io(
654 config.clone(),
467 config.clone(),
655− project_dir.clone(),
468+ instance_dir.clone(),
657− latest_status.clone(),
658 output_monitor,
469 output_monitor,
659 vm_output_fd,
470 vm_output_fd,
660 vm_input_fd,
471 vm_input_fd,
@@ -664,60 +475,35 @@ impl VmExecutor for RealVmExecutor {
665 extra_login_actions,
476 extra_login_actions,
666 extra_shares,
477 extra_shares,
667− Some(&status_callback),
672−#[cfg(feature = "mock-vm")]
673−struct MockVmExecutor;
675−#[cfg(feature = "mock-vm")]
676−impl VmExecutor for MockVmExecutor {
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>>>>,
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() {
693− VmInput::Shutdown => break,
694− VmInput::Bytes(bytes) => {
695− let text = String::from_utf8_lossy(&bytes);
696− if text.contains("systemctl poweroff") {
702− tracing::info!("mock vm executor exiting");
707fn run_manager_with(
483fn run_manager_with(
708 project_root: &Path,
484 project_root: &Path,
709− mut args: vm::VmArg,
485+ args: vm::VmArg,
710 auto_shutdown_ms: u64,
486 auto_shutdown_ms: u64,
711 executor: &dyn VmExecutor,
487 executor: &dyn VmExecutor,
712 options: ManagerOptions,
488 options: ManagerOptions,
713−) -> Result<()> {
489+) -> Result<(), Box<dyn std::error::Error>> {
490+ if options.ensure_signed {
491+ let _had_skip = env::var("VIBEBOX_SKIP_CODESIGN").ok();
493+ env::remove_var("VIBEBOX_SKIP_CODESIGN");
495+ vm::ensure_signed();
497+ env::set_var("VIBEBOX_SKIP_CODESIGN", "1");
714 if options.detach {
500 if options.detach {
715 detach_from_terminal();
501 detach_from_terminal();
718 let project_name = project_root
504 let project_name = project_root
719 .file_name()
505 .file_name()
720− .ok_or_else(|| anyhow!("Project directory has no name"))?
506+ .ok_or("Project directory has no name")?
721 .to_string_lossy()
507 .to_string_lossy()
722 .into_owned();
508 .into_owned();
723 let instance_dir = ensure_instance_dir(project_root)?;
509 let instance_dir = ensure_instance_dir(project_root)?;
@@ -725,35 +511,21 @@ fn run_manager_with(
725 let _ = ensure_ssh_keypair(&instance_dir)?;
511 let _ = ensure_ssh_keypair(&instance_dir)?;
728− let mut config = load_or_create_instance_config(project_root)?;
514+ let mut config = load_or_create_instance_config(&instance_dir)?;
729 if config.vm_ipv4.is_some() {
515 if config.vm_ipv4.is_some() {
730 config.vm_ipv4 = None;
516 config.vm_ipv4 = None;
731− write_instance_config(project_root, &config)?;
517+ write_instance_config(&instance_dir.join(INSTANCE_FILENAME), &config)?;
733 let config = Arc::new(Mutex::new(config));
519 let config = Arc::new(Mutex::new(config));
734− let ssh_user = config
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);
741− let (args, home_links_script) = prepare_mounts_and_links(args, &ssh_user);
743− let project_guest_dir = format!("{PROJECT_GUEST_BASE}/{project_name}");
744 let ssh_guest_dir = format!("/root/{}", GLOBAL_DIR_NAME);
521 let ssh_guest_dir = format!("/root/{}", GLOBAL_DIR_NAME);
745− let extra_shares = vec![
522+ let extra_shares = vec![DirectoryShare::new(
523+ instance_dir.clone(),
746− DirectoryShare::new(instance_dir.clone(), ssh_guest_dir.clone().into(), true)
524+ ssh_guest_dir.clone().into(),
747− .map_err(|err| anyhow!(err.to_string()))?,
525+ true,
749− let extra_login_actions = build_ssh_login_actions(
527+ let extra_login_actions =
753− ssh_guest_dir.as_str(),
528+ build_ssh_login_actions(&config, &project_name, ssh_guest_dir.as_str(), "ssh_key");
758 let socket_path = instance_dir.join(VM_MANAGER_SOCKET_NAME);
530 let socket_path = instance_dir.join(VM_MANAGER_SOCKET_NAME);
759 if let Ok(stream) = UnixStream::connect(&socket_path) {
531 if let Ok(stream) = UnixStream::connect(&socket_path) {
@@ -768,43 +540,17 @@ fn run_manager_with(
768 let _ = fs::set_permissions(&socket_path, fs::Permissions::from_mode(0o600));
540 let _ = fs::set_permissions(&socket_path, fs::Permissions::from_mode(0o600));
769 tracing::info!(path = %socket_path.display(), "vm manager socket bound");
541 tracing::info!(path = %socket_path.display(), "vm manager socket bound");
771− let clients: ClientStreams = Arc::new(Mutex::new(Vec::new()));
772− let latest_status: SharedStatus = Arc::new(Mutex::new(String::new()));
773 let (event_tx, event_rx) = mpsc::channel::<ManagerEvent>();
543 let (event_tx, event_rx) = mpsc::channel::<ManagerEvent>();
774 let event_tx_accept = event_tx.clone();
544 let event_tx_accept = event_tx.clone();
775− let clients_accept = clients.clone();
776− let latest_status_accept = latest_status.clone();
777 thread::spawn(move || {
545 thread::spawn(move || {
778 for stream in listener.incoming() {
546 for stream in listener.incoming() {
779 match stream {
547 match stream {
780 Ok(stream) => {
548 Ok(stream) => {
781− let mut client_fd: Option<std::os::fd::RawFd> = None;
782− let latest_status_snapshot = latest_status_accept
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()
795− let _ = send_status_line(last, status);
799 let event_tx_conn = event_tx_accept.clone();
549 let event_tx_conn = event_tx_accept.clone();
800− let clients_conn = clients_accept.clone();
801 thread::spawn(move || {
550 thread::spawn(move || {
802 let pid = read_client_pid(&stream);
551 let pid = read_client_pid(&stream);
803 let _ = event_tx_conn.send(ManagerEvent::Inc(pid));
552 let _ = event_tx_conn.send(ManagerEvent::Inc(pid));
804 wait_for_disconnect(stream);
553 wait_for_disconnect(stream);
805− if let Some(fd) = client_fd {
806− remove_client(&clients_conn, fd);
808 let _ = event_tx_conn.send(ManagerEvent::Dec(pid));
554 let _ = event_tx_conn.send(ManagerEvent::Dec(pid));
@@ -824,59 +570,43 @@ fn run_manager_with(
824 extra_login_actions,
570 extra_login_actions,
825 extra_shares,
571 extra_shares,
826 config.clone(),
572 config.clone(),
827− project_root.to_path_buf(),
573+ instance_dir.clone(),
829− latest_status.clone(),
830 vm_input_tx.clone(),
574 vm_input_tx.clone(),
832 tracing::info!("vm manager vm run completed");
576 tracing::info!("vm manager vm run completed");
833 let vm_err = vm_result.err().map(|e| e.to_string());
577 let vm_err = vm_result.err().map(|e| e.to_string());
834− if let Some(err) = &vm_err {
838− &format!("{STATUS_VM_ERROR_PREFIX} {err}"),
841 let _ = event_tx.send(ManagerEvent::VmExited(vm_err.clone()));
578 let _ = event_tx.send(ManagerEvent::VmExited(vm_err.clone()));
842− let event_loop_result = event_loop_handle
579+ let event_loop_result: Result<(), String> = event_loop_handle
844− .unwrap_or_else(|_| Err(Error::msg("vm manager event loop panicked")))
581+ .unwrap_or_else(|_| Err("vm manager event loop panicked".into()))
845 .map_err(|err| err.to_string());
582 .map_err(|err| err.to_string());
846 let _ = fs::remove_file(&socket_path);
583 let _ = fs::remove_file(&socket_path);
847 if let Err(err) = &event_loop_result {
584 if let Err(err) = &event_loop_result {
848 tracing::error!(error = %err, "vm manager exiting due to event loop error");
585 tracing::error!(error = %err, "vm manager exiting due to event loop error");
849− bail!(err.to_string());
586+ return Err(err.to_string().into());
851 if let Some(err) = vm_err {
588 if let Some(err) = vm_err {
852 tracing::error!(error = %err, "vm manager exiting due to vm error");
589 tracing::error!(error = %err, "vm manager exiting due to vm error");
853− bail!(err);
590+ return Err(err.into());
855 tracing::info!("vm manager exiting");
592 tracing::info!("vm manager exiting");
856− event_loop_result.map_err(Error::msg)
593+ Ok(event_loop_result?)
859fn manager_event_loop(
596fn manager_event_loop(
860 event_rx: mpsc::Receiver<ManagerEvent>,
597 event_rx: mpsc::Receiver<ManagerEvent>,
861 vm_input_tx: Arc<Mutex<Option<mpsc::Sender<VmInput>>>>,
598 vm_input_tx: Arc<Mutex<Option<mpsc::Sender<VmInput>>>>,
862 auto_shutdown_ms: u64,
599 auto_shutdown_ms: u64,
863−) -> Result<()> {
600+) -> Result<(), String> {
864 let mut ref_count: usize = 0;
601 let mut ref_count: usize = 0;
865 let mut shutdown_deadline: Option<Instant> = None;
602 let mut shutdown_deadline: Option<Instant> = None;
866 let mut shutdown_sent = false;
603 let mut shutdown_sent = false;
867− let mut hard_deadline: Option<Instant> = None;
868 let grace = Duration::from_millis(auto_shutdown_ms.max(1));
604 let grace = Duration::from_millis(auto_shutdown_ms.max(1));
869− let hard_timeout = Duration::from_millis(HARD_SHUTDOWN_TIMEOUT_MS);
872− let timeout = match (shutdown_deadline, hard_deadline) {
607+ let timeout = match shutdown_deadline {
873− (Some(shutdown), Some(hard)) => {
874− let next = if shutdown <= hard { shutdown } else { hard };
875− next.saturating_duration_since(Instant::now())
877− (Some(shutdown), None) => shutdown.saturating_duration_since(Instant::now()),
608+ Some(deadline) => deadline.saturating_duration_since(Instant::now()),
878− (None, Some(hard)) => hard.saturating_duration_since(Instant::now()),
879− (None, None) => Duration::from_secs(1),
609+ None => Duration::from_secs(1),
882 match event_rx.recv_timeout(timeout) {
612 match event_rx.recv_timeout(timeout) {
@@ -890,10 +620,11 @@ fn manager_event_loop(
891 shutdown_deadline = None;
621 shutdown_deadline = None;
892 shutdown_sent = false;
622 shutdown_sent = false;
893− hard_deadline = None;
895 Ok(ManagerEvent::Dec(pid)) => {
624 Ok(ManagerEvent::Dec(pid)) => {
896− ref_count = ref_count.saturating_sub(1);
626+ ref_count -= 1;
897 tracing::info!(
628 tracing::info!(
898 ref_count,
629 ref_count,
899 pid = pid.unwrap_or(0),
630 pid = pid.unwrap_or(0),
@@ -912,52 +643,15 @@ fn manager_event_loop(
914 Err(mpsc::RecvTimeoutError::Timeout) => {
645 Err(mpsc::RecvTimeoutError::Timeout) => {
915− if let Some(deadline) = shutdown_deadline
646+ if let Some(deadline) = shutdown_deadline {
916− && Instant::now() >= deadline
647+ if Instant::now() >= deadline && !shutdown_sent {
919− if hard_deadline.is_none() {
920− hard_deadline = Some(Instant::now() + hard_timeout);
922− let mut sent = false;
923− if let Some(tx) = vm_input_tx.lock().unwrap().clone() {
648+ if let Some(tx) = vm_input_tx.lock().unwrap().clone() {
925− .send(VmInput::Bytes(b"systemctl poweroff\n".to_vec()))
649+ let _ = tx.send(VmInput::Bytes(b"systemctl poweroff\n".to_vec()));
930− tracing::warn!("shutdown command failed to send");
933− tracing::warn!("shutdown command deferred; vm input not ready");
936 tracing::info!("shutdown command sent");
651 tracing::info!("shutdown command sent");
937 shutdown_sent = true;
652 shutdown_sent = true;
938 shutdown_deadline = None;
653 shutdown_deadline = None;
939− hard_deadline = Some(Instant::now() + hard_timeout);
942− Some(Instant::now() + Duration::from_millis(SHUTDOWN_RETRY_MS));
946− && let Some(deadline) = hard_deadline
947− && Instant::now() >= deadline
951− timeout_ms = HARD_SHUTDOWN_TIMEOUT_MS,
952− "force exiting: VM did not stop after shutdown timeout"
956− timeout_ms = HARD_SHUTDOWN_TIMEOUT_MS,
957− "force exiting: VM input not ready after shutdown timeout"
960− force_exit("vm manager forced exit");
963 Err(mpsc::RecvTimeoutError::Disconnected) => break,
657 Err(mpsc::RecvTimeoutError::Disconnected) => break,
@@ -966,112 +660,3 @@ fn manager_event_loop(
973− use std::{fs, sync::mpsc, thread, time::Duration};
976− fn manager_powers_off_after_grace_when_no_refs() {
977− let _temp = tempfile::Builder::new()
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)));
986− let manager_thread = thread::spawn(move || {
987− manager_event_loop(event_rx, vm_input_tx, 50).expect("event loop");
990− event_tx.send(ManagerEvent::Inc(None)).unwrap();
991− assert!(vm_rx.recv_timeout(Duration::from_millis(100)).is_err());
993− event_tx.send(ManagerEvent::Dec(None)).unwrap();
995− .recv_timeout(Duration::from_secs(2))
996− .expect("poweroff");
998− VmInput::Bytes(data) => {
999− assert_eq!(data, b"systemctl poweroff\n");
1001− _ => panic!("unexpected vm input"),
1003− let _ = event_tx.send(ManagerEvent::VmExited(None));
1004− let _ = manager_thread.join();
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));
1012− let manager_thread = thread::spawn(move || {
1013− let _ = manager_event_loop(event_rx, vm_input_tx, 10);
1016− event_tx.send(ManagerEvent::Inc(None)).unwrap();
1017− event_tx.send(ManagerEvent::Dec(None)).unwrap();
1019− let join_result = manager_thread.join();
1021− join_result.is_err(),
1022− "expected manager to force-exit when vm input never becomes ready"
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();
1033− let manager_thread = thread::spawn(move || {
1034− manager_event_loop(event_rx, vm_input_for_thread, 10).expect("event loop");
1037− event_tx.send(ManagerEvent::Inc(None)).unwrap();
1038− event_tx.send(ManagerEvent::Dec(None)).unwrap();
1040− thread::sleep(Duration::from_millis(100));
1041− *vm_input_tx.lock().unwrap() = Some(vm_tx);
1044− .recv_timeout(Duration::from_secs(2))
1045− .expect("poweroff");
1047− VmInput::Bytes(data) => {
1048− assert_eq!(data, b"systemctl poweroff\n");
1050− _ => panic!("unexpected vm input"),
1052− let _ = event_tx.send(ManagerEvent::VmExited(None));
1053− let _ = manager_thread.join();
1057− fn lock_is_not_stale_when_owner_pid_is_alive() {
1058− let temp = tempfile::Builder::new()
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));
1068− fn lock_is_stale_when_owner_pid_is_missing() {
1069− let temp = tempfile::Builder::new()
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));