Unify subrecipe and subagent execution through shared recipe pipeline (#5082)

crates/goose-cli/src/recipes/secret_discovery.rs

@@ -166,7 +166,6 @@ mod tests {
                     available_tools: Vec::new(),
                 },
             ]),
-            context: None,
             settings: None,
             activities: None,
             author: None,
@@ -210,7 +209,6 @@ mod tests {
             instructions: Some("Test instructions".to_string()),
             prompt: None,
             extensions: None,
-            context: None,
             settings: None,
             activities: None,
             author: None,
@@ -255,7 +253,6 @@ mod tests {
                     available_tools: Vec::new(),
                 },
             ]),
-            context: None,
             settings: None,
             activities: None,
             author: None,
@@ -309,7 +306,6 @@ mod tests {
                 sequential_when_repeated: false,
                 description: None,
             }]),
-            context: None,
             settings: None,
             activities: None,
             author: None,

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

@@ -283,13 +283,13 @@ pub async fn build_session(session_config: SessionBuilderConfig) -> CliSession {
     // Create the agent
     let agent: Agent = Agent::new();
 
-    if let Some(sub_recipes) = session_config.sub_recipes {
-        agent.add_sub_recipes(sub_recipes).await;
-    }
-
-    if let Some(final_output_response) = session_config.final_output_response {
-        agent.add_final_output_tool(final_output_response).await;
-    }
+    agent
+        .apply_recipe_components(
+            session_config.sub_recipes,
+            session_config.final_output_response,
+            true,
+        )
+        .await;
 
     let new_provider = match create(&provider_name, model_config).await {
         Ok(provider) => provider,