new feature: Multi-Intent

.env.example

@@ -369,7 +369,7 @@ MCP_TOOL_CACHE_TTL_SECONDS=60
 # kbdb     = KBDB enterprise via PKG_KB_SERVING.SEARCH_KNOWLEDGE_BASE
 RAG_PROVIDER=kbdb
 
-# Somente usados quando RAG_PROVIDER=kbdb. Se vazios, credenciais caem para ADB_*.
+# Somente usados quando RAG_PROVIDER=kbdb; não há fallback para as credenciais ADB_*.
 KBDB_DB_USER=<DB_USER>
 KBDB_DB_PASSWORD=<DB_PASSWORD>
 KBDB_DB_DSN=db_dsn_high
@@ -383,3 +383,6 @@ KBDB_MAX_CROSS_REF_HOPS=1
 KBDB_DOCUMENT_TYPE=customer_safe
 KBDB_METADATA_JSON=
 KBDB_MIN_SCORE=0.5
+KBDB_IDENTIFY_DOCUMENT=true
+KBDB_STORE_QUERY=true
+KBDB_IDENTIFY_TOP_N=3

agent_framework_oci/Tuning-Performance/Authentication/agent_template_backend_authentication/app/agents/billing_agent.py

@@ -108,6 +108,14 @@ class BillingAgent(AgentRuntimeMixin):
             "next_state": "BILLING_ACTIVE",
             "mcp_results": tool_context,
             "rag": rag_metadata,
+            "rag_context": rag_context,
+            "rag_results": [{
+                "intent": state.get("intent"),
+                "agent": self.name,
+                "source_text": str(state.get("sanitized_input") or state.get("user_text") or ""),
+                "metadata": rag_metadata,
+                **({"context": rag_context} if rag_context else {}),
+            }],
             "memory_context_metadata": state.get("memory_context_metadata"),
             **self.transaction_state_patch(state),
         }

agent_framework_oci/Tuning-Performance/Authentication/agent_template_backend_authentication/app/agents/orders_agent.py

@@ -108,6 +108,14 @@ class OrdersAgent(AgentRuntimeMixin):
             "next_state": "ORDER_ACTIVE",
             "mcp_results": tool_context,
             "rag": rag_metadata,
+            "rag_context": rag_context,
+            "rag_results": [{
+                "intent": state.get("intent"),
+                "agent": self.name,
+                "source_text": str(state.get("sanitized_input") or state.get("user_text") or ""),
+                "metadata": rag_metadata,
+                **({"context": rag_context} if rag_context else {}),
+            }],
             "memory_context_metadata": state.get("memory_context_metadata"),
             **self.transaction_state_patch(state),
         }

agent_framework_oci/Tuning-Performance/Authentication/agent_template_backend_authentication/app/agents/product_agent.py

@@ -108,6 +108,14 @@ class ProductAgent(AgentRuntimeMixin):
             "next_state": "PRODUCT_ACTIVE",
             "mcp_results": tool_context,
             "rag": rag_metadata,
+            "rag_context": rag_context,
+            "rag_results": [{
+                "intent": state.get("intent"),
+                "agent": self.name,
+                "source_text": str(state.get("sanitized_input") or state.get("user_text") or ""),
+                "metadata": rag_metadata,
+                **({"context": rag_context} if rag_context else {}),
+            }],
             "memory_context_metadata": state.get("memory_context_metadata"),
             **self.transaction_state_patch(state),
         }

agent_framework_oci/Tuning-Performance/Authentication/agent_template_backend_authentication/app/agents/support_agent.py

@@ -108,6 +108,14 @@ class SupportAgent(AgentRuntimeMixin):
             "next_state": "SUPPORT_ACTIVE",
             "mcp_results": tool_context,
             "rag": rag_metadata,
+            "rag_context": rag_context,
+            "rag_results": [{
+                "intent": state.get("intent"),
+                "agent": self.name,
+                "source_text": str(state.get("sanitized_input") or state.get("user_text") or ""),
+                "metadata": rag_metadata,
+                **({"context": rag_context} if rag_context else {}),
+            }],
             "memory_context_metadata": state.get("memory_context_metadata"),
             **self.transaction_state_patch(state),
         }

agent_framework_oci/Tuning-Performance/Authentication/agent_template_backend_authentication/app/main.py

@@ -372,6 +372,7 @@ async def _process_gateway_message(req: GatewayRequest, emit_sse: bool = False)
                     "domain": result.get("domain"),
                     "mcp_tools": result.get("mcp_tools"),
                     "mcp_results": result.get("mcp_results"),
+                    "rag_results": result.get("rag_results"),
                     "business_context": business_context.model_dump(),
                     "identity_missing": missing_identity_keys,
                     "judges": result.get("judge_results"),

agent_framework_oci/Tuning-Performance/Authentication/agent_template_backend_authentication/app/state.py

@@ -23,6 +23,7 @@ class AgentState(TypedDict, total=False):
     domain: str
     mcp_tools: list[str]
     mcp_results: list[dict[str, Any]]
+    rag_results: list[dict[str, Any]]
     available_mcp_tools: list[str]
     selected_tool_call: dict[str, Any]
     pending_tool_call: dict[str, Any]

agent_framework_oci/Tuning-Performance/Authentication/agent_template_backend_authentication/app/workflows/agent_graph.py

@@ -570,6 +570,7 @@ class AgentWorkflow:
                 "pending_topics": drained.pending_topics,
                 "handled_topics": drained.handled_topics,
                 "mcp_results": drained.mcp_results,
+                "rag_results": drained.rag_results,
                 "output_guardrails_already_applied": False,
                 "supervisor_action": "disabled",
                 "supervisor_attempt": int(state.get("supervisor_attempt", 0)),
@@ -577,7 +578,11 @@ class AgentWorkflow:
 
         context = {
             **(state.get("context") or {}),
-            "evidence": drained.mcp_results or (state.get("context") or {}).get("evidence"),
+            "evidence": (list(drained.mcp_results) + list(drained.rag_results)) or (state.get("context") or {}).get("evidence"),
+            "tool_result": drained.mcp_results or (state.get("context") or {}).get("tool_result"),
+            "tool_executed": any(isinstance(item, dict) and item.get("ok") for item in drained.mcp_results),
+            "mcp_results": drained.mcp_results,
+            "evidence": (list(drained.mcp_results) + list(drained.rag_results)) or (state.get("context") or {}).get("evidence"),
             "tool_result": drained.mcp_results or (state.get("context") or {}).get("tool_result"),
             "tool_executed": any(isinstance(item, dict) and item.get("ok") for item in drained.mcp_results),
             "mcp_results": drained.mcp_results,
@@ -650,6 +655,7 @@ class AgentWorkflow:
                 "pending_topics": drained.pending_topics,
                 "handled_topics": drained.handled_topics,
                 "mcp_results": drained.mcp_results,
+                "rag_results": drained.rag_results,
                 "guardrail_decisions": state.get("guardrail_decisions", [])
                 + [item for r in decision.results for item in (r.metadata or {}).get("legacy_decisions", [])],
             }
@@ -876,6 +882,7 @@ class AgentWorkflow:
                     "judges": state.get("judge_results", []),
                     "mcp_tools": state.get("mcp_tools", []),
                     "mcp_results": state.get("mcp_results", []),
+                    "rag_results": state.get("rag_results", []),
                 },
             )
 

agent_framework_oci/Tuning-Performance/Deterministic_Transactional_Workflow/agent_template_backend/app/agents/billing_agent.py

@@ -108,6 +108,14 @@ class BillingAgent(AgentRuntimeMixin):
             "next_state": "BILLING_ACTIVE",
             "mcp_results": tool_context,
             "rag": rag_metadata,
+            "rag_context": rag_context,
+            "rag_results": [{
+                "intent": state.get("intent"),
+                "agent": self.name,
+                "source_text": str(state.get("sanitized_input") or state.get("user_text") or ""),
+                "metadata": rag_metadata,
+                **({"context": rag_context} if rag_context else {}),
+            }],
             "memory_context_metadata": state.get("memory_context_metadata"),
             **self.transaction_state_patch(state),
         }

