61d3105 · vibebox · git.iko.soy

git.iko.soy/vibebox

fix: fixed the ssh again

commit61d3105832f6d0587a869ae7b533a997b301b659 authorrobcholz <84130577+robcholz@users.noreply.github.com> dateFri 6 Feb 2026, 23:05 (8 months ago) parenta49606e

4 files changed+18−9

compare with main

unifiedsplit

docs/implementations.md+1−1 src/instance.rs+5−4 src/ssh.sh+10−3 src/vm.rs+2−1

docs/implementations.md+1−1

@@ -34,7 +34,7 @@ Example:

3434Each session has the following members:

3535

3636- `id`: session id

37−- `directory`: project directory (absolute)

37+- `directory`: project directory (absolute), if directory changes name, this should also change.

3838- `last_active`: utc time indicating the last active time for the session

3939

4040Sessions info are stored in `~/.vibebox/sessions.toml`

src/instance.rs+5−4

@@ -17,7 +17,7 @@ use std::sync::mpsc::Sender;

1717use uuid::Uuid;

1818

1919use crate::{

20− session_manager::INSTANCE_DIR_NAME,

20+ session_manager::{GLOBAL_DIR_NAME, INSTANCE_DIR_NAME},

2121 tui::{self, AppState},

2222 vm::{self, DirectoryShare, LoginAction, VmInput},

2323};

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

2525const INSTANCE_TOML: &str = "instance.toml";

2626const SSH_KEY_NAME: &str = "ssh_key";

2727const SERIAL_LOG_NAME: &str = "serial.log";

28−const SSH_GUEST_DIR: &str = "/root/.vibebox";

2928const DEFAULT_SSH_USER: &str = "vibecoder";

3029const SSH_CONNECT_RETRIES: usize = 30;

3130const SSH_CONNECT_DELAY_MS: u64 = 500;

@@ -66,14 +65,16 @@ pub fn run_with_ssh(

6665 }

6766 let config = Arc::new(Mutex::new(config));

6867

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

69+

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

7071 instance_dir.clone(),

71− SSH_GUEST_DIR.into(),

72+ ssh_guest_dir.clone().into(),

7273 true,

7374 )?];

7475

7576 let extra_login_actions =

76− build_ssh_login_actions(&config, &project_name, SSH_GUEST_DIR, SSH_KEY_NAME);

77+ build_ssh_login_actions(&config, &project_name, ssh_guest_dir.as_str(), SSH_KEY_NAME);

7778

7879 vm::run_with_args_and_extras(

7980 args,

src/ssh.sh+10−3

@@ -78,10 +78,13 @@ fi

7878chown -h "${SSH_USER}:${SSH_USER}" "${USER_HOME}/.codex" "${USER_HOME}/.claude" 2>/dev/null || true

7979

8080# Install Mise

81−curl https://mise.run | sh

81+MISE_BIN="${USER_HOME}/.local/bin/mise"

82+if [ ! -x "$MISE_BIN" ] && ! command -v mise >/dev/null 2>&1; then

83+ curl https://mise.run | HOME="$USER_HOME" sh

84+fi

8285echo 'eval "$(~/.local/bin/mise activate bash)"' >> "${USER_HOME}/.bashrc"

8386

84−export PATH="${USER_HOME}/.local/bin:$PATH"

87+export PATH="${USER_HOME}/.local/bin:/usr/local/bin:$PATH"

8588

8689mkdir -p "${USER_HOME}/.config/mise"

8790

@@ -100,7 +103,11 @@ cat > "${USER_HOME}/.config/mise/config.toml" <<MISE

100103MISE

101104

102105touch "${USER_HOME}/.config/mise/mise.lock"

103−mise install

106+if [ -x "$MISE_BIN" ]; then

107+ HOME="$USER_HOME" "$MISE_BIN" install

108+else

109+ HOME="$USER_HOME" mise install

110+fi

104111

105112# 3) start ssh (don't swallow failures)

106113# If ssh is already active, don't force start/restart.

src/vm.rs+2−1

@@ -1,3 +1,4 @@

1+use crate::session_manager::INSTANCE_DIR_NAME;

12use std::{

23 env,

34 ffi::OsString,

@@ -148,7 +149,7 @@ where

148149 let cache_dir = cache_home.join("vibe");

149150 let guest_mise_cache = cache_dir.join(".guest-mise-cache");

150151

151− let instance_dir = project_root.join(".vibe");

152+ let instance_dir = project_root.join(INSTANCE_DIR_NAME);

152153

153154 let basename_compressed = DEBIAN_COMPRESSED_DISK_URL.rsplit('/').next().unwrap();

154155 let base_compressed = cache_dir.join(basename_compressed);