Skip to content

Add native client list detach and switch workflows #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Pajn merged 1 commit into from
Mar 28, 2026
Merged

Add native client list detach and switch workflows #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
160 changes: 126 additions & 34 deletions crates/embers-cli/src/interactive.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use embers_client::{
MouseModifiers, MuxClient, RenderGrid, SocketTransport,
};
use embers_core::{CursorShape, MuxError, Result, SessionId, Size};
use embers_protocol::{BufferRequest, ClientMessage, ServerResponse, SessionRequest};
use embers_protocol::{BufferRequest, ClientMessage, ServerEvent, ServerResponse, SessionRequest};
use tokio::sync::mpsc;
use unicode_width::{UnicodeWidthChar, UnicodeWidthStr};

Expand All @@ -29,9 +29,12 @@ pub async fn run(
config_path: Option<PathBuf>,
) -> Result<()> {
let mut client = MuxClient::connect(&socket_path).await?;
let attached_client_id = client.current_client().await?.id;
client.subscribe(None).await?;
let requested_target = target;
let mut session_id = ensure_session_ready(&mut client, requested_target.as_deref()).await?;
let initial_session_id = ensure_session_ready(&mut client, requested_target.as_deref()).await?;
client.switch_current_session(initial_session_id).await?;
let mut session_id = Some(initial_session_id);
let config = ConfigManager::from_process(config_path)
.map_err(|error| MuxError::invalid_input(error.to_string()))?;
let mut configured = ConfiguredClient::new(client, config);
Expand All @@ -45,53 +48,74 @@ pub async fn run(
loop {
if dirty {
terminal.sync_mouse_capture(mouse_capture_enabled(&configured))?;
if !configured
.client()
.state()
.sessions
.contains_key(&session_id)
{
session_id =
ensure_session_ready(configured.client_mut(), requested_target.as_deref())
.await?;
}
terminal_size = terminal.size()?;
let viewport = content_viewport(terminal_size);
let grid = configured.render_session(session_id, viewport).await?;
terminal.write_bytes(&drain_terminal_output(&mut configured))?;
let status = configured.status_line(session_id, &socket_path);
terminal.render(&grid, terminal_size, Some(&status))?;
if let Some(active_session_id) = session_id
&& !configured
.client()
.state()
.sessions
.contains_key(&active_session_id)
{
session_id = None;
}

if let Some(active_session_id) = session_id {
let grid = configured
.render_session(active_session_id, viewport)
.await?;
let status = configured.status_line(active_session_id, &socket_path);
terminal.render(&grid, terminal_size, Some(&status))?;
} else {
let grid = RenderGrid::new(viewport.width, viewport.height);
terminal.render(&grid, terminal_size, Some("detached"))?;
}
dirty = false;
}

loop {
match input_rx.try_recv() {
Ok(TerminalEvent::Key(KeyEvent::Ctrl('q'))) => return Ok(()),
Ok(TerminalEvent::Key(key)) => {
let viewport = content_viewport(terminal_size);
configured.handle_key(session_id, viewport, key).await?;
terminal.write_bytes(&drain_terminal_output(&mut configured))?;
dirty = true;
if let Some(active_session_id) = session_id {
let viewport = content_viewport(terminal_size);
configured
.handle_key(active_session_id, viewport, key)
.await?;
terminal.write_bytes(&drain_terminal_output(&mut configured))?;
dirty = true;
}
}
Ok(TerminalEvent::Paste(bytes)) => {
let viewport = content_viewport(terminal_size);
configured.handle_paste(session_id, viewport, bytes).await?;
terminal.write_bytes(&drain_terminal_output(&mut configured))?;
dirty = true;
if let Some(active_session_id) = session_id {
let viewport = content_viewport(terminal_size);
configured
.handle_paste(active_session_id, viewport, bytes)
.await?;
terminal.write_bytes(&drain_terminal_output(&mut configured))?;
dirty = true;
}
}
Ok(TerminalEvent::Focus(focused)) => {
let viewport = content_viewport(terminal_size);
configured
.handle_focus_event(session_id, viewport, focused)
.await?;
terminal.write_bytes(&drain_terminal_output(&mut configured))?;
dirty = true;
if let Some(active_session_id) = session_id {
let viewport = content_viewport(terminal_size);
configured
.handle_focus_event(active_session_id, viewport, focused)
.await?;
terminal.write_bytes(&drain_terminal_output(&mut configured))?;
dirty = true;
}
}
Ok(TerminalEvent::Mouse(mouse)) => {
let viewport = content_viewport(terminal_size);
configured.handle_mouse(session_id, viewport, mouse).await?;
terminal.write_bytes(&drain_terminal_output(&mut configured))?;
dirty = true;
if let Some(active_session_id) = session_id {
let viewport = content_viewport(terminal_size);
configured
.handle_mouse(active_session_id, viewport, mouse)
.await?;
terminal.write_bytes(&drain_terminal_output(&mut configured))?;
dirty = true;
}
}
Ok(TerminalEvent::InputClosed) => return Ok(()),
Ok(TerminalEvent::InputError(message)) => {
Expand All @@ -111,7 +135,17 @@ pub async fn run(

match tokio::time::timeout(EVENT_POLL_INTERVAL, configured.process_next_event()).await {
Ok(result) => {
result?;
let event = result?;
match switched_session_id(&event, attached_client_id) {
SwitchedSession::Switched(next_session_id) => {
ensure_root_window(configured.client_mut(), next_session_id).await?;
session_id = Some(next_session_id);
}
SwitchedSession::Detached => {
session_id = None;
}
SwitchedSession::Ignore => {}
}
terminal.write_bytes(&drain_terminal_output(&mut configured))?;
dirty = true;
}
Expand All @@ -122,6 +156,64 @@ pub async fn run(
}
}

#[derive(Clone, Copy, Debug, Eq, PartialEq)]
enum SwitchedSession {
Ignore,
Detached,
Switched(SessionId),
}

fn switched_session_id(event: &ServerEvent, attached_client_id: u64) -> SwitchedSession {
match event {
ServerEvent::ClientChanged(event) if event.client.id == attached_client_id => {
match event.client.current_session_id {
Some(session_id) => SwitchedSession::Switched(session_id),
None => SwitchedSession::Detached,
}
}
_ => SwitchedSession::Ignore,
}
}

#[cfg(test)]
mod client_switch_tests {
use super::{SwitchedSession, switched_session_id};
use embers_core::SessionId;
use embers_protocol::{ClientChangedEvent, ClientRecord, ServerEvent};

#[test]
fn switched_session_id_uses_attached_client_only() {
let event = ServerEvent::ClientChanged(ClientChangedEvent {
client: ClientRecord {
id: 7,
current_session_id: Some(SessionId(3)),
subscribed_all_sessions: true,
subscribed_session_ids: vec![],
},
previous_session_id: Some(SessionId(2)),
});
assert_eq!(
switched_session_id(&event, 7),
SwitchedSession::Switched(SessionId(3))
);
assert_eq!(switched_session_id(&event, 9), SwitchedSession::Ignore);
}

#[test]
fn switched_session_id_reports_detach_for_attached_client() {
let event = ServerEvent::ClientChanged(ClientChangedEvent {
client: ClientRecord {
id: 7,
current_session_id: None,
subscribed_all_sessions: true,
subscribed_session_ids: vec![],
},
previous_session_id: Some(SessionId(2)),
});
assert_eq!(switched_session_id(&event, 7), SwitchedSession::Detached);
}
}

async fn ensure_session_ready(
client: &mut MuxClient<SocketTransport>,
target: Option<&str>,
Expand Down
99 changes: 96 additions & 3 deletions crates/embers-cli/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ mod interactive;

use std::fs::{self, OpenOptions};
use std::io::Write;
use std::num::NonZeroU64;
#[cfg(unix)]
use std::os::unix::fs::{MetadataExt, OpenOptionsExt, PermissionsExt};
use std::path::{Path, PathBuf};
Expand All @@ -13,9 +14,9 @@ use embers_core::{
new_request_id,
};
use embers_protocol::{
BufferRequest, BufferResponse, ClientMessage, FloatingRecord, FloatingRequest,
FloatingResponse, NodeRequest, PingRequest, ProtocolClient, ServerResponse, SessionRecord,
SessionRequest, SessionSnapshot, SnapshotResponse,
BufferRequest, BufferResponse, ClientMessage, ClientRecord, ClientRequest, FloatingRecord,
FloatingRequest, FloatingResponse, NodeRequest, PingRequest, ProtocolClient, ServerResponse,
SessionRecord, SessionRequest, SessionSnapshot, SnapshotResponse,
};
use embers_server::{SOCKET_ENV_VAR, Server, ServerConfig};
use tokio::time::{Duration, sleep};
Expand Down Expand Up @@ -111,6 +112,16 @@ pub enum Command {
#[arg(short = 't', long = "target")]
target: Option<String>,
},
#[command(name = "list-clients")]
ListClients,
#[command(name = "detach-client")]
DetachClient { client_id: u64 },
#[command(name = "switch-client")]
SwitchClient {
client_id: u64,
#[arg(short = 't', long = "target")]
target: String,
},
Comment thread
coderabbitai[bot] marked this conversation as resolved.
#[command(name = "new-window")]
NewWindow {
#[arg(short = 't', long = "target")]
Expand Down Expand Up @@ -311,6 +322,40 @@ async fn execute(socket: &Path, command: Command) -> Result<String> {
expect_session_snapshot(response, "attach-buffer")?;
Ok(String::new())
}
Command::ListClients => {
let sessions = connection.list_sessions().await?;
let clients = connection.list_clients().await?;
Ok(format_clients(&clients, &sessions))
}
Command::DetachClient { client_id } => {
let client_id = NonZeroU64::new(client_id)
.ok_or_else(|| MuxError::invalid_input("client id must be non-zero"))?;
connection
.request(ClientMessage::Client(ClientRequest::Detach {
request_id: new_request_id(),
client_id: Some(client_id),
}))
.await?;
Ok(String::new())
}
Command::SwitchClient { client_id, target } => {
let client_id = NonZeroU64::new(client_id)
.ok_or_else(|| MuxError::invalid_input("client id must be non-zero"))?;
let session = connection.resolve_session_record(Some(&target)).await?;
match connection
.request(ClientMessage::Client(ClientRequest::Switch {
request_id: new_request_id(),
client_id: Some(client_id),
session_id: session.id,
}))
.await?
{
ServerResponse::Client(_) => Ok(String::new()),
other => Err(MuxError::protocol(format!(
"unexpected response to switch-client: {other:?}"
))),
}
}
Command::NewWindow {
target,
title,
Expand Down Expand Up @@ -922,6 +967,20 @@ impl CliConnection {
}
}

async fn list_clients(&mut self) -> Result<Vec<ClientRecord>> {
match self
.request(ClientMessage::Client(ClientRequest::List {
request_id: new_request_id(),
}))
.await?
{
ServerResponse::Clients(response) => Ok(response.clients),
other => Err(MuxError::protocol(format!(
"unexpected response to list-clients: {other:?}"
))),
}
}

async fn session_snapshot(&mut self, session_id: SessionId) -> Result<SessionSnapshot> {
match self
.request(ClientMessage::Session(SessionRequest::Get {
Expand Down Expand Up @@ -1210,6 +1269,40 @@ fn format_buffers(buffers: &[embers_protocol::BufferRecord]) -> String {
.join("\n")
}

fn format_clients(clients: &[ClientRecord], sessions: &[SessionRecord]) -> String {
clients
.iter()
.map(|client| {
let current = client
.current_session_id
.map(|session_id| session_label(sessions, session_id))
.unwrap_or_else(|| "-".to_owned());
let scope = if client.subscribed_all_sessions {
"all".to_owned()
} else if client.subscribed_session_ids.is_empty() {
"-".to_owned()
} else {
client
.subscribed_session_ids
.iter()
.map(|session_id| session_label(sessions, *session_id))
.collect::<Vec<_>>()
.join(",")
};
format!("{}\t{}\t{}", client.id, current, scope)
})
.collect::<Vec<_>>()
.join("\n")
}

fn session_label(sessions: &[SessionRecord], session_id: SessionId) -> String {
sessions
.iter()
.find(|session| session.id == session_id)
.map(|session| format!("{}:{}", session.id, session.name))
.unwrap_or_else(|| session_id.to_string())
}

fn format_windows(snapshot: &SessionSnapshot) -> Result<String> {
if let Some((_, tabs)) = root_tabs(snapshot)? {
Ok(tabs
Expand Down
Loading
Loading