fix: use instructions for system prompt and prompt for user message in subagents (#6121)

crates/goose/src/agents/subagent_handler.rs

@@ -117,11 +117,11 @@ fn get_agent_messages(
     cancellation_token: Option<CancellationToken>,
 ) -> AgentMessagesFuture {
     Box::pin(async move {
-        let text_instruction = recipe
+        let system_instructions = recipe.instructions.clone().unwrap_or_default();
-            .instructions
+        let user_task = recipe
+            .prompt
             .clone()
-            .or(recipe.prompt.clone())
+            .unwrap_or_else(|| "Begin.".to_string());
-            .ok_or_else(|| anyhow!("Recipe has no instructions or prompt"))?;
 
         let agent_manager = AgentManager::instance()
             .await
@@ -160,7 +160,7 @@ fn get_agent_messages(
                     .max_turns
                     .expect("TaskConfig always sets max_turns"),
                 subagent_id: session_id.clone(),
-                task_instructions: text_instruction.clone(),
+                task_instructions: system_instructions,
                 tool_count: tools.len(),
                 available_tools: tools
                     .iter()
@@ -172,7 +172,7 @@ fn get_agent_messages(
         .map_err(|e| anyhow!("Failed to render subagent system prompt: {}", e))?;
         agent.override_system_prompt(subagent_prompt).await;
 
-        let user_message = Message::user().with_text(text_instruction);
+        let user_message = Message::user().with_text(user_task);
         let mut conversation = Conversation::new_unvalidated(vec![user_message.clone()]);
 
         if let Some(activities) = recipe.activities {

crates/goose/src/agents/subagent_tool.rs

@@ -347,31 +347,13 @@ fn build_subrecipe(
     )
     .map_err(|e| anyhow!("Failed to build subrecipe: {}", e))?;
 
-    // Merge prompt into instructions so the subagent gets the actual task.
+    if let Some(extra) = &params.instructions {
-    // The subagent handler uses `instructions` as the user message.
+        let mut current = recipe.instructions.take().unwrap_or_default();
-    let mut combined = String::new();
+        if !current.is_empty() {
-
+            current.push_str("\n\n");
-    if let Some(instructions) = &recipe.instructions {
-        combined.push_str(instructions);
-    }
-
-    if let Some(prompt) = &recipe.prompt {
-        if !combined.is_empty() {
-            combined.push_str("\n\n");
         }
-        combined.push_str(prompt);
+        current.push_str(extra);
-    }
+        recipe.instructions = Some(current);
-
-    if let Some(extra_instructions) = &params.instructions {
-        if !combined.is_empty() {
-            combined.push_str("\n\n");
-        }
-        combined.push_str("Additional context from parent agent:\n");
-        combined.push_str(extra_instructions);
-    }
-
-    if !combined.is_empty() {
-        recipe.instructions = Some(combined);
     }
 
     Ok(recipe)

crates/goose/src/prompts/subagent_system.md

@@ -13,8 +13,10 @@ The maximum number of turns to respond is {{max_turns}}.
 **Subagent ID**: {{subagent_id}}
 {% endif %}
 
+{% if task_instructions %}
 # Task Instructions
 {{task_instructions}}
+{% endif %}
 
 # Tool Usage Guidelines
 **CRITICAL**: Be efficient with tool usage. Use tools only when absolutely necessary to complete your task. Here are the available tools you have access to: