rasa-pro 3.14.0.dev20250901__py3-none-any.whl → 3.14.0rc1__py3-none-any.whl

rasa/dialogue_understanding/generator/prompt_templates/agent_command_prompt_v2_gpt_4o_2024_11_20_template.jinja2

@@ -0,0 +1,66 @@
+## Task Description
+Your task is to analyze the current conversation context and generate a list of actions to start new business processes that we call flows, to extract slots, or respond to small talk and knowledge requests.
+
+---
+
+## Available Flows and Slots
+Use the following structured data:
+```json
+{"flows":[{% for flow in available_flows %}{"name":"{{ flow.name }}","description":{{ flow.description | to_json_escaped_string }}{% if flow.agent_info %},"sub-agents":[{% for agent in flow.agent_info %}{"name":"{{ agent.name }}","description":{{ agent.description | to_json_escaped_string }}}{% if not loop.last %},{% endif %}{% endfor %}]{% endif %}{% if flow.slots %},"slots":[{% for slot in flow.slots %}{"name":"{{ slot.name }}"{% if slot.description %},"description":{{ slot.description | to_json_escaped_string }}{% endif %}{% if slot.allowed_values %},"allowed_values":{{ slot.allowed_values }}{% endif %}}{% if not loop.last %},{% endif %}{% endfor %}]{% endif %}}{% if not loop.last %},{% endif %}{% endfor %}]}
+```
+
+---
+
+## Available Actions:
+* `start flow flow_name`: Starting a flow. For example, `start flow transfer_money` or `start flow list_contacts`.
+* `set slot slot_name slot_value`: Slot setting. For example, `set slot transfer_money_recipient Freddy`. Can be used to correct and change previously set values. ONLY use slots that are explicitly defined in the flow's slot list.
+* `cancel flow`: Cancelling the current flow.
+* `disambiguate flows flow_name1 flow_name2 ... flow_name_n`: Disambiguate which flow should be started when user input is ambiguous by listing the potential flows as options. For example, `disambiguate flows list_contacts add_contact remove_contact ...` if the user just wrote "contacts".
+* `provide info`: Responding to the user's questions by supplying relevant information, such as answering FAQs or explaining services.
+* `offtopic reply`: Responding to casual or social user messages that are unrelated to any flows, engaging in friendly conversation and addressing off-topic remarks.
+* `hand over`: Handing over to a human, in case the user seems frustrated or explicitly asks to speak to one.
+* `repeat message`: Repeating the last bot message.{% if active_agent %}
+* `continue agent`: Continue the currently active agent {{ active_agent.name }}. This has HIGHEST PRIORITY when an agent is active and the user is responding to agent questions.{% endif %}{% if completed_agents %}
+* `restart agent agent_name`: Restart the agent with the given name, in case the user wants to change some answer to a previous question asked by the agent. For example, `restart agent car_research_agent` if the user changed his mind about the car he wants to buy. ONLY use agents that are listed in the `completed_agents` section.{% endif %}
+
+---
+
+## General Tips
+* Do not fill slots with abstract values or placeholders.
+* For categorical slots try to match the user message with allowed slot values. Use "other" if you cannot match it.
+* Set the boolean slots based on the user response. Map positive responses to `True`, and negative to `False`.
+* Extract text slot values exactly as provided by the user. Avoid assumptions, format changes, or partial extractions.
+* ONLY use `set slot` with slots that are explicitly defined in the current flow's slot list. Do NOT create or assume slots that don't exist.
+* Only use information provided by the user.
+* Use clarification in ambiguous cases.
+* Multiple flows can be started. If a user wants to digress into a second flow, you do not need to cancel the current flow.
+* Do not cancel the flow unless the user explicitly requests it.
+* Strictly adhere to the provided action format.
+* ONLY use the exact actions listed above. Do NOT invent new actions like "respond <message>" or any other variations.
+* Focus on the last message and take it one step at a time.
+* Use the previous conversation steps only to aid understanding.{% if active_agent %}
+* When an agent is active, ALWAYS prioritize `continue agent` over `provide info` or `offtopic reply` unless the user is clearly asking something unrelated to the agent's task.{% endif %}{% if completed_agents %}
+* ONLY use `restart agent` with agents that are listed in the `completed_agents` section. Do NOT restart non-existent agents.{% endif %}{% if active_agent or completed_agents %}
+* If you're unsure about agent names, refer to the structured data provided in the `Current State` section.{% endif %}
+
+---
+
+## Current State
+{% if current_flow != None %}
+Use the following structured data:
+```json
+{"active_flow":{"name":"{{ current_flow }}","current_step":{"requested_slot":"{{ current_slot }}","requested_slot_description":{{ current_slot_description | to_json_escaped_string }}},"slots":[{% for slot in flow_slots %}{"name":"{{ slot.name }}","value":"{{ slot.value }}","type":"{{ slot.type }}"{% if slot.description %},"description":{{ slot.description | to_json_escaped_string }}{% endif %}{% if slot.allowed_values %},"allowed_values":"{{ slot.allowed_values }}"{% endif %}}{% if not loop.last %},{% endif %}{% endfor %}]}{% if active_agent %},"active_agent":{"name":"{{ active_agent.name }}","description":{{ active_agent.description | to_json_escaped_string }}}{% endif %}{% if completed_agents %},"completed_agents":[{% for agent in completed_agents %}{"name":"{{ agent.name }}","description":{{ agent.description | to_json_escaped_string }}}{% if not loop.last %},{% endif %}{% endfor %}]{% endif %}}
+```{% else %}
+You are currently not inside any flow.{% endif %}
+
+---
+
+## Conversation History
+{{ current_conversation }}
+
+---
+
+## Task
+Create an action list with one action per line in response to the user's last message: """{{ user_message }}""".
+
+Your action list:

