Skip to content
Merged
Changes from all commits
Commits
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
31 changes: 26 additions & 5 deletions crates/goose-cli/src/commands/session.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use goose::session::{generate_diagnostics, Session, SessionManager};
use goose::utils::safe_truncate;
use regex::Regex;
use std::fs;
use std::io::Write;
use std::io::{self, Write};
use std::path::Path;
use std::path::PathBuf;

Expand Down Expand Up @@ -141,6 +141,14 @@ pub async fn handle_session_remove(
remove_sessions(&session_manager, matched_sessions).await
}

fn write_line_or_broken_pipe_ok<W: Write>(out: &mut W, line: &str) -> Result<bool> {
match writeln!(out, "{line}") {
Ok(()) => Ok(true),
Err(e) if e.kind() == io::ErrorKind::BrokenPipe => Ok(false),
Err(e) => Err(e.into()),
}
}

pub async fn handle_session_list(
format: String,
ascending: bool,
Expand Down Expand Up @@ -170,17 +178,28 @@ pub async fn handle_session_list(
sessions.truncate(n);
}

let stdout = io::stdout();
let mut out = stdout.lock();

match format.as_str() {
"json" => {
println!("{}", serde_json::to_string(&sessions)?);
let payload = serde_json::to_string(&sessions)?;
if !write_line_or_broken_pipe_ok(&mut out, &payload)? {
return Ok(());
}
}
_ => {
if sessions.is_empty() {
println!("No sessions found");
if !write_line_or_broken_pipe_ok(&mut out, "No sessions found")? {
return Ok(());
}
return Ok(());
}

if !write_line_or_broken_pipe_ok(&mut out, "Available sessions:")? {
return Ok(());
}

println!("Available sessions:");
for session in sessions {
let output = format!(
"{} - {} - {} - {}",
Expand All @@ -189,7 +208,9 @@ pub async fn handle_session_list(
session.updated_at,
display_path_with_tilde(&session.working_dir)
);
println!("{}", output);
if !write_line_or_broken_pipe_ok(&mut out, &output)? {
return Ok(());
}
}
}
}
Expand Down
Loading