15a5199 · vibebox · git.iko.soy

docs/implementations.md−1

compare with main

unifiedsplit

@@ -68,7 +68,6 @@ In host cli:

68

69In vibebox:

70

71−- use `:new` to prompt user to delete and create a session.

72- use `:exit` to exit vibebox.

71- use `:exit` to exit vibebox.

73

72

74### (Shows all the mounts/network/visibility)

73### (Shows all the mounts/network/visibility)

docs/tasks.md+1−1

@@ -41,7 +41,7 @@

414. [x] use vm.lock to ensure process concurrency safety.

425. [x] wire up SessionManager.

436. [x] VM should be separated by a per-session VM daemon process (only accepts if to shut down vm and itself).

44−7. [ ] setup vibebox commands

44+7. [x] setup vibebox commands

458. [ ] setup cli commands.

469. [ ] fix ui overlap.

4710. [ ] intensive integration test.

src/bin/vibebox-cli.rs+4−3

@@ -9,9 +9,9 @@ use color_eyre::Result;

9use tracing_subscriber::EnvFilter;

10

11use vibebox::tui::{AppState, VmInfo};

12−use vibebox::{SessionManager, config, instance, tui, vm, vm_manager};

12+use vibebox::{SessionManager, commands, config, instance, tui, vm, vm_manager};

13

14−const DEFAULT_AUTO_SHUTDOWN_MS: u64 = 3000;

14+const DEFAULT_AUTO_SHUTDOWN_MS: u64 = 30000;

15