agent_framework_oci/Tuning-Performance/Deterministic_Transactional_Workflow/agent_template_backend/app/agents/orders_agent.py

@@ -108,6 +108,14 @@ class OrdersAgent(AgentRuntimeMixin):
             "next_state": "ORDER_ACTIVE",
             "mcp_results": tool_context,
             "rag": rag_metadata,
+            "rag_context": rag_context,
+            "rag_results": [{
+                "intent": state.get("intent"),
+                "agent": self.name,
+                "source_text": str(state.get("sanitized_input") or state.get("user_text") or ""),
+                "metadata": rag_metadata,
+                **({"context": rag_context} if rag_context else {}),
+            }],
             "memory_context_metadata": state.get("memory_context_metadata"),
             **self.transaction_state_patch(state),
         }

agent_framework_oci/Tuning-Performance/Deterministic_Transactional_Workflow/agent_template_backend/app/agents/product_agent.py

@@ -108,6 +108,14 @@ class ProductAgent(AgentRuntimeMixin):
             "next_state": "PRODUCT_ACTIVE",
             "mcp_results": tool_context,
             "rag": rag_metadata,
+            "rag_context": rag_context,
+            "rag_results": [{
+                "intent": state.get("intent"),
+                "agent": self.name,
+                "source_text": str(state.get("sanitized_input") or state.get("user_text") or ""),
+                "metadata": rag_metadata,
+                **({"context": rag_context} if rag_context else {}),
+            }],
             "memory_context_metadata": state.get("memory_context_metadata"),
             **self.transaction_state_patch(state),
         }

agent_framework_oci/Tuning-Performance/Deterministic_Transactional_Workflow/agent_template_backend/app/agents/support_agent.py

@@ -108,6 +108,14 @@ class SupportAgent(AgentRuntimeMixin):
             "next_state": "SUPPORT_ACTIVE",
             "mcp_results": tool_context,
             "rag": rag_metadata,
+            "rag_context": rag_context,
+            "rag_results": [{
+                "intent": state.get("intent"),
+                "agent": self.name,
+                "source_text": str(state.get("sanitized_input") or state.get("user_text") or ""),
+                "metadata": rag_metadata,
+                **({"context": rag_context} if rag_context else {}),
+            }],
             "memory_context_metadata": state.get("memory_context_metadata"),
             **self.transaction_state_patch(state),
         }

agent_framework_oci/Tuning-Performance/Deterministic_Transactional_Workflow/agent_template_backend/app/main.py

@@ -366,6 +366,7 @@ async def _process_gateway_message(req: GatewayRequest, emit_sse: bool = False)
                     "domain": result.get("domain"),
                     "mcp_tools": result.get("mcp_tools"),
                     "mcp_results": result.get("mcp_results"),
+                    "rag_results": result.get("rag_results"),
                     "business_context": business_context.model_dump(),
                     "identity_missing": missing_identity_keys,
                     "judges": result.get("judge_results"),

agent_framework_oci/Tuning-Performance/Deterministic_Transactional_Workflow/agent_template_backend/app/state.py

@@ -23,6 +23,7 @@ class AgentState(TypedDict, total=False):
     domain: str
     mcp_tools: list[str]
     mcp_results: list[dict[str, Any]]
+    rag_results: list[dict[str, Any]]
     available_mcp_tools: list[str]
     selected_tool_call: dict[str, Any]
     pending_tool_call: dict[str, Any]

agent_framework_oci/Tuning-Performance/Deterministic_Transactional_Workflow/agent_template_backend/app/workflows/agent_graph.py

@@ -570,6 +570,7 @@ class AgentWorkflow:
                 "pending_topics": drained.pending_topics,
                 "handled_topics": drained.handled_topics,
                 "mcp_results": drained.mcp_results,
+                "rag_results": drained.rag_results,
                 "output_guardrails_already_applied": False,
                 "supervisor_action": "disabled",
                 "supervisor_attempt": int(state.get("supervisor_attempt", 0)),
@@ -577,7 +578,11 @@ class AgentWorkflow:
 
         context = {
             **(state.get("context") or {}),
-            "evidence": drained.mcp_results or (state.get("context") or {}).get("evidence"),
+            "evidence": (list(drained.mcp_results) + list(drained.rag_results)) or (state.get("context") or {}).get("evidence"),
+            "tool_result": drained.mcp_results or (state.get("context") or {}).get("tool_result"),
+            "tool_executed": any(isinstance(item, dict) and item.get("ok") for item in drained.mcp_results),
+            "mcp_results": drained.mcp_results,
+            "evidence": (list(drained.mcp_results) + list(drained.rag_results)) or (state.get("context") or {}).get("evidence"),
             "tool_result": drained.mcp_results or (state.get("context") or {}).get("tool_result"),
             "tool_executed": any(isinstance(item, dict) and item.get("ok") for item in drained.mcp_results),
             "mcp_results": drained.mcp_results,
@@ -650,6 +655,7 @@ class AgentWorkflow:
                 "pending_topics": drained.pending_topics,
                 "handled_topics": drained.handled_topics,
                 "mcp_results": drained.mcp_results,
+                "rag_results": drained.rag_results,
                 "guardrail_decisions": state.get("guardrail_decisions", [])
                 + [item for r in decision.results for item in (r.metadata or {}).get("legacy_decisions", [])],
             }
@@ -876,6 +882,7 @@ class AgentWorkflow:
                     "judges": state.get("judge_results", []),
                     "mcp_tools": state.get("mcp_tools", []),
                     "mcp_results": state.get("mcp_results", []),
+                    "rag_results": state.get("rag_results", []),
                 },
             )
 

agent_framework_oci/Tuning-Performance/External_Guardrails_Judges/agent_template_backend/app/agents/billing_agent.py

@@ -108,6 +108,14 @@ class BillingAgent(AgentRuntimeMixin):
             "next_state": "BILLING_ACTIVE",
             "mcp_results": tool_context,
             "rag": rag_metadata,
+            "rag_context": rag_context,
+            "rag_results": [{
+                "intent": state.get("intent"),
+                "agent": self.name,
+                "source_text": str(state.get("sanitized_input") or state.get("user_text") or ""),
+                "metadata": rag_metadata,
+                **({"context": rag_context} if rag_context else {}),
+            }],
             "memory_context_metadata": state.get("memory_context_metadata"),
             **self.transaction_state_patch(state),
         }

agent_framework_oci/Tuning-Performance/External_Guardrails_Judges/agent_template_backend/app/agents/orders_agent.py

@@ -108,6 +108,14 @@ class OrdersAgent(AgentRuntimeMixin):
             "next_state": "ORDER_ACTIVE",
             "mcp_results": tool_context,
             "rag": rag_metadata,
+            "rag_context": rag_context,
+            "rag_results": [{
+                "intent": state.get("intent"),
+                "agent": self.name,
+                "source_text": str(state.get("sanitized_input") or state.get("user_text") or ""),
+                "metadata": rag_metadata,
+                **({"context": rag_context} if rag_context else {}),
+            }],
             "memory_context_metadata": state.get("memory_context_metadata"),
             **self.transaction_state_patch(state),
         }

agent_framework_oci/Tuning-Performance/External_Guardrails_Judges/agent_template_backend/app/agents/product_agent.py

@@ -108,6 +108,14 @@ class ProductAgent(AgentRuntimeMixin):
             "next_state": "PRODUCT_ACTIVE",
             "mcp_results": tool_context,
             "rag": rag_metadata,
+            "rag_context": rag_context,
+            "rag_results": [{
+                "intent": state.get("intent"),
+                "agent": self.name,
+                "source_text": str(state.get("sanitized_input") or state.get("user_text") or ""),
+                "metadata": rag_metadata,
+                **({"context": rag_context} if rag_context else {}),
+            }],
             "memory_context_metadata": state.get("memory_context_metadata"),
             **self.transaction_state_patch(state),
         }

agent_framework_oci/Tuning-Performance/External_Guardrails_Judges/agent_template_backend/app/agents/support_agent.py

@@ -108,6 +108,14 @@ class SupportAgent(AgentRuntimeMixin):
             "next_state": "SUPPORT_ACTIVE",
             "mcp_results": tool_context,
             "rag": rag_metadata,