rasa/dialogue_understanding/generator/prompt_templates/agent_command_prompt_v3_claude_3_5_sonnet_20240620_template.jinja2

@@ -0,0 +1,89 @@
+## Task Description
+Your task is to analyze the current conversation context and generate a list of actions to start new business processes that we call flows, to extract slots, or respond to off-topic and knowledge requests.
+
+---
+
+## Available Actions:
+* `start flow flow_name`: Start a flow. For example, `start flow transfer_money` or `start flow list_contacts`.
+* `set slot slot_name slot_value`: Set a slot for the active flow. For example, `set slot transfer_money_recipient Freddy`. Can be used to correct and change previously set values. ONLY use slots that are explicitly defined in the flow's slot list.
+* `disambiguate flows flow_name1 flow_name2 ... flow_name_n`: When a message could refer to multiple flows, list the possible flows as options to clarify. Example: `disambiguate flows list_contacts add_contact remove_contact`.
+* `search and reply`: Provide a response from the knowledge base to address the user's inquiry when no flows fit, including domain knowledge, FAQs, and all off-topic or social messages.
+* `cancel flow`: Cancel the current flow if the user requests it.
+* `repeat message`: Repeat the last bot message.{% if active_agent %}
+* `continue agent`: Continue the currently active agent {{ active_agent.name }}. This has HIGHEST PRIORITY when an agent is active and the user is responding to agent questions.{% endif %}{% if completed_agents %}
+* `restart agent agent_name`: Restart the agent with the given name, in case the user wants to change some answer to a previous question asked by the agent. For example, `restart agent car_research_agent` if the user changed his mind about the car he wants to buy. ONLY use agents that are listed in the `completed_agents` section.{% endif %}
+
+---
+
+## General Instructions
+### Start Flow
+* Only start a flow if the user's message is clear and fully addressed by that flow's description and purpose.
+* Pay close attention to exact wording and scope in the flow description — do not assume or “stretch” the intended use of a flow.
+### Set Slot
+* Do not fill slots with abstract values or placeholders.
+* For categorical slots, try to match the user message with allowed slot values. Use "other" if you cannot match it.
+* Set the boolean slots based on the user's response. Map positive responses to `True`, and negative to `False`.
+* Extract text slot values exactly as provided by the user. Avoid assumptions, format changes, or partial extractions.
+* ONLY use `set slot` with slots that are explicitly defined in the current flow's slot list. Do NOT create or assume slots that don't exist.
+### Disambiguate Flows
+* Use `disambiguate flows` when the user's message matches multiple flows and you cannot decide which flow is most appropriate.
+* If the user message is short and not precise enough to start a flow or `search and reply`, disambiguate.
+* If a single flow is a strong/plausible fit, prefer starting that flow directly.
+* If a user's message unambiguously and distinctly matches multiple flows, start all relevant flows at once (rather than disambiguating).
+### Search and Reply
+* Only start `search and reply` if the user intent is clear.
+* Flow Priority: If you are unsure between starting a flow or `search and reply`, always prioritize starting a flow.
+### Cancel Flow
+* Do not cancel any flow unless the user explicitly requests it.
+* Multiple flows can be started without cancelling the previous, if the user wants to pursue multiple processes.{% if active_agent or completed_agents %}
+### Agents{% if active_agent %}
+* When an agent is active, ALWAYS prioritize `continue agent` over `search and reply` unless the user is clearly asking something unrelated to the agent's task.{% endif %}{% if completed_agents %}
+* ONLY use `restart agent` with agents that are listed in the `completed_agents` section. Do NOT restart non-existent agents.{% endif %}
+* If you're unsure about agent names, refer to the structured data provided in the `Current State` section.
+{% endif %}### General Tips
+* Only use information provided by the user.
+* Strictly adhere to the provided action format.
+* ONLY use the exact actions listed above. Do NOT invent new actions like "respond <message>" or any other variations.
+* Focus on the last message and take it one step at a time.
+* Use the previous conversation steps only to aid understanding.
+
+
+---
+
+## Decision Rule Table
+| Condition                                                     | Action             |
+|---------------------------------------------------------------|--------------------|{% if active_agent %}
+| Agent is active and the user is responding to agent questions | continue agent     |{% endif %}
+| Flow perfectly matches user's message                         | start flow         |
+| Multiple flows are equally strong, relevant matches           | disambiguate flows |
+| User's message is unclear or imprecise                        | disambiguate flows |
+| No flow fits at all, but knowledge base may help              | search and reply   |
+
+---
+
+## Available Flows and Slots
+Use the following structured data:
+```json
+{"flows":[{% for flow in available_flows %}{"name":"{{ flow.name }}","description":{{ flow.description | to_json_escaped_string }}{% if flow.agent_info %},"sub-agents":[{% for agent in flow.agent_info %}{"name":"{{ agent.name }}","description":{{ agent.description | to_json_escaped_string }}}{% if not loop.last %},{% endif %}{% endfor %}]{% endif %}{% if flow.slots %},"slots":[{% for slot in flow.slots %}{"name":"{{ slot.name }}"{% if slot.description %},"description":{{ slot.description | to_json_escaped_string }}{% endif %}{% if slot.allowed_values %},"allowed_values":{{ slot.allowed_values }}{% endif %}}{% if not loop.last %},{% endif %}{% endfor %}]{% endif %}}{% if not loop.last %},{% endif %}{% endfor %}]}
+```
+
+---
+
+## Current State
+{% if current_flow != None %}Use the following structured data:
+```json
+{"active_flow":{"name":"{{ current_flow }}","current_step":{"requested_slot":"{{ current_slot }}","requested_slot_description":{{ current_slot_description | to_json_escaped_string }}},"slots":[{% for slot in flow_slots %}{"name":"{{ slot.name }}","value":"{{ slot.value }}","type":"{{ slot.type }}"{% if slot.description %},"description":{{ slot.description | to_json_escaped_string }}{% endif %}{% if slot.allowed_values %},"allowed_values":"{{ slot.allowed_values }}"{% endif %}}{% if not loop.last %},{% endif %}{% endfor %}]}{% if active_agent %},"active_agent":{"name":"{{ active_agent.name }}","description":{{ active_agent.description | to_json_escaped_string }}}{% endif %}{% if completed_agents %},"completed_agents":[{% for agent in completed_agents %}{"name":"{{ agent.name }}","description":{{ agent.description | to_json_escaped_string }}}{% if not loop.last %},{% endif %}{% endfor %}]{% endif %}}
+```{% else %}
+You are currently not inside any flow.{% endif %}
+
+---
+
+## Conversation History
+{{ current_conversation }}
+
+---
+
+## Task
+Create an action list with one action per line in response to the user's last message: """{{ user_message }}""".
+
+Your action list:

