Skip to content

fix: use current working directory as default for session metadata #2793

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

Closed
s-soroosh wants to merge 1 commit into from
+10 −3
Closed

fix: use current working directory as default for session metadata #2793

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
13 changes: 10 additions & 3 deletions crates/goose/src/session/storage.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@ fn get_home_dir() -> PathBuf {
.to_path_buf()
}

fn get_current_working_dir() -> PathBuf {
std::env::current_dir()
.or_else(|_| Ok::<PathBuf, io::Error>(get_home_dir()))
.expect("could not determine the current working directory")
}

/// Metadata for a session, stored as the first line in the session file
#[derive(Debug, Clone, Serialize, ToSchema)]
pub struct SessionMetadata {
Expand Down Expand Up @@ -69,7 +75,7 @@ impl<'de> Deserialize<'de> for SessionMetadata {
let working_dir = helper
.working_dir
.filter(|path| path.exists())
.unwrap_or_else(get_home_dir);
.unwrap_or_else(get_current_working_dir);

Ok(SessionMetadata {
description: helper.description,
Expand Down Expand Up @@ -112,7 +118,7 @@ impl SessionMetadata {

impl Default for SessionMetadata {
fn default() -> Self {
Self::new(get_home_dir())
Self::new(get_current_working_dir())
}
}

Expand Down Expand Up @@ -589,6 +595,7 @@ mod tests {

// Create metadata with non-existent directory
let invalid_dir = PathBuf::from("/path/that/does/not/exist");

let metadata = SessionMetadata::new(invalid_dir.clone());

// Should fall back to home directory
Expand All @@ -611,7 +618,7 @@ mod tests {
// Read back - should fall back to home dir
let read_metadata = read_metadata(&file_path)?;
assert_ne!(read_metadata.working_dir, invalid_dir);
assert_eq!(read_metadata.working_dir, get_home_dir());
assert_eq!(read_metadata.working_dir, get_current_working_dir());

Ok(())
}
Expand Down
Loading