+            "rag_context": rag_context,
+            "rag_results": [{
+                "intent": state.get("intent"),
+                "agent": self.name,
+                "source_text": str(state.get("sanitized_input") or state.get("user_text") or ""),
+                "metadata": rag_metadata,
+                **({"context": rag_context} if rag_context else {}),
+            }],
             "memory_context_metadata": state.get("memory_context_metadata"),
             **self.transaction_state_patch(state),
         }

agent_framework_oci/Tuning-Performance/External_Guardrails_Judges/agent_template_backend/app/main.py

@@ -361,6 +361,7 @@ async def _process_gateway_message(req: GatewayRequest, emit_sse: bool = False)
                     "domain": result.get("domain"),
                     "mcp_tools": result.get("mcp_tools"),
                     "mcp_results": result.get("mcp_results"),
+                    "rag_results": result.get("rag_results"),
                     "business_context": business_context.model_dump(),
                     "identity_missing": missing_identity_keys,
                     "judges": result.get("judge_results"),

agent_framework_oci/Tuning-Performance/External_Guardrails_Judges/agent_template_backend/app/state.py

@@ -23,6 +23,7 @@ class AgentState(TypedDict, total=False):
     domain: str
     mcp_tools: list[str]
     mcp_results: list[dict[str, Any]]
+    rag_results: list[dict[str, Any]]
     available_mcp_tools: list[str]
     selected_tool_call: dict[str, Any]
     pending_tool_call: dict[str, Any]

agent_framework_oci/Tuning-Performance/External_Guardrails_Judges/agent_template_backend/app/workflows/agent_graph.py

@@ -568,6 +568,7 @@ class AgentWorkflow:
                 "pending_topics": drained.pending_topics,
                 "handled_topics": drained.handled_topics,
                 "mcp_results": drained.mcp_results,
+                "rag_results": drained.rag_results,
                 "output_guardrails_already_applied": False,
                 "supervisor_action": "disabled",
                 "supervisor_attempt": int(state.get("supervisor_attempt", 0)),
@@ -575,7 +576,11 @@ class AgentWorkflow:
 
         context = {
             **(state.get("context") or {}),
-            "evidence": drained.mcp_results or (state.get("context") or {}).get("evidence"),
+            "evidence": (list(drained.mcp_results) + list(drained.rag_results)) or (state.get("context") or {}).get("evidence"),
+            "tool_result": drained.mcp_results or (state.get("context") or {}).get("tool_result"),
+            "tool_executed": any(isinstance(item, dict) and item.get("ok") for item in drained.mcp_results),
+            "mcp_results": drained.mcp_results,
+            "evidence": (list(drained.mcp_results) + list(drained.rag_results)) or (state.get("context") or {}).get("evidence"),
             "tool_result": drained.mcp_results or (state.get("context") or {}).get("tool_result"),
             "tool_executed": any(isinstance(item, dict) and item.get("ok") for item in drained.mcp_results),
             "mcp_results": drained.mcp_results,
@@ -648,6 +653,7 @@ class AgentWorkflow:
                 "pending_topics": drained.pending_topics,
                 "handled_topics": drained.handled_topics,
                 "mcp_results": drained.mcp_results,
+                "rag_results": drained.rag_results,
                 "guardrail_decisions": state.get("guardrail_decisions", [])
                 + [item for r in decision.results for item in (r.metadata or {}).get("legacy_decisions", [])],
             }
@@ -805,6 +811,7 @@ class AgentWorkflow:
                     "judges": state.get("judge_results", []),
                     "mcp_tools": state.get("mcp_tools", []),
                     "mcp_results": state.get("mcp_results", []),
+                    "rag_results": state.get("rag_results", []),
                 },
             )
 

agent_framework_oci/Tuning-Performance/Long_Term_Memory/templates/agent_template_backend/app/agents/billing_agent.py

@@ -108,6 +108,14 @@ class BillingAgent(AgentRuntimeMixin):
             "next_state": "BILLING_ACTIVE",
             "mcp_results": tool_context,
             "rag": rag_metadata,
+            "rag_context": rag_context,
+            "rag_results": [{
+                "intent": state.get("intent"),
+                "agent": self.name,
+                "source_text": str(state.get("sanitized_input") or state.get("user_text") or ""),
+                "metadata": rag_metadata,
+                **({"context": rag_context} if rag_context else {}),
+            }],
             "memory_context_metadata": state.get("memory_context_metadata"),
             **self.transaction_state_patch(state),
         }

agent_framework_oci/Tuning-Performance/Long_Term_Memory/templates/agent_template_backend/app/agents/orders_agent.py

@@ -108,6 +108,14 @@ class OrdersAgent(AgentRuntimeMixin):
             "next_state": "ORDER_ACTIVE",
             "mcp_results": tool_context,
             "rag": rag_metadata,
+            "rag_context": rag_context,
+            "rag_results": [{
+                "intent": state.get("intent"),
+                "agent": self.name,
+                "source_text": str(state.get("sanitized_input") or state.get("user_text") or ""),
+                "metadata": rag_metadata,
+                **({"context": rag_context} if rag_context else {}),
+            }],
             "memory_context_metadata": state.get("memory_context_metadata"),
             **self.transaction_state_patch(state),
         }

agent_framework_oci/Tuning-Performance/Long_Term_Memory/templates/agent_template_backend/app/agents/product_agent.py

@@ -108,6 +108,14 @@ class ProductAgent(AgentRuntimeMixin):
             "next_state": "PRODUCT_ACTIVE",
             "mcp_results": tool_context,
             "rag": rag_metadata,
+            "rag_context": rag_context,
+            "rag_results": [{
+                "intent": state.get("intent"),
+                "agent": self.name,
+                "source_text": str(state.get("sanitized_input") or state.get("user_text") or ""),
+                "metadata": rag_metadata,
+                **({"context": rag_context} if rag_context else {}),
+            }],
             "memory_context_metadata": state.get("memory_context_metadata"),
             **self.transaction_state_patch(state),
         }

agent_framework_oci/Tuning-Performance/Long_Term_Memory/templates/agent_template_backend/app/agents/support_agent.py

@@ -108,6 +108,14 @@ class SupportAgent(AgentRuntimeMixin):
             "next_state": "SUPPORT_ACTIVE",
             "mcp_results": tool_context,
             "rag": rag_metadata,
+            "rag_context": rag_context,
+            "rag_results": [{
+                "intent": state.get("intent"),
+                "agent": self.name,
+                "source_text": str(state.get("sanitized_input") or state.get("user_text") or ""),
+                "metadata": rag_metadata,
+                **({"context": rag_context} if rag_context else {}),
+            }],
             "memory_context_metadata": state.get("memory_context_metadata"),
             **self.transaction_state_patch(state),
         }

agent_framework_oci/Tuning-Performance/Long_Term_Memory/templates/agent_template_backend/app/main.py

@@ -366,6 +366,7 @@ async def _process_gateway_message(req: GatewayRequest, emit_sse: bool = False)
                     "domain": result.get("domain"),
                     "mcp_tools": result.get("mcp_tools"),
                     "mcp_results": result.get("mcp_results"),
+                    "rag_results": result.get("rag_results"),
                     "business_context": business_context.model_dump(),
                     "identity_missing": missing_identity_keys,
                     "judges": result.get("judge_results"),

agent_framework_oci/Tuning-Performance/Long_Term_Memory/templates/agent_template_backend/app/state.py

@@ -23,6 +23,7 @@ class AgentState(TypedDict, total=False):
     domain: str
     mcp_tools: list[str]
     mcp_results: list[dict[str, Any]]
+    rag_results: list[dict[str, Any]]
     available_mcp_tools: list[str]
     selected_tool_call: dict[str, Any]
     pending_tool_call: dict[str, Any]

agent_framework_oci/Tuning-Performance/Long_Term_Memory/templates/agent_template_backend/app/workflows/agent_graph.py

@@ -570,6 +570,7 @@ class AgentWorkflow:
                 "pending_topics": drained.pending_topics,
                 "handled_topics": drained.handled_topics,
                 "mcp_results": drained.mcp_results,