16fn main() -> Result<()> {

17 init_tracing();

@@ -65,7 +65,8 @@ fn main() -> Result<()> {

65 } else {

66 tracing::warn!("failed to initialize session manager");

67 }

68+ let commands = commands::build_commands();

68− let app = Arc::new(Mutex::new(AppState::new(cwd.clone(), vm_info)));

69+ let app = Arc::new(Mutex::new(AppState::new(cwd.clone(), vm_info, commands)));

69

70

70 {

71 {

71 let mut locked = app.lock().expect("app state poisoned");

72 let mut locked = app.lock().expect("app state poisoned");

src/commands.rsnew file+111

@@ -0,0 +1,111 @@

1+use std::collections::HashMap;

2+use std::sync::{Arc, Mutex};

3+

4+use crate::tui::{AppState, VibeboxCommands};

5+use crate::vm::IoControl;

6+

7+#[derive(Clone, Copy)]

8+enum CommandKind {

9+ Help,

10+ Exit,

11+}

12+

13+struct CommandSpec {

14+ name: &'static str,

15+ description: &'static str,

16+ kind: CommandKind,

17+ shell_alias: Option<&'static str>,

18+}

19+

20+const COMMAND_SPECS: &[CommandSpec] = &[

21+ CommandSpec {

22+ name: ":help",

23+ description: "Show Vibebox commands.",

24+ kind: CommandKind::Help,

25+ shell_alias: Some("vibebox_help"),

26+ },

27+ CommandSpec {

28+ name: ":exit",

29+ description: "Exit Vibebox.",

30+ kind: CommandKind::Exit,

31+ shell_alias: Some("exit"),

32+ },

33+];

34+

35+pub struct CommandHandlers {

36+ handlers: HashMap<String, Box<dyn Fn() + Send + Sync>>,

37+}

38+

39+impl CommandHandlers {

40+ fn new() -> Self {

41+ Self {

42+ handlers: HashMap::new(),

43+ }

44+ }

45+

46+ fn register<F>(&mut self, name: &str, handler: F)

47+ where

48+ F: Fn() + Send + Sync + 'static,

49+ {

50+ self.handlers.insert(name.to_string(), Box::new(handler));

51+ }

52+

53+ pub fn handle(&self, line: &str) -> bool {

54+ if let Some(handler) = self.handlers.get(line) {

55+ handler();

56+ true

57+ } else {

58+ false

59+ }

60+ }

61+}

62+

63+pub fn build_commands() -> VibeboxCommands {

64+ let mut commands = VibeboxCommands::new_empty();

65+ for spec in COMMAND_SPECS {

66+ commands.add_command(spec.name, spec.description);

67+ }

68+ commands

69+}

70+

71+pub fn render_shell_script() -> String {

72+ let mut lines = Vec::new();

73+ lines.push("vibebox_help() {".to_string());

74+ lines.push(" cat <<'VIBEBOX_HELP'".to_string());

75+ lines.push("Vibebox Commands".to_string());

76+ for spec in COMMAND_SPECS {

77+ lines.push(format!("{} {}", spec.name, spec.description));

78+ }

79+ lines.push("VIBEBOX_HELP".to_string());

80+ lines.push("}".to_string());

81+ for spec in COMMAND_SPECS {

82+ if let Some(alias) = spec.shell_alias {

83+ lines.push(format!("alias {}='{}'", spec.name, alias));

84+ }

85+ }

86+ lines.join("\n")

87+}

88+

89+pub fn build_handlers(app: Arc<Mutex<AppState>>, io_control: Arc<IoControl>) -> CommandHandlers {

90+ let mut handlers = CommandHandlers::new();

91+ for spec in COMMAND_SPECS {

92+ match spec.kind {

93+ CommandKind::Help => {

94+ let app = app.clone();

95+ handlers.register(spec.name, move || {

96+ if let Ok(mut locked) = app.lock() {

97+ let _ = crate::tui::render_commands_component(&mut locked);

98+ }

99+ });

100+ }

101+ CommandKind::Exit => {

102+ let io_control = io_control.clone();

103+ handlers.register(spec.name, move || {

104+ io_control.request_terminal_restore();

105+ std::process::exit(0);

106+ });

107+ }

108+ }

109+ }

110+ handlers

111+}

src/instance.rs+6−14

@@ -19,8 +19,9 @@ use time::{OffsetDateTime, format_description::well_known::Rfc3339};

19use uuid::Uuid;

20

21use crate::{

22+ commands,

22 session_manager::{INSTANCE_DIR_NAME, INSTANCE_TOML_FILENAME},

23 session_manager::{INSTANCE_DIR_NAME, INSTANCE_TOML_FILENAME},

23− tui::{self, AppState},

24+ tui::AppState,

24 vm::{self, LoginAction, VmInput},

25 vm::{self, LoginAction, VmInput},

25};

26};

26

27

@@ -344,7 +345,8 @@ pub(crate) fn build_ssh_login_actions(

344 .replace("__SSH_USER__", &ssh_user)

345 .replace("__SSH_USER__", &ssh_user)

345 .replace("__SUDO_PASSWORD__", &sudo_password)

346 .replace("__SUDO_PASSWORD__", &sudo_password)

346 .replace("__PROJECT_NAME__", project_name)

347 .replace("__PROJECT_NAME__", project_name)

347− .replace("__KEY_PATH__", &key_path);

348+ .replace("__KEY_PATH__", &key_path)

349+ .replace("__VIBEBOX_SHELL_SCRIPT__", &commands::render_shell_script());

348 let setup = vm::script_command_from_content("ssh_setup", &setup_script)

350 let setup = vm::script_command_from_content("ssh_setup", &setup_script)

349 .expect("ssh setup script contained invalid marker");

351 .expect("ssh setup script contained invalid marker");

350

352

@@ -385,18 +387,8 @@ fn spawn_ssh_io(

385

387

386 let mut line_buf = String::new();

388 let mut line_buf = String::new();

387

389

388− let on_line = {

390+ let handlers = commands::build_handlers(app.clone(), io_control.clone());

389− let app = app.clone();

390− move |line: &str| {

391+ let on_line = move |line: &str| handlers.handle(line);

391− if line == ":help" {

392− if let Ok(mut locked) = app.lock() {

393− let _ = tui::render_commands_component(&mut locked);

394− }

395− return true;

396− }

397− false

398− }

399− };

400

392

401 let on_output = move |bytes: &[u8]| {

393 let on_output = move |bytes: &[u8]| {

402 if ssh_connected_for_output.load(Ordering::SeqCst) {

394 if ssh_connected_for_output.load(Ordering::SeqCst) {

src/lib.rs+1

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

1+pub mod commands;

1pub mod instance;

2pub mod instance;

2pub mod session_manager;

3pub mod session_manager;

3pub mod tui;

4pub mod tui;

src/ssh.sh+15

@@ -77,6 +77,21 @@ if [ ! -e "${USER_HOME}/.claude" ]; then

77fi

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

79

80+# Vibebox shell commands

81+install -d -m 755 /etc/profile.d

82+cat > /etc/profile.d/vibebox.sh <<'VIBEBOX_SHELL_EOF'

83+__VIBEBOX_SHELL_SCRIPT__

84+VIBEBOX_SHELL_EOF

85+chmod 644 /etc/profile.d/vibebox.sh

86+

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

88+ {

89+ echo ""

90+ echo "# vibebox-aliases"

91+ echo ". /etc/profile.d/vibebox.sh"

92+ } >> "${USER_HOME}/.bashrc"

93+fi

94+

80# Install Mise

95# Install Mise

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

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

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

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

src/tui.rs+5−5

@@ -50,11 +50,7 @@ pub struct AppState {

50}

51

52impl AppState {

53− pub fn new(cwd: PathBuf, vm_info: VmInfo) -> Self {

53+ pub fn new(cwd: PathBuf, vm_info: VmInfo, commands: VibeboxCommands) -> Self {

54− let mut commands = VibeboxCommands::default();

55− commands.add_command(":new", "Create a new session.");

56− commands.add_command(":exit", "Exit Vibebox.");

57−

58 Self {

54 Self {

59 cwd,

55 cwd,

60 vm_info,

56 vm_info,

@@ -69,6 +65,10 @@ pub struct VibeboxCommands {

69}

65}

70

66

71impl VibeboxCommands {

67impl VibeboxCommands {

68+ pub fn new_empty() -> Self {

69+ Self { items: Vec::new() }

70+ }

71+

72 pub fn add_command(&mut self, name: impl Into<String>, description: impl Into<String>) {

73 self.items.push(VibeboxCommand {

74 name: name.into(),