Add support for ascending/descending ordering of goose session list (#2087)

This commit is contained in:
Raduan Al-Shedivat
2025-04-23 17:21:27 +02:00
committed by GitHub
parent ab5447057e
commit 08682507d9
4 changed files with 54 additions and 11 deletions
+13 -2
View File
@@ -73,6 +73,13 @@ enum SessionCommand {
default_value = "text" default_value = "text"
)] )]
format: String, format: String,
#[arg(
long = "ascending",
help = "Sort by date in ascending order (oldest first)",
long_help = "Sort sessions by date in ascending order (oldest first). Default is descending order (newest first)."
)]
ascending: bool,
}, },
#[command(about = "Remove sessions")] #[command(about = "Remove sessions")]
Remove { Remove {
@@ -393,8 +400,12 @@ pub async fn cli() -> Result<()> {
builtins, builtins,
}) => { }) => {
return match command { return match command {
Some(SessionCommand::List { verbose, format }) => { Some(SessionCommand::List {
handle_session_list(verbose, format)?; verbose,
format,
ascending,
}) => {
handle_session_list(verbose, format, ascending)?;
Ok(()) Ok(())
} }
Some(SessionCommand::Remove { id, regex }) => { Some(SessionCommand::Remove { id, regex }) => {
+10 -4
View File
@@ -1,5 +1,5 @@
use anyhow::{Context, Result}; use anyhow::{Context, Result};
use goose::session::info::{get_session_info, SessionInfo}; use goose::session::info::{get_session_info, SessionInfo, SortOrder};
use regex::Regex; use regex::Regex;
use std::fs; use std::fs;
@@ -21,7 +21,7 @@ pub fn remove_session(session: &SessionInfo) -> Result<()> {
} }
pub fn handle_session_remove(id: String, regex_string: String) -> Result<()> { pub fn handle_session_remove(id: String, regex_string: String) -> Result<()> {
let sessions = match get_session_info() { let sessions = match get_session_info(SortOrder::Descending) {
Ok(sessions) => sessions, Ok(sessions) => sessions,
Err(e) => { Err(e) => {
tracing::error!("Failed to remove sessions: {:?}", e); tracing::error!("Failed to remove sessions: {:?}", e);
@@ -57,8 +57,14 @@ pub fn handle_session_remove(id: String, regex_string: String) -> Result<()> {
Ok(()) Ok(())
} }
pub fn handle_session_list(verbose: bool, format: String) -> Result<()> { pub fn handle_session_list(verbose: bool, format: String, ascending: bool) -> Result<()> {
let sessions = match get_session_info() { let sort_order = if ascending {
SortOrder::Ascending
} else {
SortOrder::Descending
};
let sessions = match get_session_info(sort_order) {
Ok(sessions) => sessions, Ok(sessions) => sessions,
Err(e) => { Err(e) => {
tracing::error!("Failed to list sessions: {:?}", e); tracing::error!("Failed to list sessions: {:?}", e);
+3 -2
View File
@@ -8,7 +8,7 @@ use axum::{
}; };
use goose::message::Message; use goose::message::Message;
use goose::session; use goose::session;
use goose::session::info::{get_session_info, SessionInfo}; use goose::session::info::{get_session_info, SessionInfo, SortOrder};
use serde::Serialize; use serde::Serialize;
#[derive(Serialize)] #[derive(Serialize)]
@@ -30,7 +30,8 @@ async fn list_sessions(
) -> Result<Json<SessionListResponse>, StatusCode> { ) -> Result<Json<SessionListResponse>, StatusCode> {
verify_secret_key(&headers, &state)?; verify_secret_key(&headers, &state)?;
let sessions = get_session_info().map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?; let sessions =
get_session_info(SortOrder::Descending).map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?;
Ok(Json(SessionListResponse { sessions })) Ok(Json(SessionListResponse { sessions }))
} }
+28 -3
View File
@@ -1,5 +1,6 @@
use anyhow::Result; use anyhow::Result;
use serde::Serialize; use serde::Serialize;
use std::cmp::Ordering;
use crate::session::{self, SessionMetadata}; use crate::session::{self, SessionMetadata};
@@ -11,7 +12,13 @@ pub struct SessionInfo {
pub metadata: SessionMetadata, pub metadata: SessionMetadata,
} }
pub fn get_session_info() -> Result<Vec<SessionInfo>> { /// Sort order for listing sessions
pub enum SortOrder {
Ascending,
Descending,
}
pub fn get_session_info(sort_order: SortOrder) -> Result<Vec<SessionInfo>> {
let sessions = match session::list_sessions() { let sessions = match session::list_sessions() {
Ok(sessions) => sessions, Ok(sessions) => sessions,
Err(e) => { Err(e) => {
@@ -19,7 +26,7 @@ pub fn get_session_info() -> Result<Vec<SessionInfo>> {
return Err(anyhow::anyhow!("Failed to list sessions")); return Err(anyhow::anyhow!("Failed to list sessions"));
} }
}; };
let session_infos = sessions let mut session_infos = sessions
.into_iter() .into_iter()
.map(|(id, path)| { .map(|(id, path)| {
// Get last modified time as string // Get last modified time as string
@@ -43,7 +50,25 @@ pub fn get_session_info() -> Result<Vec<SessionInfo>> {
metadata, metadata,
} }
}) })
.collect(); .collect::<Vec<SessionInfo>>();
// Sort sessions by modified date
// Since all dates are in ISO format (YYYY-MM-DD HH:MM:SS UTC), we can just use string comparison
// This works because the ISO format ensures lexicographical ordering matches chronological ordering
session_infos.sort_by(|a, b| {
if a.modified == "Unknown" && b.modified == "Unknown" {
return Ordering::Equal;
} else if a.modified == "Unknown" {
return Ordering::Greater; // Unknown dates go last
} else if b.modified == "Unknown" {
return Ordering::Less;
}
match sort_order {
SortOrder::Ascending => a.modified.cmp(&b.modified),
SortOrder::Descending => b.modified.cmp(&a.modified),
}
});
Ok(session_infos) Ok(session_infos)
} }