+                "rag_results": drained.rag_results,
                 "output_guardrails_already_applied": False,
                 "supervisor_action": "disabled",
                 "supervisor_attempt": int(state.get("supervisor_attempt", 0)),
@@ -577,7 +578,11 @@ class AgentWorkflow:
 
         context = {
             **(state.get("context") or {}),
-            "evidence": drained.mcp_results or (state.get("context") or {}).get("evidence"),
+            "evidence": (list(drained.mcp_results) + list(drained.rag_results)) or (state.get("context") or {}).get("evidence"),
+            "tool_result": drained.mcp_results or (state.get("context") or {}).get("tool_result"),
+            "tool_executed": any(isinstance(item, dict) and item.get("ok") for item in drained.mcp_results),
+            "mcp_results": drained.mcp_results,
+            "evidence": (list(drained.mcp_results) + list(drained.rag_results)) or (state.get("context") or {}).get("evidence"),
             "tool_result": drained.mcp_results or (state.get("context") or {}).get("tool_result"),
             "tool_executed": any(isinstance(item, dict) and item.get("ok") for item in drained.mcp_results),
             "mcp_results": drained.mcp_results,
@@ -650,6 +655,7 @@ class AgentWorkflow:
                 "pending_topics": drained.pending_topics,
                 "handled_topics": drained.handled_topics,
                 "mcp_results": drained.mcp_results,
+                "rag_results": drained.rag_results,
                 "guardrail_decisions": state.get("guardrail_decisions", [])
                 + [item for r in decision.results for item in (r.metadata or {}).get("legacy_decisions", [])],
             }
@@ -876,6 +882,7 @@ class AgentWorkflow:
                     "judges": state.get("judge_results", []),
                     "mcp_tools": state.get("mcp_tools", []),
                     "mcp_results": state.get("mcp_results", []),
+                    "rag_results": state.get("rag_results", []),
                 },
             )
 

agent_framework_oci/Tuning-Performance/Normal/templates/agent_template_backend/app/agents/billing_agent.py

@@ -108,6 +108,14 @@ class BillingAgent(AgentRuntimeMixin):
             "next_state": "BILLING_ACTIVE",
             "mcp_results": tool_context,
             "rag": rag_metadata,
+            "rag_context": rag_context,
+            "rag_results": [{
+                "intent": state.get("intent"),
+                "agent": self.name,
+                "source_text": str(state.get("sanitized_input") or state.get("user_text") or ""),
+                "metadata": rag_metadata,
+                **({"context": rag_context} if rag_context else {}),
+            }],
             "memory_context_metadata": state.get("memory_context_metadata"),
             **self.transaction_state_patch(state),
         }

agent_framework_oci/Tuning-Performance/Normal/templates/agent_template_backend/app/agents/orders_agent.py

@@ -108,6 +108,14 @@ class OrdersAgent(AgentRuntimeMixin):
             "next_state": "ORDER_ACTIVE",
             "mcp_results": tool_context,
             "rag": rag_metadata,
+            "rag_context": rag_context,
+            "rag_results": [{
+                "intent": state.get("intent"),
+                "agent": self.name,
+                "source_text": str(state.get("sanitized_input") or state.get("user_text") or ""),
+                "metadata": rag_metadata,
+                **({"context": rag_context} if rag_context else {}),
+            }],
             "memory_context_metadata": state.get("memory_context_metadata"),
             **self.transaction_state_patch(state),
         }

agent_framework_oci/Tuning-Performance/Normal/templates/agent_template_backend/app/agents/product_agent.py

@@ -108,6 +108,14 @@ class ProductAgent(AgentRuntimeMixin):
             "next_state": "PRODUCT_ACTIVE",
             "mcp_results": tool_context,
             "rag": rag_metadata,
+            "rag_context": rag_context,
+            "rag_results": [{
+                "intent": state.get("intent"),
+                "agent": self.name,
+                "source_text": str(state.get("sanitized_input") or state.get("user_text") or ""),
+                "metadata": rag_metadata,
+                **({"context": rag_context} if rag_context else {}),
+            }],
             "memory_context_metadata": state.get("memory_context_metadata"),
             **self.transaction_state_patch(state),
         }

agent_framework_oci/Tuning-Performance/Normal/templates/agent_template_backend/app/agents/support_agent.py

@@ -108,6 +108,14 @@ class SupportAgent(AgentRuntimeMixin):
             "next_state": "SUPPORT_ACTIVE",
             "mcp_results": tool_context,
             "rag": rag_metadata,
+            "rag_context": rag_context,
+            "rag_results": [{
+                "intent": state.get("intent"),
+                "agent": self.name,
+                "source_text": str(state.get("sanitized_input") or state.get("user_text") or ""),
+                "metadata": rag_metadata,
+                **({"context": rag_context} if rag_context else {}),
+            }],
             "memory_context_metadata": state.get("memory_context_metadata"),
             **self.transaction_state_patch(state),
         }

agent_framework_oci/Tuning-Performance/Normal/templates/agent_template_backend/app/main.py

@@ -361,6 +361,7 @@ async def _process_gateway_message(req: GatewayRequest, emit_sse: bool = False)
                     "domain": result.get("domain"),
                     "mcp_tools": result.get("mcp_tools"),
                     "mcp_results": result.get("mcp_results"),
+                    "rag_results": result.get("rag_results"),
                     "business_context": business_context.model_dump(),
                     "identity_missing": missing_identity_keys,
                     "judges": result.get("judge_results"),

agent_framework_oci/Tuning-Performance/Normal/templates/agent_template_backend/app/state.py

@@ -23,6 +23,7 @@ class AgentState(TypedDict, total=False):
     domain: str
     mcp_tools: list[str]
     mcp_results: list[dict[str, Any]]
+    rag_results: list[dict[str, Any]]
     available_mcp_tools: list[str]
     selected_tool_call: dict[str, Any]
     pending_tool_call: dict[str, Any]

agent_framework_oci/Tuning-Performance/Normal/templates/agent_template_backend/app/workflows/agent_graph.py

@@ -568,6 +568,7 @@ class AgentWorkflow:
                 "pending_topics": drained.pending_topics,
                 "handled_topics": drained.handled_topics,
                 "mcp_results": drained.mcp_results,
+                "rag_results": drained.rag_results,
                 "output_guardrails_already_applied": False,
                 "supervisor_action": "disabled",
                 "supervisor_attempt": int(state.get("supervisor_attempt", 0)),
@@ -575,7 +576,11 @@ class AgentWorkflow:
 
         context = {
             **(state.get("context") or {}),
-            "evidence": drained.mcp_results or (state.get("context") or {}).get("evidence"),
+            "evidence": (list(drained.mcp_results) + list(drained.rag_results)) or (state.get("context") or {}).get("evidence"),
+            "tool_result": drained.mcp_results or (state.get("context") or {}).get("tool_result"),
+            "tool_executed": any(isinstance(item, dict) and item.get("ok") for item in drained.mcp_results),
+            "mcp_results": drained.mcp_results,
+            "evidence": (list(drained.mcp_results) + list(drained.rag_results)) or (state.get("context") or {}).get("evidence"),
             "tool_result": drained.mcp_results or (state.get("context") or {}).get("tool_result"),
             "tool_executed": any(isinstance(item, dict) and item.get("ok") for item in drained.mcp_results),
             "mcp_results": drained.mcp_results,
@@ -648,6 +653,7 @@ class AgentWorkflow:
                 "pending_topics": drained.pending_topics,
                 "handled_topics": drained.handled_topics,
                 "mcp_results": drained.mcp_results,
+                "rag_results": drained.rag_results,
                 "guardrail_decisions": state.get("guardrail_decisions", [])
                 + [item for r in decision.results for item in (r.metadata or {}).get("legacy_decisions", [])],
             }
@@ -805,6 +811,7 @@ class AgentWorkflow:
                     "judges": state.get("judge_results", []),
                     "mcp_tools": state.get("mcp_tools", []),
                     "mcp_results": state.get("mcp_results", []),
+                    "rag_results": state.get("rag_results", []),
                 },
             )
 

agent_framework_oci/Tuning-Performance/Normal/templates/agent_template_backend_day_zero/app/agents/billing_agent.py