rasa/dialogue_understanding/generator/prompt_templates/agent_command_prompt_v3_gpt_4o_2024_11_20_template.jinja2

@@ -0,0 +1,88 @@
+## Task Description
+Your task is to analyze the current conversation context and generate a list of actions to start new business processes that we call flows, to extract slots, or respond to off-topic and knowledge requests.
+
+---
+
+## Available Flows and Slots
+Use the following structured data:
+```json
+{"flows":[{% for flow in available_flows %}{"name":"{{ flow.name }}","description":{{ flow.description | to_json_escaped_string }}{% if flow.agent_info %},"sub-agents":[{% for agent in flow.agent_info %}{"name":"{{ agent.name }}","description":{{ agent.description | to_json_escaped_string }}}{% if not loop.last %},{% endif %}{% endfor %}]{% endif %}{% if flow.slots %},"slots":[{% for slot in flow.slots %}{"name":"{{ slot.name }}"{% if slot.description %},"description":{{ slot.description | to_json_escaped_string }}{% endif %}{% if slot.allowed_values %},"allowed_values":{{ slot.allowed_values }}{% endif %}}{% if not loop.last %},{% endif %}{% endfor %}]{% endif %}}{% if not loop.last %},{% endif %}{% endfor %}]}
+```
+
+---
+
+## Available Actions:
+* `start flow flow_name`: Start a flow. For example, `start flow transfer_money` or `start flow list_contacts`.
+* `set slot slot_name slot_value`: Set a slot for the active flow. For example, `set slot transfer_money_recipient Freddy`. Can be used to correct and change previously set values. ONLY use slots that are explicitly defined in the flow's slot list.
+* `disambiguate flows flow_name1 flow_name2 ... flow_name_n`: When a message could refer to multiple flows, list the possible flows as options to clarify. Example: `disambiguate flows list_contacts add_contact remove_contact`.
+* `search and reply`: Provide a response from the knowledge base to address the user’s inquiry when no flows fit, including domain knowledge, FAQs, and all off-topic or social messages.
+* `cancel flow`: Cancel the current flow if the user requests it.
+* `repeat message`: Repeat the last bot message.{% if active_agent %}
+* `continue agent`: Continue the currently active agent {{ active_agent.name }}. This has HIGHEST PRIORITY when an agent is active and the user is responding to agent questions.{% endif %}{% if completed_agents %}
+* `restart agent agent_name`: Restart the agent with the given name, in case the user wants to change some answer to a previous question asked by the agent. For example, `restart agent car_research_agent` if the user changed his mind about the car he wants to buy. ONLY use agents that are listed in the `completed_agents` section.{% endif %}
+
+---
+
+## General Instructions
+### Start Flow
+* Only start a flow if the user's message is clear and fully addressed by that flow's description and purpose.
+* Pay close attention to exact wording and scope in the flow description — do not assume or “stretch” the intended use of a flow.
+### Set Slot
+* Do not fill slots with abstract values or placeholders.
+* For categorical slots try to match the user message with allowed slot values. Use "other" if you cannot match it.
+* Set the boolean slots based on the user response. Map positive responses to `True`, and negative to `False`.
+* Extract text slot values exactly as provided by the user. Avoid assumptions, format changes, or partial extractions.
+* ONLY use `set slot` with slots that are explicitly defined in the current flow's slot list. Do NOT create or assume slots that don't exist.
+### Disambiguate Flows
+* Use `disambiguate flows` when the user's message matches multiple flows and you cannot decide which flow is most appropriate.
+* If the user message is short and not precise enough to start a flow or `search and reply`, disambiguate.
+* If a single flow is a strong/plausible fit, prefer starting that flow directly.
+* If a user's message unambiguously and distinctly matches multiple flows, start all relevant flows at once (rather than disambiguating).
+### Search and Reply
+* Only start `search and reply` if the user intent is clear.
+* Flow Priority: If you are unsure between starting a flow or `search and reply`, always prioritize starting a flow.
+### Cancel Flow
+* Do not cancel any flow unless the user explicitly requests it.
+* Multiple flows can be started without cancelling the previous, if the user wants to pursue multiple processes.{% if active_agent or completed_agents %}
+### Agents{% if active_agent %}
+* When an agent is active, ALWAYS prioritize `continue agent` over `search and reply` unless the user is clearly asking something unrelated to the agent's task.{% endif %}{% if completed_agents %}
+* ONLY use `restart agent` with agents that are listed in the `completed_agents` section. Do NOT restart non-existent agents.{% endif %}
+* If you're unsure about agent names, refer to the structured data provided in the `Current State` section.
+{% endif %}### General Tips
+* Only use information provided by the user.
+* Strictly adhere to the provided action format.
+* ONLY use the exact actions listed above. Do NOT invent new actions like "respond <message>" or any other variations.
+* Focus on the last message and take it one step at a time.
+* Use the previous conversation steps only to aid understanding.
+
+---
+
+## Decision Rule Table
+| Condition                                                     | Action             |
+|---------------------------------------------------------------|--------------------|{% if active_agent %}
+| Agent is active and the user is responding to agent questions | continue agent     |{% endif %}
+| Flow perfectly matches user's message                         | start flow         |
+| Multiple flows are equally strong, relevant matches           | disambiguate flows |
+| User's message is unclear or imprecise                        | disambiguate flows |
+| No flow fits at all, but knowledge base may help              | search and reply   |
+
+---
+
+## Current State
+{% if current_flow != None %}Use the following structured data:
+```json
+{"active_flow":{"name":"{{ current_flow }}","current_step":{"requested_slot":"{{ current_slot }}","requested_slot_description":{{ current_slot_description | to_json_escaped_string }}},"slots":[{% for slot in flow_slots %}{"name":"{{ slot.name }}","value":"{{ slot.value }}","type":"{{ slot.type }}"{% if slot.description %},"description":{{ slot.description | to_json_escaped_string }}{% endif %}{% if slot.allowed_values %},"allowed_values":"{{ slot.allowed_values }}"{% endif %}}{% if not loop.last %},{% endif %}{% endfor %}]}{% if active_agent %},"active_agent":{"name":"{{ active_agent.name }}","description":{{ active_agent.description | to_json_escaped_string }}}{% endif %}{% if completed_agents %},"completed_agents":[{% for agent in completed_agents %}{"name":"{{ agent.name }}","description":{{ agent.description | to_json_escaped_string }}}{% if not loop.last %},{% endif %}{% endfor %}]{% endif %}}
+```{% else %}
+You are currently not inside any flow.{% endif %}
+
+---
+
+## Conversation History
+{{ current_conversation }}
+
+---
+
+## Task
+Create an action list with one action per line in response to the user's last message: """{{ user_message }}""".
+
+Your action list:

