5659f2a · vibebox · git.iko.soy

git.iko.soy/vibebox

fix: now project dir correctly mounted

commit5659f2a538bc87f00b903514533a0eb2fa8b368e authorrobcholz <84130577+robcholz@users.noreply.github.com> dateSun 8 Feb 2026, 02:25 (8 months ago) parent9cf3335

5 files changed+55−15

compare with main

unifiedsplit

src/explain.rs+1−1 src/instance.rs+2 src/ssh.sh+17−1 src/vm.rs+3−10 src/vm_manager.rs+32−3

src/explain.rs+1−1

@@ -46,7 +46,7 @@ fn default_mounts(cwd: &Path) -> Result<Vec<tui::MountListRow>, Box<dyn Error +

4646 .file_name()

4747 .and_then(|name| name.to_str())

4848 .unwrap_or("project");

49− let project_guest = format!("/root/{project_name}");

49+ let project_guest = format!("~/{project_name}");

5050 let project_host = display_path(cwd);

5151 let mut rows = vec![tui::MountListRow {

5252 host: project_host,

src/instance.rs+2

@@ -394,6 +394,7 @@ fn ssh_port_open(ip: &str) -> bool {

394394pub(crate) fn build_ssh_login_actions(

395395 config: &Arc<Mutex<InstanceConfig>>,

396396 project_name: &str,

397+ project_guest_dir: &str,

397398 guest_dir: &str,

398399 key_name: &str,

399400 home_links_script: &str,

@@ -409,6 +410,7 @@ pub(crate) fn build_ssh_login_actions(

409410 .replace("__SSH_USER__", &ssh_user)

410411 .replace("__SUDO_PASSWORD__", &sudo_password)

411412 .replace("__PROJECT_NAME__", project_name)

413+ .replace("__PROJECT_GUEST_DIR__", project_guest_dir)

412414 .replace("__KEY_PATH__", &key_path)

413415 .replace("__VIBEBOX_SHELL_SCRIPT__", &commands::render_shell_script())

414416 .replace("__VIBEBOX_HOME_LINKS__", home_links_script);

src/ssh.sh+17−1

@@ -3,6 +3,7 @@ set -eu

44SSH_USER="__SSH_USER__"

55PROJECT_NAME="__PROJECT_NAME__"

6+PROJECT_GUEST_DIR="__PROJECT_GUEST_DIR__"

67KEY_PATH="__KEY_PATH__"

89diag() { echo "[vibebox][diag] $*" >&2; }

@@ -49,7 +50,7 @@ dump_diag() {

4950}

5051

5152# 1) tmpfs mount

52−TARGET="/root/${PROJECT_NAME}/.vibebox"

53+TARGET="${PROJECT_GUEST_DIR}/.vibebox"

5354if [ -d "$TARGET" ] && ! mountpoint -q "$TARGET"; then

5455 mount -t tmpfs tmpfs "$TARGET"

5556fi

@@ -78,6 +79,21 @@ __VIBEBOX_SHELL_SCRIPT__

7879VIBEBOX_SHELL_EOF

7980chmod 644 /etc/profile.d/vibebox.sh

8081

82+# Auto-cd into project for interactive shells

83+cat > /etc/profile.d/vibebox-project.sh <<'VIBEBOX_PROJECT_EOF'

84+case "$-" in

85+ *i*)

86+ project_home="${HOME}/__PROJECT_NAME__"

87+ if [ "$USER" = "__SSH_USER__" ] && [ -d "$project_home" ]; then

88+ cd "$project_home"

89+ elif [ "$USER" = "__SSH_USER__" ] && [ -d "__PROJECT_GUEST_DIR__" ]; then

90+ cd "__PROJECT_GUEST_DIR__"

91+ fi

92+ ;;

93+esac

94+VIBEBOX_PROJECT_EOF

95+chmod 644 /etc/profile.d/vibebox-project.sh

96+

8197if ! grep -q "vibebox-aliases" "${USER_HOME}/.bashrc" 2>/dev/null; then

8298 {

8399 echo ""

src/vm.rs+3−10

@@ -32,6 +32,7 @@ const DEBIAN_COMPRESSED_DISK_URL: &str = "https://cloud.debian.org/images/cloud/

3232const DEBIAN_COMPRESSED_SHA: &str = "6ab9be9e6834adc975268367f2f0235251671184345c34ee13031749fdfbf66fe4c3aafd949a2d98550426090e9ac645e79009c51eb0eefc984c15786570bb38";

3333const DEBIAN_COMPRESSED_SIZE_BYTES: u64 = 280901576;

3434const SHARED_DIRECTORIES_TAG: &str = "shared";

35+pub const PROJECT_GUEST_BASE: &str = "/usr/local/vibebox-mounts";

3536

3637const BYTES_PER_MB: u64 = 1024 * 1024;

3738const DEFAULT_CPU_COUNT: usize = 2;

@@ -247,7 +248,8 @@ where

247248 let mut directory_shares = Vec::new();

248249

249250 if !args.no_default_mounts {

250− login_actions.push(Send(format!("cd {project_name}")));

251+ let project_guest_dir = PathBuf::from(PROJECT_GUEST_BASE).join(project_name);

252+ login_actions.push(Send(format!("cd {}", project_guest_dir.display())));

251253

252254 // 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.

253255 // I couldn't find an alternative way to do this --- the MacOS sandbox doesn't apply to the Apple Virtualization system

@@ -255,15 +257,6 @@ where

255257 login_actions.push(Send(r"mount -t tmpfs tmpfs .git/".into()));

256258 }

257259

258− directory_shares.push(

259− DirectoryShare::new(

260− project_root,

261− PathBuf::from("/root/").join(project_name),

262− false,

263− )

264− .expect("Project directory must exist"),

265− );

266−

267260 directory_shares.push(mise_directory_share);

268261 }

269262

src/vm_manager.rs+32−3

@@ -25,7 +25,7 @@ use crate::{

2525 session_manager::{

2626 GLOBAL_DIR_NAME, INSTANCE_FILENAME, VM_MANAGER_PID_NAME, VM_MANAGER_SOCKET_NAME,

2727 },

28− vm::{self, DirectoryShare, LoginAction, VmInput},

28+ vm::{self, DirectoryShare, LoginAction, PROJECT_GUEST_BASE, VmInput},

2929};

3030

3131const VM_MANAGER_LOCK_NAME: &str = "vm.lock";

@@ -200,6 +200,30 @@ fn cleanup_stale_manager(instance_dir: &Path) {

200200 let _ = fs::remove_file(&pid_path);

201201}

202202

203+fn inject_project_mount(

204+ mounts: &mut Vec<String>,

205+ project_root: &Path,

206+ ssh_user: &str,

207+ project_name: &str,

208+) {

209+ let guest_tilde = format!("~/{project_name}");

210+ let guest_home = format!("/home/{ssh_user}/{project_name}");

211+ let guest_base = format!("{PROJECT_GUEST_BASE}/{project_name}");

212+ let already_mapped = mounts.iter().any(|spec| {

213+ let parts: Vec<&str> = spec.split(':').collect();

214+ if parts.len() < 2 {

215+ return false;

216+ }

217+ let guest = parts[1];

218+ guest == guest_tilde || guest == guest_home || guest == guest_base

219+ });

220+ if already_mapped {

221+ return;

222+ }

223+ let host = project_root.display();

224+ mounts.insert(0, format!("{host}:{guest_tilde}:read-write"));

225+}

226+

203227fn is_socket_path(path: &Path) -> bool {

204228 fs::metadata(path)

205229 .map(|meta| meta.file_type().is_socket())

@@ -252,7 +276,7 @@ fn rewrite_mount_spec(spec: &str, ssh_user: &str) -> (String, Option<HomeLink>)

252276 return (spec.to_string(), None);

253277 }

254278

255− let root_base = "/usr/local/vibebox-mounts";

279+ let root_base = PROJECT_GUEST_BASE;

256280 let root_path = if rel.is_empty() {

257281 root_base.to_string()

258282 } else {

@@ -563,7 +587,7 @@ impl VmExecutor for RealVmExecutor {

563587

564588fn run_manager_with(

565589 project_root: &Path,

566− args: vm::VmArg,

590+ mut args: vm::VmArg,

567591 auto_shutdown_ms: u64,

568592 executor: &dyn VmExecutor,

569593 options: ManagerOptions,

@@ -602,8 +626,12 @@ fn run_manager_with(

602626 .lock()

603627 .map(|cfg| cfg.ssh_user_display())

604628 .unwrap_or_else(|_| DEFAULT_SSH_USER.to_string());

629+ if !args.no_default_mounts {

630+ inject_project_mount(&mut args.mounts, project_root, &ssh_user, &project_name);

631+ }

605632 let (args, home_links_script) = prepare_mounts_and_links(args, &ssh_user);

606633

634+ let project_guest_dir = format!("{PROJECT_GUEST_BASE}/{project_name}");

607635 let ssh_guest_dir = format!("/root/{}", GLOBAL_DIR_NAME);

608636 let extra_shares = vec![DirectoryShare::new(

609637 instance_dir.clone(),

@@ -613,6 +641,7 @@ fn run_manager_with(

613641 let extra_login_actions = build_ssh_login_actions(

614642 &config,

615643 &project_name,

644+ &project_guest_dir,

616645 ssh_guest_dir.as_str(),

617646 "ssh_key",

618647 &home_links_script,