@@ -108,6 +108,14 @@ class BillingAgent(AgentRuntimeMixin):
             "next_state": "BILLING_ACTIVE",
             "mcp_results": tool_context,
             "rag": rag_metadata,
+            "rag_context": rag_context,
+            "rag_results": [{
+                "intent": state.get("intent"),
+                "agent": self.name,
+                "source_text": str(state.get("sanitized_input") or state.get("user_text") or ""),
+                "metadata": rag_metadata,
+                **({"context": rag_context} if rag_context else {}),
+            }],
             "memory_context_metadata": state.get("memory_context_metadata"),
             **self.transaction_state_patch(state),
         }

agent_framework_oci/Tuning-Performance/Normal/templates/agent_template_backend_day_zero/app/agents/orders_agent.py

@@ -108,6 +108,14 @@ class OrdersAgent(AgentRuntimeMixin):
             "next_state": "ORDER_ACTIVE",
             "mcp_results": tool_context,
             "rag": rag_metadata,
+            "rag_context": rag_context,
+            "rag_results": [{
+                "intent": state.get("intent"),
+                "agent": self.name,
+                "source_text": str(state.get("sanitized_input") or state.get("user_text") or ""),
+                "metadata": rag_metadata,
+                **({"context": rag_context} if rag_context else {}),
+            }],
             "memory_context_metadata": state.get("memory_context_metadata"),
             **self.transaction_state_patch(state),
         }

agent_framework_oci/Tuning-Performance/Normal/templates/agent_template_backend_day_zero/app/agents/product_agent.py

@@ -108,6 +108,14 @@ class ProductAgent(AgentRuntimeMixin):
             "next_state": "PRODUCT_ACTIVE",
             "mcp_results": tool_context,
             "rag": rag_metadata,
+            "rag_context": rag_context,
+            "rag_results": [{
+                "intent": state.get("intent"),
+                "agent": self.name,
+                "source_text": str(state.get("sanitized_input") or state.get("user_text") or ""),
+                "metadata": rag_metadata,
+                **({"context": rag_context} if rag_context else {}),
+            }],
             "memory_context_metadata": state.get("memory_context_metadata"),
             **self.transaction_state_patch(state),
         }

agent_framework_oci/Tuning-Performance/Normal/templates/agent_template_backend_day_zero/app/agents/support_agent.py

@@ -108,6 +108,14 @@ class SupportAgent(AgentRuntimeMixin):
             "next_state": "SUPPORT_ACTIVE",
             "mcp_results": tool_context,
             "rag": rag_metadata,
+            "rag_context": rag_context,
+            "rag_results": [{
+                "intent": state.get("intent"),
+                "agent": self.name,
+                "source_text": str(state.get("sanitized_input") or state.get("user_text") or ""),
+                "metadata": rag_metadata,
+                **({"context": rag_context} if rag_context else {}),
+            }],
             "memory_context_metadata": state.get("memory_context_metadata"),
             **self.transaction_state_patch(state),
         }

agent_framework_oci/Tuning-Performance/Normal/templates/agent_template_backend_day_zero/app/main.py

@@ -361,6 +361,7 @@ async def _process_gateway_message(req: GatewayRequest, emit_sse: bool = False)
                     "domain": result.get("domain"),
                     "mcp_tools": result.get("mcp_tools"),
                     "mcp_results": result.get("mcp_results"),
+                    "rag_results": result.get("rag_results"),
                     "business_context": business_context.model_dump(),
                     "identity_missing": missing_identity_keys,
                     "judges": result.get("judge_results"),

agent_framework_oci/Tuning-Performance/Normal/templates/agent_template_backend_day_zero/app/state.py

@@ -23,6 +23,7 @@ class AgentState(TypedDict, total=False):
     domain: str
     mcp_tools: list[str]
     mcp_results: list[dict[str, Any]]
+    rag_results: list[dict[str, Any]]
     available_mcp_tools: list[str]
     selected_tool_call: dict[str, Any]
     pending_tool_call: dict[str, Any]

agent_framework_oci/Tuning-Performance/Normal/templates/agent_template_backend_day_zero/app/workflows/agent_graph.py

@@ -568,6 +568,7 @@ class AgentWorkflow:
                 "pending_topics": drained.pending_topics,
                 "handled_topics": drained.handled_topics,
                 "mcp_results": drained.mcp_results,
+                "rag_results": drained.rag_results,
                 "output_guardrails_already_applied": False,
                 "supervisor_action": "disabled",
                 "supervisor_attempt": int(state.get("supervisor_attempt", 0)),
@@ -575,7 +576,11 @@ class AgentWorkflow:
 
         context = {
             **(state.get("context") or {}),
-            "evidence": drained.mcp_results or (state.get("context") or {}).get("evidence"),
+            "evidence": (list(drained.mcp_results) + list(drained.rag_results)) or (state.get("context") or {}).get("evidence"),
+            "tool_result": drained.mcp_results or (state.get("context") or {}).get("tool_result"),
+            "tool_executed": any(isinstance(item, dict) and item.get("ok") for item in drained.mcp_results),
+            "mcp_results": drained.mcp_results,
+            "evidence": (list(drained.mcp_results) + list(drained.rag_results)) or (state.get("context") or {}).get("evidence"),
             "tool_result": drained.mcp_results or (state.get("context") or {}).get("tool_result"),
             "tool_executed": any(isinstance(item, dict) and item.get("ok") for item in drained.mcp_results),
             "mcp_results": drained.mcp_results,
@@ -648,6 +653,7 @@ class AgentWorkflow:
                 "pending_topics": drained.pending_topics,
                 "handled_topics": drained.handled_topics,
                 "mcp_results": drained.mcp_results,
+                "rag_results": drained.rag_results,
                 "guardrail_decisions": state.get("guardrail_decisions", [])
                 + [item for r in decision.results for item in (r.metadata or {}).get("legacy_decisions", [])],
             }
@@ -805,6 +811,7 @@ class AgentWorkflow:
                     "judges": state.get("judge_results", []),
                     "mcp_tools": state.get("mcp_tools", []),
                     "mcp_results": state.get("mcp_results", []),
+                    "rag_results": state.get("rag_results", []),
                 },
             )
 

agent_framework_oci/Tuning-Performance/Route_Stickness/templates/agent_template_backend/app/agents/billing_agent.py

@@ -108,6 +108,14 @@ class BillingAgent(AgentRuntimeMixin):
             "next_state": "BILLING_ACTIVE",
             "mcp_results": tool_context,
             "rag": rag_metadata,
+            "rag_context": rag_context,
+            "rag_results": [{
+                "intent": state.get("intent"),
+                "agent": self.name,
+                "source_text": str(state.get("sanitized_input") or state.get("user_text") or ""),
+                "metadata": rag_metadata,
+                **({"context": rag_context} if rag_context else {}),
+            }],
             "memory_context_metadata": state.get("memory_context_metadata"),
             **self.transaction_state_patch(state),
         }

agent_framework_oci/Tuning-Performance/Route_Stickness/templates/agent_template_backend/app/agents/orders_agent.py

@@ -108,6 +108,14 @@ class OrdersAgent(AgentRuntimeMixin):
             "next_state": "ORDER_ACTIVE",
             "mcp_results": tool_context,
             "rag": rag_metadata,
+            "rag_context": rag_context,
+            "rag_results": [{
+                "intent": state.get("intent"),
+                "agent": self.name,
+                "source_text": str(state.get("sanitized_input") or state.get("user_text") or ""),
+                "metadata": rag_metadata,
+                **({"context": rag_context} if rag_context else {}),
+            }],
             "memory_context_metadata": state.get("memory_context_metadata"),
             **self.transaction_state_patch(state),
         }

agent_framework_oci/Tuning-Performance/Route_Stickness/templates/agent_template_backend/app/agents/product_agent.py

@@ -108,6 +108,14 @@ class ProductAgent(AgentRuntimeMixin):
             "next_state": "PRODUCT_ACTIVE",
             "mcp_results": tool_context,
             "rag": rag_metadata,
