Keep both instructions and prompts when using subrecipes

[katzdave]

Fixes #6078

The parameter passing was working fine, but we were only keeping instructions and not prompt which just told it it was a weather specialist and didn't have the actual parameter injection about the location it should look up.

recipe had:

instructions: |
  You are a weather data specialist. Gather current weather information
  including temperature, conditions, and seasonal context.
prompt: |
  Get the current weather for {{ location }}.

[Copilot]

Pull request overview

This PR fixes a bug in subrecipe execution where the prompt field was being ignored when both instructions and prompt were present in a recipe. Previously, the code used or() logic that would only keep instructions if both fields existed, causing parameter-injected prompts to be lost.

Key changes:

• Updated get_agent_messages() to properly handle all combinations of instructions and prompt fields
• When both fields are present, they are now concatenated with double newlines between them
• Preserves the original behavior for cases where only one field is present

[jamadeo]

hmm @tlongwell-block has a related change #6121, maybe that is the way to go?

[tlongwell-block]

hmm @tlongwell-block has a related change #6121, maybe that is the way to go?

I think #6121 is a bit more comprehensive

[alexhancock]

@tlongwell-block @katzdave I am looking to merge or close open PRs. Is this one still what we want to do or has #6121 addressed the same thing?

[katzdave]

Oops no worries, agree lets go with #6121