feat: add configurable task timeouts for sub-recipes

.github/workflows/build-cli.yml

@@ -17,7 +17,7 @@ on:
       ref:
         type: string
         required: false
-        default: 'refs/heads/main'
+        default: ""
 
 name: "Reusable workflow to build CLI"
 

Cargo.toml

@@ -4,7 +4,7 @@ resolver = "2"
 
 [workspace.package]
 edition = "2021"
-version = "1.0.36"
+version = "1.1.4"
 authors = ["Block <ai-oss-tools@block.xyz>"]
 license = "Apache-2.0"
 repository = "https://github.com/block/goose"

crates/goose-cli/src/commands/web.rs

@@ -475,7 +475,14 @@ async fn process_message_streaming(
     }
 
     let provider = provider.unwrap();
-    session::persist_messages(&session_file, &messages, Some(provider.clone())).await?;
+    let working_dir = Some(std::env::current_dir()?);
+    session::persist_messages(
+        &session_file,
+        &messages,
+        Some(provider.clone()),
+        working_dir.clone(),
+    )
+    .await?;
 
     // Create a session config
     let session_config = SessionConfig {
@@ -503,7 +510,13 @@ async fn process_message_streaming(
                             let session_msgs = session_messages.lock().await;
                             session_msgs.clone()
                         };
-                        session::persist_messages(&session_file, &current_messages, None).await?;
+                        session::persist_messages(
+                            &session_file,
+                            &current_messages,
+                            None,
+                            working_dir.clone(),
+                        )
+                        .await?;
                         // Handle different message content types
                         for content in &message.content {
                             match content {

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

@@ -364,11 +364,16 @@ impl Session {
 
         // Persist messages with provider for automatic description generation
         if let Some(session_file) = &self.session_file {
+            let working_dir = Some(
+                std::env::current_dir().expect("failed to get current session working directory"),
+            );
+
             session::persist_messages_with_schedule_id(
                 session_file,
                 &self.messages,
                 Some(provider),
                 self.scheduled_job_id.clone(),
+                working_dir,
             )
             .await?;
         }
@@ -486,11 +491,17 @@ impl Session {
 
                             // Persist messages with provider for automatic description generation
                             if let Some(session_file) = &self.session_file {
+                                let working_dir = Some(
+                                    std::env::current_dir()
+                                        .expect("failed to get current session working directory"),
+                                );
+
                                 session::persist_messages_with_schedule_id(
                                     session_file,
                                     &self.messages,
                                     Some(provider),
                                     self.scheduled_job_id.clone(),
+                                    working_dir,
                                 )
                                 .await?;
                             }
@@ -702,11 +713,13 @@ impl Session {
 
                         // Persist the summarized messages
                         if let Some(session_file) = &self.session_file {
+                            let working_dir = std::env::current_dir().ok();
                             session::persist_messages_with_schedule_id(
                                 session_file,
                                 &self.messages,
                                 Some(provider),
                                 self.scheduled_job_id.clone(),
+                                working_dir,
                             )
                             .await?;
                         }
@@ -886,11 +899,13 @@ impl Session {
                                     ));
                                     push_message(&mut self.messages, response_message);
                                     if let Some(session_file) = &self.session_file {
+                                        let working_dir = std::env::current_dir().ok();
                                         session::persist_messages_with_schedule_id(
                                             session_file,
                                             &self.messages,
                                             None,
                                             self.scheduled_job_id.clone(),
+                                            working_dir,
                                         )
                                         .await?;
                                     }
@@ -985,11 +1000,13 @@ impl Session {
 
                                 // No need to update description on assistant messages
                                 if let Some(session_file) = &self.session_file {
+                                    let working_dir = std::env::current_dir().ok();
                                     session::persist_messages_with_schedule_id(
                                         session_file,
                                         &self.messages,
                                         None,
                                         self.scheduled_job_id.clone(),
+                                        working_dir,
                                     )
                                     .await?;
                                 }
@@ -1188,11 +1205,13 @@ impl Session {
 
             // No need for description update here
             if let Some(session_file) = &self.session_file {
+                let working_dir = std::env::current_dir().ok();
                 session::persist_messages_with_schedule_id(
                     session_file,
                     &self.messages,
                     None,
                     self.scheduled_job_id.clone(),
+                    working_dir,
                 )
                 .await?;
             }
@@ -1205,11 +1224,13 @@ impl Session {
 
             // No need for description update here
             if let Some(session_file) = &self.session_file {
+                let working_dir = std::env::current_dir().ok();
                 session::persist_messages_with_schedule_id(
                     session_file,
                     &self.messages,
                     None,
                     self.scheduled_job_id.clone(),
+                    working_dir,
                 )
                 .await?;
             }
@@ -1227,11 +1248,13 @@ impl Session {
 
                             // No need for description update here
                             if let Some(session_file) = &self.session_file {
+                                let working_dir = std::env::current_dir().ok();
                                 session::persist_messages_with_schedule_id(
                                     session_file,
                                     &self.messages,
                                     None,
                                     self.scheduled_job_id.clone(),
+                                    working_dir,
                                 )
                                 .await?;
                             }

crates/goose-server/src/routes/reply.rs

@@ -123,7 +123,7 @@ async fn handler(
     let stream = ReceiverStream::new(rx);
 
     let messages = request.messages;
-    let session_working_dir = request.session_working_dir;
+    let session_working_dir = request.session_working_dir.clone();
 
     let session_id = request
         .session_id
@@ -181,7 +181,7 @@ async fn handler(
                 &messages,
                 Some(SessionConfig {
                     id: session::Identifier::Name(session_id.clone()),
-                    working_dir: PathBuf::from(session_working_dir),
+                    working_dir: PathBuf::from(&session_working_dir),
                     schedule_id: request.scheduled_job_id.clone(),
                     execution_mode: None,
                     max_turns: None,
@@ -297,8 +297,13 @@ async fn handler(
         if all_messages.len() > saved_message_count {
             let provider = Arc::clone(provider.as_ref().unwrap());
             tokio::spawn(async move {
-                if let Err(e) =
-                    session::persist_messages(&session_path, &all_messages, Some(provider)).await
+                if let Err(e) = session::persist_messages(
+                    &session_path,
+                    &all_messages,
+                    Some(provider),
+                    Some(PathBuf::from(&session_working_dir)),
+                )
+                .await
                 {
                     tracing::error!("Failed to store session history: {:?}", e);
                 }
@@ -337,7 +342,7 @@ async fn ask_handler(
 ) -> Result<Json<AskResponse>, StatusCode> {
     verify_secret_key(&headers, &state)?;
 
-    let session_working_dir = request.session_working_dir;
+    let session_working_dir = request.session_working_dir.clone();
 
     let session_id = request
         .session_id
@@ -358,7 +363,7 @@ async fn ask_handler(
             &messages,
             Some(SessionConfig {
                 id: session::Identifier::Name(session_id.clone()),
-                working_dir: PathBuf::from(session_working_dir),
+                working_dir: PathBuf::from(&session_working_dir),
                 schedule_id: request.scheduled_job_id.clone(),
                 execution_mode: None,
                 max_turns: None,
@@ -420,9 +425,15 @@ async fn ask_handler(
     let session_path_clone = session_path.clone();
     let messages = all_messages.clone();
     let provider = Arc::clone(provider.as_ref().unwrap());
+    let session_working_dir_clone = session_working_dir.clone();
     tokio::spawn(async move {
-        if let Err(e) =
-            session::persist_messages(&session_path_clone, &messages, Some(provider)).await
+        if let Err(e) = session::persist_messages(
+            &session_path_clone,
+            &messages,
+            Some(provider),
+            Some(PathBuf::from(session_working_dir_clone)),
+        )
+        .await
         {
             tracing::error!("Failed to store session history: {:?}", e);
         }

crates/goose-server/src/routes/session.rs

@@ -187,14 +187,20 @@ async fn get_session_insights(
 
         // Track tokens - only add positive values to prevent negative totals
         if let Some(tokens) = session.metadata.accumulated_total_tokens {
-            if tokens > 0 {
-                total_tokens += tokens as i64;
-            } else if tokens < 0 {
-                // Log negative token values for debugging
-                info!(
-                    "Warning: Session {} has negative accumulated_total_tokens: {}",
-                    session.id, tokens
-                );
+            match tokens.cmp(&0) {
+                std::cmp::Ordering::Greater => {
+                    total_tokens += tokens as i64;
+                }
+                std::cmp::Ordering::Less => {
+                    // Log negative token values for debugging
+                    info!(
+                        "Warning: Session {} has negative accumulated_total_tokens: {}",
+                        session.id, tokens
+                    );
+                }
+                std::cmp::Ordering::Equal => {
+                    // Zero tokens, no action needed
+                }
             }
         }
 

crates/goose/src/agents/recipe_tools/sub_recipe_tools.rs

@@ -96,13 +96,32 @@ fn prepare_command_params(
 
 pub async fn create_sub_recipe_task(sub_recipe: &SubRecipe, params: Value) -> Result<String> {
     let command_params = prepare_command_params(sub_recipe, params)?;
+
+    // Extract task_timeout from sub_recipe values if present
+    let task_timeout = sub_recipe
+        .values
+        .as_ref()
+        .and_then(|values| values.get("task_timeout"))
+        .and_then(|timeout_str| timeout_str.parse::<u64>().ok());
+
+    let mut sub_recipe_data = json!({
+        "name": sub_recipe.name.clone(),
+        "command_parameters": command_params,
+        "recipe_path": sub_recipe.path.clone(),
+    });
+
+    // Add task_timeout to the payload if present
+    if let Some(timeout_seconds) = task_timeout {
+        sub_recipe_data.as_object_mut().unwrap().insert(
+            "task_timeout".to_string(),
+            json!(timeout_seconds)
+        );
+    }
+
     let payload = json!({
-        "sub_recipe": {
-            "name": sub_recipe.name.clone(),
-            "command_parameters": command_params,
-            "recipe_path": sub_recipe.path.clone(),
-        }
+        "sub_recipe": sub_recipe_data
     });
+
     let task = Task {
         id: uuid::Uuid::new_v4().to_string(),
         task_type: "sub_recipe".to_string(),