feat: store working directory for sessions (#1559)

crates/goose-cli/src/session/builder.rs

@@ -35,7 +35,59 @@ pub async fn build_session(
     let mut agent = AgentFactory::create(&AgentFactory::configured_version(), provider)
         .expect("Failed to create agent");
 
+    // Handle session file resolution and resuming
+    let session_file = if resume {
+        if let Some(identifier) = identifier {
+            let session_file = session::get_path(identifier);
+            if !session_file.exists() {
+                output::render_error(&format!(
+                    "Cannot resume session {} - no such session exists",
+                    style(session_file.display()).cyan()
+                ));
+                process::exit(1);
+            }
+
+            session_file
+        } else {
+            // Try to resume most recent session
+            match session::get_most_recent_session() {
+                Ok(file) => file,
+                Err(_) => {
+                    output::render_error("Cannot resume - no previous sessions found");
+                    process::exit(1);
+                }
+            }
+        }
+    } else {
+        // Create new session with provided name/path or generated name
+        let id = match identifier {
+            Some(identifier) => identifier,
+            None => Identifier::Name(session::generate_session_id()),
+        };
+
+        // Just get the path - file will be created when needed
+        session::get_path(id)
+    };
+
+    if resume {
+        // Read the session metadata
+        let metadata = session::read_metadata(&session_file).unwrap_or_else(|e| {
+            output::render_error(&format!("Failed to read session metadata: {}", e));
+            process::exit(1);
+        });
+
+        // Ask user if they want to change the working directory
+        let change_workdir = cliclack::confirm(format!("{} The working directory of this session was set to {}. It does not match the current working directory. Would you like to change it?", style("WARNING:").yellow(), style(metadata.working_dir.display()).cyan()))
+                .initial_value(true)
+                .interact().expect("Failed to get user input");
+
+        if change_workdir {
+            std::env::set_current_dir(metadata.working_dir).unwrap();
+        }
+    }
+
     // Setup extensions for the agent
+    // Extensions need to be added after the session is created because we change directory when resuming a session
     for extension in ExtensionManager::get_all().expect("should load extensions") {
         if extension.enabled {
             let config = extension.config.clone();
@@ -59,39 +111,6 @@ pub async fn build_session(
         }
     }
 
-    // Handle session file resolution and resuming
-    let session_file = if resume {
-        if let Some(identifier) = identifier {
-            let session_file = session::get_path(identifier);
-            if !session_file.exists() {
-                output::render_error(&format!(
-                    "Cannot resume session {} - no such session exists",
-                    style(session_file.display()).cyan()
-                ));
-                process::exit(1);
-            }
-            session_file
-        } else {
-            // Try to resume most recent session
-            match session::get_most_recent_session() {
-                Ok(file) => file,
-                Err(_) => {
-                    output::render_error("Cannot resume - no previous sessions found");
-                    process::exit(1);
-                }
-            }
-        }
-    } else {
-        // Create new session with provided name/path or generated name
-        let id = match identifier {
-            Some(identifier) => identifier,
-            None => Identifier::Name(session::generate_session_id()),
-        };
-
-        // Just get the path - file will be created when needed
-        session::get_path(id)
-    };
-
     // Create new session
     let mut session = Session::new(agent, session_file.clone(), debug);
 

crates/goose-cli/src/session/mod.rs

@@ -13,7 +13,7 @@ use completion::GooseCompleter;
 use etcetera::choose_app_strategy;
 use etcetera::AppStrategy;
 use goose::agents::extension::{Envs, ExtensionConfig};
-use goose::agents::Agent;
+use goose::agents::{Agent, SessionConfig};
 use goose::config::Config;
 use goose::message::{Message, MessageContent};
 use goose::session;
@@ -199,7 +199,6 @@ impl Session {
     /// Process a single message and get the response
     async fn process_message(&mut self, message: String) -> Result<()> {
         self.messages.push(Message::user().with_text(&message));
-
         // Get the provider from the agent for description generation
         let provider = self.agent.provider().await;
 
@@ -436,7 +435,17 @@ impl Session {
 
     async fn process_agent_response(&mut self, interactive: bool) -> Result<()> {
         let session_id = session::Identifier::Path(self.session_file.clone());
-        let mut stream = self.agent.reply(&self.messages, Some(session_id)).await?;
+        let mut stream = self
+            .agent
+            .reply(
+                &self.messages,
+                Some(SessionConfig {
+                    id: session_id,
+                    working_dir: std::env::current_dir()
+                        .expect("failed to get current session working directory"),
+                }),
+            )
+            .await?;
 
         use futures::StreamExt;
         loop {

crates/goose-cli/src/session/output.rs

@@ -479,6 +479,13 @@ pub fn display_session_info(resume: bool, provider: &str, model: &str, session_f
         style("logging to").dim(),
         style(session_file.display()).dim().cyan(),
     );
+    println!(
+        "    {} {}",
+        style("working directory:").dim(),
+        style(std::env::current_dir().unwrap().display())
+            .cyan()
+            .dim()
+    );
 }
 
 pub fn display_greeting() {