+            "rag_context": rag_context,
+            "rag_results": [{
+                "intent": state.get("intent"),
+                "agent": self.name,
+                "source_text": str(state.get("sanitized_input") or state.get("user_text") or ""),
+                "metadata": rag_metadata,
+                **({"context": rag_context} if rag_context else {}),
+            }],
             "memory_context_metadata": state.get("memory_context_metadata"),
             **self.transaction_state_patch(state),
         }

agent_framework_oci/Tuning-Performance/Route_Stickness/templates/agent_template_backend/app/agents/support_agent.py

@@ -108,6 +108,14 @@ class SupportAgent(AgentRuntimeMixin):
             "next_state": "SUPPORT_ACTIVE",
             "mcp_results": tool_context,
             "rag": rag_metadata,
+            "rag_context": rag_context,
+            "rag_results": [{
+                "intent": state.get("intent"),
+                "agent": self.name,
+                "source_text": str(state.get("sanitized_input") or state.get("user_text") or ""),
+                "metadata": rag_metadata,
+                **({"context": rag_context} if rag_context else {}),
+            }],
             "memory_context_metadata": state.get("memory_context_metadata"),
             **self.transaction_state_patch(state),
         }

agent_framework_oci/Tuning-Performance/Route_Stickness/templates/agent_template_backend/app/main.py

@@ -361,6 +361,7 @@ async def _process_gateway_message(req: GatewayRequest, emit_sse: bool = False)
                     "domain": result.get("domain"),
                     "mcp_tools": result.get("mcp_tools"),
                     "mcp_results": result.get("mcp_results"),
+                    "rag_results": result.get("rag_results"),
                     "business_context": business_context.model_dump(),
                     "identity_missing": missing_identity_keys,
                     "judges": result.get("judge_results"),

agent_framework_oci/Tuning-Performance/Route_Stickness/templates/agent_template_backend/app/state.py

@@ -23,6 +23,7 @@ class AgentState(TypedDict, total=False):
     domain: str
     mcp_tools: list[str]
     mcp_results: list[dict[str, Any]]
+    rag_results: list[dict[str, Any]]
     available_mcp_tools: list[str]
     selected_tool_call: dict[str, Any]
     pending_tool_call: dict[str, Any]

agent_framework_oci/Tuning-Performance/Route_Stickness/templates/agent_template_backend/app/workflows/agent_graph.py

@@ -568,6 +568,7 @@ class AgentWorkflow:
                 "pending_topics": drained.pending_topics,
                 "handled_topics": drained.handled_topics,
                 "mcp_results": drained.mcp_results,
+                "rag_results": drained.rag_results,
                 "output_guardrails_already_applied": False,
                 "supervisor_action": "disabled",
                 "supervisor_attempt": int(state.get("supervisor_attempt", 0)),
@@ -575,7 +576,11 @@ class AgentWorkflow:
 
         context = {
             **(state.get("context") or {}),
-            "evidence": drained.mcp_results or (state.get("context") or {}).get("evidence"),
+            "evidence": (list(drained.mcp_results) + list(drained.rag_results)) or (state.get("context") or {}).get("evidence"),
+            "tool_result": drained.mcp_results or (state.get("context") or {}).get("tool_result"),
+            "tool_executed": any(isinstance(item, dict) and item.get("ok") for item in drained.mcp_results),
+            "mcp_results": drained.mcp_results,
+            "evidence": (list(drained.mcp_results) + list(drained.rag_results)) or (state.get("context") or {}).get("evidence"),
             "tool_result": drained.mcp_results or (state.get("context") or {}).get("tool_result"),
             "tool_executed": any(isinstance(item, dict) and item.get("ok") for item in drained.mcp_results),
             "mcp_results": drained.mcp_results,
@@ -648,6 +653,7 @@ class AgentWorkflow:
                 "pending_topics": drained.pending_topics,
                 "handled_topics": drained.handled_topics,
                 "mcp_results": drained.mcp_results,
+                "rag_results": drained.rag_results,
                 "guardrail_decisions": state.get("guardrail_decisions", [])
                 + [item for r in decision.results for item in (r.metadata or {}).get("legacy_decisions", [])],
             }
@@ -805,6 +811,7 @@ class AgentWorkflow:
                     "judges": state.get("judge_results", []),
                     "mcp_tools": state.get("mcp_tools", []),
                     "mcp_results": state.get("mcp_results", []),
+                    "rag_results": state.get("rag_results", []),
                 },
             )
 

agent_framework_oci/Tuning-Performance/Route_Stickness/templates/agent_template_backend_day_zero/app/agents/billing_agent.py

@@ -108,6 +108,14 @@ class BillingAgent(AgentRuntimeMixin):
             "next_state": "BILLING_ACTIVE",
             "mcp_results": tool_context,
             "rag": rag_metadata,
+            "rag_context": rag_context,
+            "rag_results": [{
+                "intent": state.get("intent"),
+                "agent": self.name,
+                "source_text": str(state.get("sanitized_input") or state.get("user_text") or ""),
+                "metadata": rag_metadata,
+                **({"context": rag_context} if rag_context else {}),
+            }],
             "memory_context_metadata": state.get("memory_context_metadata"),
             **self.transaction_state_patch(state),
         }

agent_framework_oci/Tuning-Performance/Route_Stickness/templates/agent_template_backend_day_zero/app/agents/orders_agent.py

@@ -108,6 +108,14 @@ class OrdersAgent(AgentRuntimeMixin):
             "next_state": "ORDER_ACTIVE",
             "mcp_results": tool_context,
             "rag": rag_metadata,
+            "rag_context": rag_context,
+            "rag_results": [{
+                "intent": state.get("intent"),
+                "agent": self.name,
+                "source_text": str(state.get("sanitized_input") or state.get("user_text") or ""),
+                "metadata": rag_metadata,
+                **({"context": rag_context} if rag_context else {}),
+            }],
             "memory_context_metadata": state.get("memory_context_metadata"),
             **self.transaction_state_patch(state),
         }

agent_framework_oci/Tuning-Performance/Route_Stickness/templates/agent_template_backend_day_zero/app/agents/product_agent.py

@@ -108,6 +108,14 @@ class ProductAgent(AgentRuntimeMixin):
             "next_state": "PRODUCT_ACTIVE",
             "mcp_results": tool_context,
             "rag": rag_metadata,
+            "rag_context": rag_context,
+            "rag_results": [{
+                "intent": state.get("intent"),
+                "agent": self.name,
+                "source_text": str(state.get("sanitized_input") or state.get("user_text") or ""),
+                "metadata": rag_metadata,
+                **({"context": rag_context} if rag_context else {}),
+            }],
             "memory_context_metadata": state.get("memory_context_metadata"),
             **self.transaction_state_patch(state),
         }

agent_framework_oci/Tuning-Performance/Route_Stickness/templates/agent_template_backend_day_zero/app/agents/support_agent.py

@@ -108,6 +108,14 @@ class SupportAgent(AgentRuntimeMixin):
             "next_state": "SUPPORT_ACTIVE",
             "mcp_results": tool_context,
             "rag": rag_metadata,
+            "rag_context": rag_context,
+            "rag_results": [{
+                "intent": state.get("intent"),
+                "agent": self.name,
+                "source_text": str(state.get("sanitized_input") or state.get("user_text") or ""),
+                "metadata": rag_metadata,
+                **({"context": rag_context} if rag_context else {}),
+            }],
             "memory_context_metadata": state.get("memory_context_metadata"),
             **self.transaction_state_patch(state),
         }

agent_framework_oci/Tuning-Performance/Route_Stickness/templates/agent_template_backend_day_zero/app/main.py

@@ -361,6 +361,7 @@ async def _process_gateway_message(req: GatewayRequest, emit_sse: bool = False)
                     "domain": result.get("domain"),
                     "mcp_tools": result.get("mcp_tools"),
                     "mcp_results": result.get("mcp_results"),
+                    "rag_results": result.get("rag_results"),
                     "business_context": business_context.model_dump(),
                     "identity_missing": missing_identity_keys,
                     "judges": result.get("judge_results"),

agent_framework_oci/Tuning-Performance/Route_Stickness/templates/agent_template_backend_day_zero/app/state.py

@@ -23,6 +23,7 @@ class AgentState(TypedDict, total=False):
     domain: str
     mcp_tools: list[str]
     mcp_results: list[dict[str, Any]]