rasa/dialogue_understanding/generator/single_step/compact_llm_command_generator.py

@@ -2,6 +2,7 @@ from typing import Any, Dict, Literal, Optional, Text
 
 import structlog
 
+from rasa.core.available_agents import AvailableAgents
 from rasa.dialogue_understanding.commands.command_syntax_manager import (
     CommandSyntaxVersion,
 )
@@ -45,6 +46,7 @@ DEFAULT_LLM_CONFIG = {
     TIMEOUT_CONFIG_KEY: 7,
 }
 
+# Non-agent default prompt mapping (used by default)
 MODEL_PROMPT_MAPPER = {
     f"{OPENAI_PROVIDER}/{MODEL_NAME_GPT_4O_2024_11_20}": (
         "command_prompt_v2_gpt_4o_2024_11_20_template.jinja2"
@@ -60,16 +62,38 @@ MODEL_PROMPT_MAPPER = {
     ),
 }
 
-# When model is not configured, then we use the default prompt template
+# Agentic prompt mapping (used only when agents are configured)
+AGENT_MODEL_PROMPT_MAPPER = {
+    f"{OPENAI_PROVIDER}/{MODEL_NAME_GPT_4O_2024_11_20}": (
+        "agent_command_prompt_v2_gpt_4o_2024_11_20_template.jinja2"
+    ),
+    f"{AZURE_OPENAI_PROVIDER}/{MODEL_NAME_GPT_4O_2024_11_20}": (
+        "agent_command_prompt_v2_gpt_4o_2024_11_20_template.jinja2"
+    ),
+    f"{AWS_BEDROCK_PROVIDER}/anthropic.{MODEL_NAME_CLAUDE_3_5_SONNET_20240620}-v1:0": (
+        "agent_command_prompt_v2_claude_3_5_sonnet_20240620_template.jinja2"
+    ),
+    f"{ANTHROPIC_PROVIDER}/{MODEL_NAME_CLAUDE_3_5_SONNET_20240620}": (
+        "agent_command_prompt_v2_claude_3_5_sonnet_20240620_template.jinja2"
+    ),
+}
+
+# Defaults for non-agent prompts
 DEFAULT_COMMAND_PROMPT_TEMPLATE_FILE_NAME = (
     "command_prompt_v2_gpt_4o_2024_11_20_template.jinja2"
 )
-# When the configured model is not found in the model prompt mapper, then we use the
-# fallback prompt template
 FALLBACK_COMMAND_PROMPT_TEMPLATE_FILE_NAME = (
     "command_prompt_v2_gpt_4o_2024_11_20_template.jinja2"
 )
 
+# Defaults for agentic prompts
+AGENT_DEFAULT_COMMAND_PROMPT_TEMPLATE_FILE_NAME = (
+    "agent_command_prompt_v2_gpt_4o_2024_11_20_template.jinja2"
+)
+AGENT_FALLBACK_COMMAND_PROMPT_TEMPLATE_FILE_NAME = (
+    "agent_command_prompt_v2_gpt_4o_2024_11_20_template.jinja2"
+)
+
 
 @DefaultV1Recipe.register(
     [
@@ -99,17 +123,29 @@ class CompactLLMCommandGenerator(SingleStepBasedLLMCommandGenerator):
     @staticmethod
     def get_default_prompt_template_file_name() -> str:
         """Get the default prompt template file name for the command generator."""
-        return DEFAULT_COMMAND_PROMPT_TEMPLATE_FILE_NAME
+        return (
+            AGENT_DEFAULT_COMMAND_PROMPT_TEMPLATE_FILE_NAME
+            if AvailableAgents.has_agents()
+            else DEFAULT_COMMAND_PROMPT_TEMPLATE_FILE_NAME
+        )
 
     @staticmethod
     def get_fallback_prompt_template_file_name() -> str:
         """Get the fallback prompt template file name for the command generator."""
-        return FALLBACK_COMMAND_PROMPT_TEMPLATE_FILE_NAME
+        return (
+            AGENT_FALLBACK_COMMAND_PROMPT_TEMPLATE_FILE_NAME
+            if AvailableAgents.has_agents()
+            else FALLBACK_COMMAND_PROMPT_TEMPLATE_FILE_NAME
+        )
 
     @staticmethod
     def get_model_prompt_mapper() -> Dict[str, str]:
         """Get the model prompt mapper for the command generator."""
-        return MODEL_PROMPT_MAPPER
+        return (
+            AGENT_MODEL_PROMPT_MAPPER
+            if AvailableAgents.has_agents()
+            else MODEL_PROMPT_MAPPER
+        )
 
     @staticmethod
     def get_default_llm_config() -> Dict[str, Any]:
@@ -132,7 +168,6 @@ class CompactLLMCommandGenerator(SingleStepBasedLLMCommandGenerator):
         if prompt_template is not None:
             return prompt_template
 
-        # Get the default prompt template based on the model name.
         default_command_prompt_template = get_default_prompt_template_based_on_model(
             llm_config=config.get(LLM_CONFIG_KEY, {}) or {},
             model_prompt_mapping=cls.get_model_prompt_mapper(),

rasa/dialogue_understanding/generator/single_step/search_ready_llm_command_generator.py

@@ -2,6 +2,7 @@ from typing import Any, Dict, Literal, Optional, Text
 
 import structlog
 
+from rasa.core.available_agents import AvailableAgents
 from rasa.dialogue_understanding.commands.command_syntax_manager import (
     CommandSyntaxVersion,
 )
@@ -44,6 +45,7 @@ DEFAULT_LLM_CONFIG = {
     TIMEOUT_CONFIG_KEY: 7,
 }
 
+# Non-agent defaults
 DEFAULT_COMMAND_PROMPT_TEMPLATE_FILE_NAME = (
     "command_prompt_v3_gpt_4o_2024_11_20_template.jinja2"
 )
@@ -66,6 +68,29 @@ MODEL_PROMPT_MAPPER = {
     ),
 }
 
+# Agentic mapping and defaults (used only when agents exist)
+AGENT_DEFAULT_COMMAND_PROMPT_TEMPLATE_FILE_NAME = (
+    "agent_command_prompt_v3_gpt_4o_2024_11_20_template.jinja2"
+)
+AGENT_FALLBACK_COMMAND_PROMPT_TEMPLATE_FILE_NAME = (
+    "agent_command_prompt_v3_gpt_4o_2024_11_20_template.jinja2"
+)
+AGENT_MODEL_PROMPT_MAPPER = {
+    f"{OPENAI_PROVIDER}/{MODEL_NAME_GPT_4O_2024_11_20}": (
+        "agent_command_prompt_v3_gpt_4o_2024_11_20_template.jinja2"
+    ),
+    f"{AZURE_OPENAI_PROVIDER}/{MODEL_NAME_GPT_4O_2024_11_20}": (
+        "agent_command_prompt_v3_gpt_4o_2024_11_20_template.jinja2"
+    ),
+    f"{AWS_BEDROCK_PROVIDER}/anthropic."
+    f"{MODEL_NAME_CLAUDE_3_5_SONNET_20240620}-v1:0": (
+        "agent_command_prompt_v3_claude_3_5_sonnet_20240620_template.jinja2"
+    ),
+    f"{ANTHROPIC_PROVIDER}/{MODEL_NAME_CLAUDE_3_5_SONNET_20240620}": (
+        "agent_command_prompt_v3_claude_3_5_sonnet_20240620_template.jinja2"
+    ),
+}
+
 
 @DefaultV1Recipe.register(
     [
@@ -100,17 +125,29 @@ class SearchReadyLLMCommandGenerator(SingleStepBasedLLMCommandGenerator):
     @staticmethod
     def get_default_prompt_template_file_name() -> str:
         """Get the default prompt template file name for the command generator."""
-        return DEFAULT_COMMAND_PROMPT_TEMPLATE_FILE_NAME
+        return (
+            AGENT_DEFAULT_COMMAND_PROMPT_TEMPLATE_FILE_NAME
+            if AvailableAgents.has_agents()
+            else DEFAULT_COMMAND_PROMPT_TEMPLATE_FILE_NAME
+        )
 
     @staticmethod
     def get_fallback_prompt_template_file_name() -> str:
         """Get the fallback prompt template file name for the command generator."""
-        return FALLBACK_COMMAND_PROMPT_TEMPLATE_FILE_NAME
+        return (
+            AGENT_FALLBACK_COMMAND_PROMPT_TEMPLATE_FILE_NAME
+            if AvailableAgents.has_agents()
+            else FALLBACK_COMMAND_PROMPT_TEMPLATE_FILE_NAME
+        )
 
     @staticmethod
     def get_model_prompt_mapper() -> Dict[str, str]:
         """Get the model prompt mapper for the command generator."""
-        return MODEL_PROMPT_MAPPER
+        return (
+            AGENT_MODEL_PROMPT_MAPPER
+            if AvailableAgents.has_agents()
+            else MODEL_PROMPT_MAPPER
+        )
 
     @staticmethod
     def get_component_command_syntax_version() -> CommandSyntaxVersion:

rasa/dialogue_understanding/generator/single_step/single_step_based_llm_command_generator.py

@@ -5,6 +5,11 @@ from typing import Any, Dict, List, Literal, Optional, Text
 import structlog
 
 import rasa.shared.utils.io
+from rasa.agents.utils import (
+    get_active_agent_info,
+    get_completed_agents_info,
+)
+from rasa.core.available_agents import AvailableAgents
 from rasa.dialogue_understanding.commands import (
     CannotHandleCommand,
     Command,
@@ -232,6 +237,8 @@ class SingleStepBasedLLMCommandGenerator(LLMBasedCommandGenerator, ABC):
             log_module=self.__class__.__name__,
             log_event="llm_command_generator.predict_commands.finished",
             commands=commands,
+            event_info="Commands predictd by the Command Generator",
+            highlight=True,
         )
 
         domain = kwargs.get("domain")
@@ -396,13 +403,18 @@ class SingleStepBasedLLMCommandGenerator(LLMBasedCommandGenerator, ABC):
             current_slot_allowed_values = allowed_values_for_slot(
                 tracker.slots.get(current_slot)
             )
-        current_conversation = tracker_as_readable_transcript(tracker)
+        has_agents = AvailableAgents.has_agents()
+        current_conversation = tracker_as_readable_transcript(
+            tracker, highlight_agent_turns=has_agents
+        )
         latest_user_message = sanitize_message_for_prompt(message.get(TEXT))
         current_conversation += f"\nUSER: {latest_user_message}"
 
-        inputs = {
+        inputs: Dict[str, Any] = {
             "available_flows": self.prepare_flows_for_template(
-                startable_flows, tracker
+                startable_flows,
+                tracker,
+                add_agent_info=has_agents,
             ),
             "current_conversation": current_conversation,
             "flow_slots": flow_slots,
@@ -413,6 +425,11 @@ class SingleStepBasedLLMCommandGenerator(LLMBasedCommandGenerator, ABC):
             "current_slot_allowed_values": current_slot_allowed_values,
             "user_message": latest_user_message,
         }
+        if has_agents:
+            inputs["active_agent"] = (
+                get_active_agent_info(tracker, top_flow.id) if top_flow else None
+            )
+            inputs["completed_agents"] = get_completed_agents_info(tracker)
 
         return self.compile_template(self.prompt_template).render(**inputs)
 

rasa/dialogue_understanding/patterns/cancel.py

@@ -8,10 +8,12 @@ import structlog
 from rasa.core.actions import action
 from rasa.core.channels.channel import OutputChannel
 from rasa.core.nlg.generator import NaturalLanguageGenerator
+from rasa.dialogue_understanding.stack.dialogue_stack import DialogueStack
 from rasa.dialogue_understanding.stack.frames import (
     BaseFlowStackFrame,
     PatternFlowStackFrame,
 )
+from rasa.dialogue_understanding.stack.frames.flow_stack_frame import AgentStackFrame
 from rasa.shared.constants import RASA_DEFAULT_FLOW_PATTERN_PREFIX
 from rasa.shared.core.constants import ACTION_CANCEL_FLOW
 from rasa.shared.core.domain import Domain
@@ -30,7 +32,8 @@ class CancelPatternFlowStackFrame(PatternFlowStackFrame):
     """A pattern flow stack frame which cancels a flow.
 
     The frame contains the information about the stack frames that should
-    be canceled."""
+    be canceled.
+    """
 
     flow_id: str = FLOW_PATTERN_CANCEL
     """The ID of the flow."""
@@ -93,19 +96,37 @@ class ActionCancelFlow(action.Action):
             structlogger.warning("action.cancel_flow.no_cancel_frame")
             return []
 
+        agent_frame_ids_to_cancel = []
         for canceled_frame_id in top.canceled_frames:
             for frame in stack.frames:
                 if frame.frame_id == canceled_frame_id and isinstance(
                     frame, BaseFlowStackFrame
                 ):
-                    # Setting the stack frame to the end step so it is properly
-                    # wrapped up by the flow policy
-                    frame.step_id = ContinueFlowStep.continue_step_for_id(END_STEP)
-                    break
+                    if isinstance(frame, AgentStackFrame):
+                        # When an AgentStackFrame needs to be canceled, we can
+                        # remove it directly from the stack. No extra logic is
+                        # required in the flow executor, since
+                        # the AgentCanceled event has already been created by
+                        # ActionCancelInterruptedFlows or CancelFlowCommand, and the
+                        # steps following the agentic call step should not be executed.
+                        agent_frame_ids_to_cancel.append(frame.frame_id)
+                        break
+                    else:
+                        # Setting the stack frame to the end step so it is
+                        # properly wrapped up by the flow policy
+                        frame.step_id = ContinueFlowStep.continue_step_for_id(END_STEP)
+                        break
             else:
                 structlogger.warning(
                     "action.cancel_flow.frame_not_found",
                     frame_id=canceled_frame_id,
                 )
 
-        return tracker.create_stack_updated_events(stack)
+        # Create a copy of the stack without the agentic frames that should
+        # be canceled
+        new_stack = DialogueStack.empty()
+        for frame in stack.frames:
+            if frame.frame_id not in agent_frame_ids_to_cancel:
+                new_stack.push(frame)
+
+        return tracker.create_stack_updated_events(new_stack)

rasa/dialogue_understanding/patterns/clarify.py

@@ -61,19 +61,6 @@ class ActionClarifyFlows(action.Action):
         """Return the flow name."""
         return ACTION_CLARIFY_FLOWS
 
-    @staticmethod
-    def assemble_options_string(names: List[str]) -> str:
-        """Concatenate options to a human-readable string."""
-        clarification_message = ""
-        for i, name in enumerate(names):
-            if i == 0:
-                clarification_message += name
-            elif i == len(names) - 1:
-                clarification_message += f" or {name}"
-            else:
-                clarification_message += f", {name}"
-        return clarification_message
-
     async def run(
         self,
         output_channel: "OutputChannel",
@@ -83,6 +70,8 @@ class ActionClarifyFlows(action.Action):
         metadata: Optional[Dict[str, Any]] = None,
     ) -> List[Event]:
         """Correct the slots."""
+        from rasa.dialogue_understanding.utils import assemble_options_string
+
         stack = tracker.stack
         if not (top := stack.top()):
             structlogger.warning("action.clarify_flows.no_active_flow")
@@ -92,7 +81,7 @@ class ActionClarifyFlows(action.Action):
             structlogger.warning("action.clarify_flows.no_clarification_frame")
             return []
 
-        options_string = self.assemble_options_string(top.names)
+        options_string = assemble_options_string(top.names, conjunction="or")
         top.clarification_options = options_string
         # since we modified the stack frame, we need to update the stack
         return tracker.create_stack_updated_events(stack)