+    rag_results: list[dict[str, Any]]
     available_mcp_tools: list[str]
     selected_tool_call: dict[str, Any]
     pending_tool_call: dict[str, Any]

agent_framework_oci/Tuning-Performance/Route_Stickness/templates/agent_template_backend_day_zero/app/workflows/agent_graph.py

@@ -568,6 +568,7 @@ class AgentWorkflow:
                 "pending_topics": drained.pending_topics,
                 "handled_topics": drained.handled_topics,
                 "mcp_results": drained.mcp_results,
+                "rag_results": drained.rag_results,
                 "output_guardrails_already_applied": False,
                 "supervisor_action": "disabled",
                 "supervisor_attempt": int(state.get("supervisor_attempt", 0)),
@@ -575,7 +576,11 @@ class AgentWorkflow:
 
         context = {
             **(state.get("context") or {}),
-            "evidence": drained.mcp_results or (state.get("context") or {}).get("evidence"),
+            "evidence": (list(drained.mcp_results) + list(drained.rag_results)) or (state.get("context") or {}).get("evidence"),
+            "tool_result": drained.mcp_results or (state.get("context") or {}).get("tool_result"),
+            "tool_executed": any(isinstance(item, dict) and item.get("ok") for item in drained.mcp_results),
+            "mcp_results": drained.mcp_results,
+            "evidence": (list(drained.mcp_results) + list(drained.rag_results)) or (state.get("context") or {}).get("evidence"),
             "tool_result": drained.mcp_results or (state.get("context") or {}).get("tool_result"),
             "tool_executed": any(isinstance(item, dict) and item.get("ok") for item in drained.mcp_results),
             "mcp_results": drained.mcp_results,
@@ -648,6 +653,7 @@ class AgentWorkflow:
                 "pending_topics": drained.pending_topics,
                 "handled_topics": drained.handled_topics,
                 "mcp_results": drained.mcp_results,
+                "rag_results": drained.rag_results,
                 "guardrail_decisions": state.get("guardrail_decisions", [])
                 + [item for r in decision.results for item in (r.metadata or {}).get("legacy_decisions", [])],
             }
@@ -805,6 +811,7 @@ class AgentWorkflow:
                     "judges": state.get("judge_results", []),
                     "mcp_tools": state.get("mcp_tools", []),
                     "mcp_results": state.get("mcp_results", []),
+                    "rag_results": state.get("rag_results", []),
                 },
             )
 

agent_framework_oci/Tuning-Performance/Transaction_Evidence/agent_template_backend/app/agents/billing_agent.py

@@ -108,6 +108,14 @@ class BillingAgent(AgentRuntimeMixin):
             "next_state": "BILLING_ACTIVE",
             "mcp_results": tool_context,
             "rag": rag_metadata,
+            "rag_context": rag_context,
+            "rag_results": [{
+                "intent": state.get("intent"),
+                "agent": self.name,
+                "source_text": str(state.get("sanitized_input") or state.get("user_text") or ""),
+                "metadata": rag_metadata,
+                **({"context": rag_context} if rag_context else {}),
+            }],
             "memory_context_metadata": state.get("memory_context_metadata"),
             **self.transaction_state_patch(state),
         }

agent_framework_oci/Tuning-Performance/Transaction_Evidence/agent_template_backend/app/agents/orders_agent.py

@@ -108,6 +108,14 @@ class OrdersAgent(AgentRuntimeMixin):
             "next_state": "ORDER_ACTIVE",
             "mcp_results": tool_context,
             "rag": rag_metadata,
+            "rag_context": rag_context,
+            "rag_results": [{
+                "intent": state.get("intent"),
+                "agent": self.name,
+                "source_text": str(state.get("sanitized_input") or state.get("user_text") or ""),
+                "metadata": rag_metadata,
+                **({"context": rag_context} if rag_context else {}),
+            }],
             "memory_context_metadata": state.get("memory_context_metadata"),
             **self.transaction_state_patch(state),
         }

agent_framework_oci/Tuning-Performance/Transaction_Evidence/agent_template_backend/app/agents/product_agent.py

@@ -108,6 +108,14 @@ class ProductAgent(AgentRuntimeMixin):
             "next_state": "PRODUCT_ACTIVE",
             "mcp_results": tool_context,
             "rag": rag_metadata,
+            "rag_context": rag_context,
+            "rag_results": [{
+                "intent": state.get("intent"),
+                "agent": self.name,
+                "source_text": str(state.get("sanitized_input") or state.get("user_text") or ""),
+                "metadata": rag_metadata,
+                **({"context": rag_context} if rag_context else {}),
+            }],
             "memory_context_metadata": state.get("memory_context_metadata"),
             **self.transaction_state_patch(state),
         }

agent_framework_oci/Tuning-Performance/Transaction_Evidence/agent_template_backend/app/agents/support_agent.py

@@ -108,6 +108,14 @@ class SupportAgent(AgentRuntimeMixin):
             "next_state": "SUPPORT_ACTIVE",
             "mcp_results": tool_context,
             "rag": rag_metadata,
+            "rag_context": rag_context,
+            "rag_results": [{
+                "intent": state.get("intent"),
+                "agent": self.name,
+                "source_text": str(state.get("sanitized_input") or state.get("user_text") or ""),
+                "metadata": rag_metadata,
+                **({"context": rag_context} if rag_context else {}),
+            }],
             "memory_context_metadata": state.get("memory_context_metadata"),
             **self.transaction_state_patch(state),
         }

agent_framework_oci/Tuning-Performance/Transaction_Evidence/agent_template_backend/app/main.py

@@ -460,6 +460,7 @@ async def _process_gateway_message(req: GatewayRequest, emit_sse: bool = False)
                     "domain": result.get("domain"),
                     "mcp_tools": result.get("mcp_tools"),
                     "mcp_results": result.get("mcp_results"),
+                    "rag_results": result.get("rag_results"),
                     "transaction_evidence": result.get("relevant_transaction_evidence", []),
                     "business_context": business_context.model_dump(),
                     "identity_missing": missing_identity_keys,

agent_framework_oci/Tuning-Performance/Transaction_Evidence/agent_template_backend/app/state.py

@@ -23,6 +23,7 @@ class AgentState(TypedDict, total=False):
     domain: str
     mcp_tools: list[str]
     mcp_results: list[dict[str, Any]]
+    rag_results: list[dict[str, Any]]
     available_mcp_tools: list[str]
     selected_tool_call: dict[str, Any]
     pending_tool_call: dict[str, Any]

agent_framework_oci/Tuning-Performance/Transaction_Evidence/agent_template_backend/app/workflows/agent_graph.py

@@ -570,6 +570,7 @@ class AgentWorkflow:
                 "pending_topics": drained.pending_topics,
                 "handled_topics": drained.handled_topics,
                 "mcp_results": drained.mcp_results,
+                "rag_results": drained.rag_results,
                 "output_guardrails_already_applied": False,
                 "supervisor_action": "disabled",
                 "supervisor_attempt": int(state.get("supervisor_attempt", 0)),
@@ -577,7 +578,11 @@ class AgentWorkflow:
 
         context = {
             **(state.get("context") or {}),
-            "evidence": drained.mcp_results or (state.get("context") or {}).get("evidence"),
+            "evidence": (list(drained.mcp_results) + list(drained.rag_results)) or (state.get("context") or {}).get("evidence"),
+            "tool_result": drained.mcp_results or (state.get("context") or {}).get("tool_result"),
+            "tool_executed": any(isinstance(item, dict) and item.get("ok") for item in drained.mcp_results),
+            "mcp_results": drained.mcp_results,
+            "evidence": (list(drained.mcp_results) + list(drained.rag_results)) or (state.get("context") or {}).get("evidence"),
             "tool_result": drained.mcp_results or (state.get("context") or {}).get("tool_result"),
             "tool_executed": any(isinstance(item, dict) and item.get("ok") for item in drained.mcp_results),
             "mcp_results": drained.mcp_results,
@@ -650,6 +655,7 @@ class AgentWorkflow:
                 "pending_topics": drained.pending_topics,
                 "handled_topics": drained.handled_topics,
                 "mcp_results": drained.mcp_results,
+                "rag_results": drained.rag_results,
                 "guardrail_decisions": state.get("guardrail_decisions", [])
                 + [item for r in decision.results for item in (r.metadata or {}).get("legacy_decisions", [])],
             }
@@ -733,6 +739,7 @@ class AgentWorkflow:
             relevant_transaction_evidence = list(state.get("relevant_transaction_evidence") or [])
             judge_context["transaction_evidence"] = relevant_transaction_evidence
             current_evidence = list(state.get("mcp_results", []) or [])
+            current_evidence.extend(state.get("rag_results", []) or [])
             current_evidence.extend(relevant_transaction_evidence)
             judge_context["evidence"] = current_evidence or judge_context.get("evidence")
             judge_context["route"] = state.get("route")
@@ -880,6 +887,7 @@ class AgentWorkflow:
                     "judges": state.get("judge_results", []),
                     "mcp_tools": state.get("mcp_tools", []),
                     "mcp_results": state.get("mcp_results", []),
+                    "rag_results": state.get("rag_results", []),
                     "transaction_evidence": state.get("relevant_transaction_evidence", []),
                 },
             )

agent_framework_oci/Tuning-Performance/Transaction_Pre_Validation/agent_template_backend/app/agents/billing_agent.py

@@ -108,6 +108,14 @@ class BillingAgent(AgentRuntimeMixin):
             "next_state": "BILLING_ACTIVE",
             "mcp_results": tool_context,
             "rag": rag_metadata,
+            "rag_context": rag_context,
+            "rag_results": [{
+                "intent": state.get("intent"),
+                "agent": self.name,
+                "source_text": str(state.get("sanitized_input") or state.get("user_text") or ""),
+                "metadata": rag_metadata,
+                **({"context": rag_context} if rag_context else {}),
+            }],
             "memory_context_metadata": state.get("memory_context_metadata"),
             **self.transaction_state_patch(state),
         }

agent_framework_oci/Tuning-Performance/Transaction_Pre_Validation/agent_template_backend/app/agents/orders_agent.py

@@ -108,6 +108,14 @@ class OrdersAgent(AgentRuntimeMixin):
             "next_state": "ORDER_ACTIVE",
             "mcp_results": tool_context,
             "rag": rag_metadata,
+            "rag_context": rag_context,
+            "rag_results": [{
+                "intent": state.get("intent"),
+                "agent": self.name,
+                "source_text": str(state.get("sanitized_input") or state.get("user_text") or ""),
+                "metadata": rag_metadata,
+                **({"context": rag_context} if rag_context else {}),
+            }],
             "memory_context_metadata": state.get("memory_context_metadata"),
             **self.transaction_state_patch(state),
         }

agent_framework_oci/Tuning-Performance/Transaction_Pre_Validation/agent_template_backend/app/agents/product_agent.py

@@ -108,6 +108,14 @@ class ProductAgent(AgentRuntimeMixin):
             "next_state": "PRODUCT_ACTIVE",
             "mcp_results": tool_context,
             "rag": rag_metadata,
+            "rag_context": rag_context,
+            "rag_results": [{
+                "intent": state.get("intent"),
+                "agent": self.name,
+                "source_text": str(state.get("sanitized_input") or state.get("user_text") or ""),
+                "metadata": rag_metadata,
+                **({"context": rag_context} if rag_context else {}),
+            }],
             "memory_context_metadata": state.get("memory_context_metadata"),
             **self.transaction_state_patch(state),
         }

agent_framework_oci/Tuning-Performance/Transaction_Pre_Validation/agent_template_backend/app/agents/support_agent.py

@@ -108,6 +108,14 @@ class SupportAgent(AgentRuntimeMixin):
             "next_state": "SUPPORT_ACTIVE",
             "mcp_results": tool_context,
             "rag": rag_metadata,
+            "rag_context": rag_context,
+            "rag_results": [{
+                "intent": state.get("intent"),
+                "agent": self.name,
+                "source_text": str(state.get("sanitized_input") or state.get("user_text") or ""),
+                "metadata": rag_metadata,
+                **({"context": rag_context} if rag_context else {}),
+            }],
             "memory_context_metadata": state.get("memory_context_metadata"),
             **self.transaction_state_patch(state),
         }

agent_framework_oci/Tuning-Performance/Transaction_Pre_Validation/agent_template_backend/app/main.py

@@ -460,6 +460,7 @@ async def _process_gateway_message(req: GatewayRequest, emit_sse: bool = False)
                     "domain": result.get("domain"),
                     "mcp_tools": result.get("mcp_tools"),
                     "mcp_results": result.get("mcp_results"),
+                    "rag_results": result.get("rag_results"),
                     "transaction_evidence": result.get("relevant_transaction_evidence", []),
                     "transaction_pre_validation": result.get("transaction_pre_validation"),
                     "business_context": business_context.model_dump(),

agent_framework_oci/Tuning-Performance/Transaction_Pre_Validation/agent_template_backend/app/state.py

@@ -23,6 +23,7 @@ class AgentState(TypedDict, total=False):
     domain: str
     mcp_tools: list[str]
     mcp_results: list[dict[str, Any]]
+    rag_results: list[dict[str, Any]]
     available_mcp_tools: list[str]
     selected_tool_call: dict[str, Any]
     pending_tool_call: dict[str, Any]

agent_framework_oci/Tuning-Performance/Transaction_Pre_Validation/agent_template_backend/app/workflows/agent_graph.py

@@ -570,6 +570,7 @@ class AgentWorkflow:
                 "pending_topics": drained.pending_topics,
                 "handled_topics": drained.handled_topics,
                 "mcp_results": drained.mcp_results,
+                "rag_results": drained.rag_results,
                 "output_guardrails_already_applied": False,
                 "supervisor_action": "disabled",
                 "supervisor_attempt": int(state.get("supervisor_attempt", 0)),
@@ -577,7 +578,11 @@ class AgentWorkflow:
 
         context = {
             **(state.get("context") or {}),
-            "evidence": drained.mcp_results or (state.get("context") or {}).get("evidence"),
+            "evidence": (list(drained.mcp_results) + list(drained.rag_results)) or (state.get("context") or {}).get("evidence"),
+            "tool_result": drained.mcp_results or (state.get("context") or {}).get("tool_result"),
+            "tool_executed": any(isinstance(item, dict) and item.get("ok") for item in drained.mcp_results),
+            "mcp_results": drained.mcp_results,
+            "evidence": (list(drained.mcp_results) + list(drained.rag_results)) or (state.get("context") or {}).get("evidence"),
             "tool_result": drained.mcp_results or (state.get("context") or {}).get("tool_result"),
             "tool_executed": any(isinstance(item, dict) and item.get("ok") for item in drained.mcp_results),
             "mcp_results": drained.mcp_results,
@@ -650,6 +655,7 @@ class AgentWorkflow:
                 "pending_topics": drained.pending_topics,
                 "handled_topics": drained.handled_topics,
                 "mcp_results": drained.mcp_results,
+                "rag_results": drained.rag_results,
                 "guardrail_decisions": state.get("guardrail_decisions", [])
                 + [item for r in decision.results for item in (r.metadata or {}).get("legacy_decisions", [])],
             }
@@ -733,6 +739,7 @@ class AgentWorkflow:
             relevant_transaction_evidence = list(state.get("relevant_transaction_evidence") or [])
             judge_context["transaction_evidence"] = relevant_transaction_evidence
             current_evidence = list(state.get("mcp_results", []) or [])
+            current_evidence.extend(state.get("rag_results", []) or [])
             current_evidence.extend(relevant_transaction_evidence)
             judge_context["evidence"] = current_evidence or judge_context.get("evidence")
             judge_context["route"] = state.get("route")
@@ -880,6 +887,7 @@ class AgentWorkflow:
                     "judges": state.get("judge_results", []),
                     "mcp_tools": state.get("mcp_tools", []),
                     "mcp_results": state.get("mcp_results", []),
+                    "rag_results": state.get("rag_results", []),
                     "transaction_evidence": state.get("relevant_transaction_evidence", []),
                 },
             )