Merge branch 'main' into devin/1763865883-anthropic-extended-thinking

2025-12-15 20:08:29 +00:00 · 2025-11-24 09:54:40 -08:00
parent 9b7d475750 9da1f0c0aa
commit 9ca58e2b8f
6 changed files with 1939 additions and 1989 deletions
--- a/lib/crewai/src/crewai/events/event_listener.py
+++ b/lib/crewai/src/crewai/events/event_listener.py
@@ -101,24 +101,25 @@ if TYPE_CHECKING:


 class EventListener(BaseEventListener):
-    _instance = None
+    _instance: EventListener | None = None
+    _initialized: bool = False
    _telemetry: Telemetry = PrivateAttr(default_factory=lambda: Telemetry())
-    logger = Logger(verbose=True, default_color=EMITTER_COLOR)
+    logger: Logger = Logger(verbose=True, default_color=EMITTER_COLOR)
    execution_spans: dict[Task, Any] = Field(default_factory=dict)
-    next_chunk = 0
-    text_stream = StringIO()
-    knowledge_retrieval_in_progress = False
-    knowledge_query_in_progress = False
+    next_chunk: int = 0
+    text_stream: StringIO = StringIO()
+    knowledge_retrieval_in_progress: bool = False
+    knowledge_query_in_progress: bool = False
    method_branches: dict[str, Any] = Field(default_factory=dict)

-    def __new__(cls):
+    def __new__(cls) -> EventListener:
        if cls._instance is None:
            cls._instance = super().__new__(cls)
            cls._instance._initialized = False
        return cls._instance

-    def __init__(self):
-        if not hasattr(self, "_initialized") or not self._initialized:
+    def __init__(self) -> None:
+        if not self._initialized:
            super().__init__()
            self._telemetry = Telemetry()
            self._telemetry.set_tracer()
@@ -136,14 +137,14 @@ class EventListener(BaseEventListener):

    def setup_listeners(self, crewai_event_bus: CrewAIEventsBus) -> None:
        @crewai_event_bus.on(CrewKickoffStartedEvent)
-        def on_crew_started(source, event: CrewKickoffStartedEvent) -> None:
+        def on_crew_started(source: Any, event: CrewKickoffStartedEvent) -> None:
            with self._crew_tree_lock:
                self.formatter.create_crew_tree(event.crew_name or "Crew", source.id)
                self._telemetry.crew_execution_span(source, event.inputs)
                self._crew_tree_lock.notify_all()

        @crewai_event_bus.on(CrewKickoffCompletedEvent)
-        def on_crew_completed(source, event: CrewKickoffCompletedEvent) -> None:
+        def on_crew_completed(source: Any, event: CrewKickoffCompletedEvent) -> None:
            # Handle telemetry
            final_string_output = event.output.raw
            self._telemetry.end_crew(source, final_string_output)
@@ -157,7 +158,7 @@ class EventListener(BaseEventListener):
            )

        @crewai_event_bus.on(CrewKickoffFailedEvent)
-        def on_crew_failed(source, event: CrewKickoffFailedEvent) -> None:
+        def on_crew_failed(source: Any, event: CrewKickoffFailedEvent) -> None:
            self.formatter.update_crew_tree(
                self.formatter.current_crew_tree,
                event.crew_name or "Crew",
@@ -166,23 +167,23 @@ class EventListener(BaseEventListener):
            )

        @crewai_event_bus.on(CrewTrainStartedEvent)
-        def on_crew_train_started(source, event: CrewTrainStartedEvent) -> None:
+        def on_crew_train_started(_: Any, event: CrewTrainStartedEvent) -> None:
            self.formatter.handle_crew_train_started(
                event.crew_name or "Crew", str(event.timestamp)
            )

        @crewai_event_bus.on(CrewTrainCompletedEvent)
-        def on_crew_train_completed(source, event: CrewTrainCompletedEvent) -> None:
+        def on_crew_train_completed(_: Any, event: CrewTrainCompletedEvent) -> None:
            self.formatter.handle_crew_train_completed(
                event.crew_name or "Crew", str(event.timestamp)
            )

        @crewai_event_bus.on(CrewTrainFailedEvent)
-        def on_crew_train_failed(source, event: CrewTrainFailedEvent) -> None:
+        def on_crew_train_failed(_: Any, event: CrewTrainFailedEvent) -> None:
            self.formatter.handle_crew_train_failed(event.crew_name or "Crew")

        @crewai_event_bus.on(CrewTestResultEvent)
-        def on_crew_test_result(source, event: CrewTestResultEvent) -> None:
+        def on_crew_test_result(source: Any, event: CrewTestResultEvent) -> None:
            self._telemetry.individual_test_result_span(
                source.crew,
                event.quality,
@@ -193,7 +194,7 @@ class EventListener(BaseEventListener):
        # ----------- TASK EVENTS -----------

        @crewai_event_bus.on(TaskStartedEvent)
-        def on_task_started(source, event: TaskStartedEvent) -> None:
+        def on_task_started(source: Any, event: TaskStartedEvent) -> None:
            span = self._telemetry.task_started(crew=source.agent.crew, task=source)
            self.execution_spans[source] = span

@@ -211,7 +212,7 @@ class EventListener(BaseEventListener):
                )

        @crewai_event_bus.on(TaskCompletedEvent)
-        def on_task_completed(source, event: TaskCompletedEvent):
+        def on_task_completed(source: Any, event: TaskCompletedEvent) -> None:
            # Handle telemetry
            span = self.execution_spans.get(source)
            if span:
@@ -229,7 +230,7 @@ class EventListener(BaseEventListener):
            )

        @crewai_event_bus.on(TaskFailedEvent)
-        def on_task_failed(source, event: TaskFailedEvent):
+        def on_task_failed(source: Any, event: TaskFailedEvent) -> None:
            span = self.execution_spans.get(source)
            if span:
                if source.agent and source.agent.crew:
@@ -249,7 +250,9 @@ class EventListener(BaseEventListener):
        # ----------- AGENT EVENTS -----------

        @crewai_event_bus.on(AgentExecutionStartedEvent)
-        def on_agent_execution_started(source, event: AgentExecutionStartedEvent):
+        def on_agent_execution_started(
+            _: Any, event: AgentExecutionStartedEvent
+        ) -> None:
            self.formatter.create_agent_branch(
                self.formatter.current_task_branch,
                event.agent.role,
@@ -257,7 +260,9 @@ class EventListener(BaseEventListener):
            )

        @crewai_event_bus.on(AgentExecutionCompletedEvent)
-        def on_agent_execution_completed(source, event: AgentExecutionCompletedEvent):
+        def on_agent_execution_completed(
+            _: Any, event: AgentExecutionCompletedEvent
+        ) -> None:
            self.formatter.update_agent_status(
                self.formatter.current_agent_branch,
                event.agent.role,
@@ -268,8 +273,8 @@ class EventListener(BaseEventListener):

        @crewai_event_bus.on(LiteAgentExecutionStartedEvent)
        def on_lite_agent_execution_started(
-            source, event: LiteAgentExecutionStartedEvent
-        ):
+            _: Any, event: LiteAgentExecutionStartedEvent
+        ) -> None:
            """Handle LiteAgent execution started event."""
            self.formatter.handle_lite_agent_execution(
                event.agent_info["role"], status="started", **event.agent_info
@@ -277,15 +282,17 @@ class EventListener(BaseEventListener):

        @crewai_event_bus.on(LiteAgentExecutionCompletedEvent)
        def on_lite_agent_execution_completed(
-            source, event: LiteAgentExecutionCompletedEvent
-        ):
+            _: Any, event: LiteAgentExecutionCompletedEvent
+        ) -> None:
            """Handle LiteAgent execution completed event."""
            self.formatter.handle_lite_agent_execution(
                event.agent_info["role"], status="completed", **event.agent_info
            )

        @crewai_event_bus.on(LiteAgentExecutionErrorEvent)
-        def on_lite_agent_execution_error(source, event: LiteAgentExecutionErrorEvent):
+        def on_lite_agent_execution_error(
+            _: Any, event: LiteAgentExecutionErrorEvent
+        ) -> None:
            """Handle LiteAgent execution error event."""
            self.formatter.handle_lite_agent_execution(
                event.agent_info["role"],
@@ -297,26 +304,28 @@ class EventListener(BaseEventListener):
        # ----------- FLOW EVENTS -----------

        @crewai_event_bus.on(FlowCreatedEvent)
-        def on_flow_created(source, event: FlowCreatedEvent):
+        def on_flow_created(_: Any, event: FlowCreatedEvent) -> None:
            self._telemetry.flow_creation_span(event.flow_name)
-            tree = self.formatter.create_flow_tree(event.flow_name, str(source.flow_id))
-            self.formatter.current_flow_tree = tree

        @crewai_event_bus.on(FlowStartedEvent)
-        def on_flow_started(source, event: FlowStartedEvent):
+        def on_flow_started(source: Any, event: FlowStartedEvent) -> None:
            self._telemetry.flow_execution_span(
                event.flow_name, list(source._methods.keys())
            )
+            tree = self.formatter.create_flow_tree(event.flow_name, str(source.flow_id))
+            self.formatter.current_flow_tree = tree
            self.formatter.start_flow(event.flow_name, str(source.flow_id))

        @crewai_event_bus.on(FlowFinishedEvent)
-        def on_flow_finished(source, event: FlowFinishedEvent):
+        def on_flow_finished(source: Any, event: FlowFinishedEvent) -> None:
            self.formatter.update_flow_status(
                self.formatter.current_flow_tree, event.flow_name, source.flow_id
            )

        @crewai_event_bus.on(MethodExecutionStartedEvent)
-        def on_method_execution_started(source, event: MethodExecutionStartedEvent):
+        def on_method_execution_started(
+            _: Any, event: MethodExecutionStartedEvent
+        ) -> None:
            method_branch = self.method_branches.get(event.method_name)
            updated_branch = self.formatter.update_method_status(
                method_branch,
@@ -327,7 +336,9 @@ class EventListener(BaseEventListener):
            self.method_branches[event.method_name] = updated_branch

        @crewai_event_bus.on(MethodExecutionFinishedEvent)
-        def on_method_execution_finished(source, event: MethodExecutionFinishedEvent):
+        def on_method_execution_finished(
+            _: Any, event: MethodExecutionFinishedEvent
+        ) -> None:
            method_branch = self.method_branches.get(event.method_name)
            updated_branch = self.formatter.update_method_status(
                method_branch,
@@ -338,7 +349,9 @@ class EventListener(BaseEventListener):
            self.method_branches[event.method_name] = updated_branch

        @crewai_event_bus.on(MethodExecutionFailedEvent)
-        def on_method_execution_failed(source, event: MethodExecutionFailedEvent):
+        def on_method_execution_failed(
+            _: Any, event: MethodExecutionFailedEvent
+        ) -> None:
            method_branch = self.method_branches.get(event.method_name)
            updated_branch = self.formatter.update_method_status(
                method_branch,
@@ -351,7 +364,7 @@ class EventListener(BaseEventListener):
        # ----------- TOOL USAGE EVENTS -----------

        @crewai_event_bus.on(ToolUsageStartedEvent)
-        def on_tool_usage_started(source, event: ToolUsageStartedEvent):
+        def on_tool_usage_started(source: Any, event: ToolUsageStartedEvent) -> None:
            if isinstance(source, LLM):
                self.formatter.handle_llm_tool_usage_started(
                    event.tool_name,
@@ -365,7 +378,7 @@ class EventListener(BaseEventListener):
                )

        @crewai_event_bus.on(ToolUsageFinishedEvent)
-        def on_tool_usage_finished(source, event: ToolUsageFinishedEvent):
+        def on_tool_usage_finished(source: Any, event: ToolUsageFinishedEvent) -> None:
            if isinstance(source, LLM):
                self.formatter.handle_llm_tool_usage_finished(
                    event.tool_name,
@@ -378,7 +391,7 @@ class EventListener(BaseEventListener):
                )

        @crewai_event_bus.on(ToolUsageErrorEvent)
-        def on_tool_usage_error(source, event: ToolUsageErrorEvent):
+        def on_tool_usage_error(source: Any, event: ToolUsageErrorEvent) -> None:
            if isinstance(source, LLM):
                self.formatter.handle_llm_tool_usage_error(
                    event.tool_name,
@@ -395,7 +408,7 @@ class EventListener(BaseEventListener):
        # ----------- LLM EVENTS -----------

        @crewai_event_bus.on(LLMCallStartedEvent)
-        def on_llm_call_started(source, event: LLMCallStartedEvent):
+        def on_llm_call_started(_: Any, event: LLMCallStartedEvent) -> None:
            # Capture the returned tool branch and update the current_tool_branch reference
            thinking_branch = self.formatter.handle_llm_call_started(
                self.formatter.current_agent_branch,
@@ -406,7 +419,7 @@ class EventListener(BaseEventListener):
                self.formatter.current_tool_branch = thinking_branch

        @crewai_event_bus.on(LLMCallCompletedEvent)
-        def on_llm_call_completed(source, event: LLMCallCompletedEvent):
+        def on_llm_call_completed(_: Any, event: LLMCallCompletedEvent) -> None:
            self.formatter.handle_llm_call_completed(
                self.formatter.current_tool_branch,
                self.formatter.current_agent_branch,
@@ -414,7 +427,7 @@ class EventListener(BaseEventListener):
            )

        @crewai_event_bus.on(LLMCallFailedEvent)
-        def on_llm_call_failed(source, event: LLMCallFailedEvent):
+        def on_llm_call_failed(_: Any, event: LLMCallFailedEvent) -> None:
            self.formatter.handle_llm_call_failed(
                self.formatter.current_tool_branch,
                event.error,
@@ -422,7 +435,7 @@ class EventListener(BaseEventListener):
            )

        @crewai_event_bus.on(LLMStreamChunkEvent)
-        def on_llm_stream_chunk(source, event: LLMStreamChunkEvent):
+        def on_llm_stream_chunk(_: Any, event: LLMStreamChunkEvent) -> None:
            self.text_stream.write(event.chunk)
            self.text_stream.seek(self.next_chunk)
            self.text_stream.read()
@@ -431,7 +444,7 @@ class EventListener(BaseEventListener):
        # ----------- LLM GUARDRAIL EVENTS -----------

        @crewai_event_bus.on(LLMGuardrailStartedEvent)
-        def on_llm_guardrail_started(source, event: LLMGuardrailStartedEvent):
+        def on_llm_guardrail_started(_: Any, event: LLMGuardrailStartedEvent) -> None:
            guardrail_str = str(event.guardrail)
            guardrail_name = (
                guardrail_str[:50] + "..." if len(guardrail_str) > 50 else guardrail_str
@@ -440,13 +453,15 @@ class EventListener(BaseEventListener):
            self.formatter.handle_guardrail_started(guardrail_name, event.retry_count)

        @crewai_event_bus.on(LLMGuardrailCompletedEvent)
-        def on_llm_guardrail_completed(source, event: LLMGuardrailCompletedEvent):
+        def on_llm_guardrail_completed(
+            _: Any, event: LLMGuardrailCompletedEvent
+        ) -> None:
            self.formatter.handle_guardrail_completed(
                event.success, event.error, event.retry_count
            )

        @crewai_event_bus.on(CrewTestStartedEvent)
-        def on_crew_test_started(source, event: CrewTestStartedEvent):
+        def on_crew_test_started(source: Any, event: CrewTestStartedEvent) -> None:
            cloned_crew = source.copy()
            self._telemetry.test_execution_span(
                cloned_crew,
@@ -460,20 +475,20 @@ class EventListener(BaseEventListener):
            )

        @crewai_event_bus.on(CrewTestCompletedEvent)
-        def on_crew_test_completed(source, event: CrewTestCompletedEvent):
+        def on_crew_test_completed(_: Any, event: CrewTestCompletedEvent) -> None:
            self.formatter.handle_crew_test_completed(
                self.formatter.current_flow_tree,
                event.crew_name or "Crew",
            )

        @crewai_event_bus.on(CrewTestFailedEvent)
-        def on_crew_test_failed(source, event: CrewTestFailedEvent):
+        def on_crew_test_failed(_: Any, event: CrewTestFailedEvent) -> None:
            self.formatter.handle_crew_test_failed(event.crew_name or "Crew")

        @crewai_event_bus.on(KnowledgeRetrievalStartedEvent)
        def on_knowledge_retrieval_started(
-            source, event: KnowledgeRetrievalStartedEvent
-        ):
+            _: Any, event: KnowledgeRetrievalStartedEvent
+        ) -> None:
            if self.knowledge_retrieval_in_progress:
                return

@@ -486,8 +501,8 @@ class EventListener(BaseEventListener):

        @crewai_event_bus.on(KnowledgeRetrievalCompletedEvent)
        def on_knowledge_retrieval_completed(
-            source, event: KnowledgeRetrievalCompletedEvent
-        ):
+            _: Any, event: KnowledgeRetrievalCompletedEvent
+        ) -> None:
            if not self.knowledge_retrieval_in_progress:
                return

@@ -499,11 +514,13 @@ class EventListener(BaseEventListener):
            )

        @crewai_event_bus.on(KnowledgeQueryStartedEvent)
-        def on_knowledge_query_started(source, event: KnowledgeQueryStartedEvent):
+        def on_knowledge_query_started(
+            _: Any, event: KnowledgeQueryStartedEvent
+        ) -> None:
            pass

        @crewai_event_bus.on(KnowledgeQueryFailedEvent)
-        def on_knowledge_query_failed(source, event: KnowledgeQueryFailedEvent):
+        def on_knowledge_query_failed(_: Any, event: KnowledgeQueryFailedEvent) -> None:
            self.formatter.handle_knowledge_query_failed(
                self.formatter.current_agent_branch,
                event.error,
@@ -511,13 +528,15 @@ class EventListener(BaseEventListener):
            )

        @crewai_event_bus.on(KnowledgeQueryCompletedEvent)
-        def on_knowledge_query_completed(source, event: KnowledgeQueryCompletedEvent):
+        def on_knowledge_query_completed(
+            _: Any, event: KnowledgeQueryCompletedEvent
+        ) -> None:
            pass

        @crewai_event_bus.on(KnowledgeSearchQueryFailedEvent)
        def on_knowledge_search_query_failed(
-            source, event: KnowledgeSearchQueryFailedEvent
-        ):
+            _: Any, event: KnowledgeSearchQueryFailedEvent
+        ) -> None:
            self.formatter.handle_knowledge_search_query_failed(
                self.formatter.current_agent_branch,
                event.error,
@@ -527,7 +546,9 @@ class EventListener(BaseEventListener):
        # ----------- REASONING EVENTS -----------

        @crewai_event_bus.on(AgentReasoningStartedEvent)
-        def on_agent_reasoning_started(source, event: AgentReasoningStartedEvent):
+        def on_agent_reasoning_started(
+            _: Any, event: AgentReasoningStartedEvent
+        ) -> None:
            self.formatter.handle_reasoning_started(
                self.formatter.current_agent_branch,
                event.attempt,
@@ -535,7 +556,9 @@ class EventListener(BaseEventListener):
            )

        @crewai_event_bus.on(AgentReasoningCompletedEvent)
-        def on_agent_reasoning_completed(source, event: AgentReasoningCompletedEvent):
+        def on_agent_reasoning_completed(
+            _: Any, event: AgentReasoningCompletedEvent
+        ) -> None:
            self.formatter.handle_reasoning_completed(
                event.plan,
                event.ready,
@@ -543,7 +566,7 @@ class EventListener(BaseEventListener):
            )

        @crewai_event_bus.on(AgentReasoningFailedEvent)
-        def on_agent_reasoning_failed(source, event: AgentReasoningFailedEvent):
+        def on_agent_reasoning_failed(_: Any, event: AgentReasoningFailedEvent) -> None:
            self.formatter.handle_reasoning_failed(
                event.error,
                self.formatter.current_crew_tree,
@@ -552,7 +575,7 @@ class EventListener(BaseEventListener):
        # ----------- AGENT LOGGING EVENTS -----------

        @crewai_event_bus.on(AgentLogsStartedEvent)
-        def on_agent_logs_started(source, event: AgentLogsStartedEvent):
+        def on_agent_logs_started(_: Any, event: AgentLogsStartedEvent) -> None:
            self.formatter.handle_agent_logs_started(
                event.agent_role,
                event.task_description,
@@ -560,7 +583,7 @@ class EventListener(BaseEventListener):
            )

        @crewai_event_bus.on(AgentLogsExecutionEvent)
-        def on_agent_logs_execution(source, event: AgentLogsExecutionEvent):
+        def on_agent_logs_execution(_: Any, event: AgentLogsExecutionEvent) -> None:
            self.formatter.handle_agent_logs_execution(
                event.agent_role,
                event.formatted_answer,
@@ -568,7 +591,7 @@ class EventListener(BaseEventListener):
            )

        @crewai_event_bus.on(A2ADelegationStartedEvent)
-        def on_a2a_delegation_started(source, event: A2ADelegationStartedEvent):
+        def on_a2a_delegation_started(_: Any, event: A2ADelegationStartedEvent) -> None:
            self.formatter.handle_a2a_delegation_started(
                event.endpoint,
                event.task_description,
@@ -578,7 +601,9 @@ class EventListener(BaseEventListener):
            )

        @crewai_event_bus.on(A2ADelegationCompletedEvent)
-        def on_a2a_delegation_completed(source, event: A2ADelegationCompletedEvent):
+        def on_a2a_delegation_completed(
+            _: Any, event: A2ADelegationCompletedEvent
+        ) -> None:
            self.formatter.handle_a2a_delegation_completed(
                event.status,
                event.result,
@@ -587,7 +612,9 @@ class EventListener(BaseEventListener):
            )

        @crewai_event_bus.on(A2AConversationStartedEvent)
-        def on_a2a_conversation_started(source, event: A2AConversationStartedEvent):
+        def on_a2a_conversation_started(
+            _: Any, event: A2AConversationStartedEvent
+        ) -> None:
            # Store A2A agent name for display in conversation tree
            if event.a2a_agent_name:
                self.formatter._current_a2a_agent_name = event.a2a_agent_name
@@ -598,7 +625,7 @@ class EventListener(BaseEventListener):
            )

        @crewai_event_bus.on(A2AMessageSentEvent)
-        def on_a2a_message_sent(source, event: A2AMessageSentEvent):
+        def on_a2a_message_sent(_: Any, event: A2AMessageSentEvent) -> None:
            self.formatter.handle_a2a_message_sent(
                event.message,
                event.turn_number,
@@ -606,7 +633,7 @@ class EventListener(BaseEventListener):
            )

        @crewai_event_bus.on(A2AResponseReceivedEvent)
-        def on_a2a_response_received(source, event: A2AResponseReceivedEvent):
+        def on_a2a_response_received(_: Any, event: A2AResponseReceivedEvent) -> None:
            self.formatter.handle_a2a_response_received(
                event.response,
                event.turn_number,
@@ -615,7 +642,9 @@ class EventListener(BaseEventListener):
            )

        @crewai_event_bus.on(A2AConversationCompletedEvent)
-        def on_a2a_conversation_completed(source, event: A2AConversationCompletedEvent):
+        def on_a2a_conversation_completed(
+            _: Any, event: A2AConversationCompletedEvent
+        ) -> None:
            self.formatter.handle_a2a_conversation_completed(
                event.status,
                event.final_result,
@@ -626,7 +655,7 @@ class EventListener(BaseEventListener):
        # ----------- MCP EVENTS -----------

        @crewai_event_bus.on(MCPConnectionStartedEvent)
-        def on_mcp_connection_started(source, event: MCPConnectionStartedEvent):
+        def on_mcp_connection_started(_: Any, event: MCPConnectionStartedEvent) -> None:
            self.formatter.handle_mcp_connection_started(
                event.server_name,
                event.server_url,
@@ -636,7 +665,9 @@ class EventListener(BaseEventListener):
            )

        @crewai_event_bus.on(MCPConnectionCompletedEvent)
-        def on_mcp_connection_completed(source, event: MCPConnectionCompletedEvent):
+        def on_mcp_connection_completed(
+            _: Any, event: MCPConnectionCompletedEvent
+        ) -> None:
            self.formatter.handle_mcp_connection_completed(
                event.server_name,
                event.server_url,
@@ -646,7 +677,7 @@ class EventListener(BaseEventListener):
            )

        @crewai_event_bus.on(MCPConnectionFailedEvent)
-        def on_mcp_connection_failed(source, event: MCPConnectionFailedEvent):
+        def on_mcp_connection_failed(_: Any, event: MCPConnectionFailedEvent) -> None:
            self.formatter.handle_mcp_connection_failed(
                event.server_name,
                event.server_url,
@@ -656,7 +687,9 @@ class EventListener(BaseEventListener):
            )

        @crewai_event_bus.on(MCPToolExecutionStartedEvent)
-        def on_mcp_tool_execution_started(source, event: MCPToolExecutionStartedEvent):
+        def on_mcp_tool_execution_started(
+            _: Any, event: MCPToolExecutionStartedEvent
+        ) -> None:
            self.formatter.handle_mcp_tool_execution_started(
                event.server_name,
                event.tool_name,
@@ -665,8 +698,8 @@ class EventListener(BaseEventListener):

        @crewai_event_bus.on(MCPToolExecutionCompletedEvent)
        def on_mcp_tool_execution_completed(
-            source, event: MCPToolExecutionCompletedEvent
-        ):
+            _: Any, event: MCPToolExecutionCompletedEvent
+        ) -> None:
            self.formatter.handle_mcp_tool_execution_completed(
                event.server_name,
                event.tool_name,
@@ -676,7 +709,9 @@ class EventListener(BaseEventListener):
            )

        @crewai_event_bus.on(MCPToolExecutionFailedEvent)
-        def on_mcp_tool_execution_failed(source, event: MCPToolExecutionFailedEvent):
+        def on_mcp_tool_execution_failed(
+            _: Any, event: MCPToolExecutionFailedEvent
+        ) -> None:
            self.formatter.handle_mcp_tool_execution_failed(
                event.server_name,
                event.tool_name,
--- a/lib/crewai/tests/agents/test_agent.py
+++ b/lib/crewai/tests/agents/test_agent.py
@@ -307,27 +307,22 @@ def test_cache_hitting():
            event_handled = True
            condition.notify()

-    with (
-        patch.object(CacheHandler, "read") as read,
-    ):
-        read.return_value = "0"
-        task = Task(
-            description="What is 2 times 6? Ignore correctness and just return the result of the multiplication tool, you must use the tool.",
-            agent=agent,
-            expected_output="The number that is the result of the multiplication tool.",
-        )
-        output = agent.execute_task(task)
-        assert output == "0"
-        read.assert_called_with(
-            tool="multiplier", input='{"first_number": 2, "second_number": 6}'
-        )
-        with condition:
-            if not event_handled:
-                condition.wait(timeout=5)
-        assert event_handled, "Timeout waiting for tool usage event"
-        assert len(received_events) == 1
-        assert isinstance(received_events[0], ToolUsageFinishedEvent)
-        assert received_events[0].from_cache
+    task = Task(
+        description="What is 2 times 6? Return only the result of the multiplication.",
+        agent=agent,
+        expected_output="The result of the multiplication.",
+    )
+    output = agent.execute_task(task)
+    assert output == "12"
+
+    with condition:
+        if not event_handled:
+            condition.wait(timeout=5)
+    assert event_handled, "Timeout waiting for tool usage event"
+    assert len(received_events) == 1
+    assert isinstance(received_events[0], ToolUsageFinishedEvent)
+    assert received_events[0].from_cache
+    assert received_events[0].output == "12"


@pytest.mark.vcr(filter_headers=["authorization"])
--- a/lib/crewai/tests/cassettes/test_agent_execute_task_with_tool.yaml
+++ b/lib/crewai/tests/cassettes/test_agent_execute_task_with_tool.yaml
@@ -1,23 +1,22 @@
 interactions:
 - request:
-    body: '{"messages": [{"role": "system", "content": "You are test role. test backstory\nYour
+    body: '{"messages":[{"role":"system","content":"You are test role. test backstory\nYour
      personal goal is: test goal\nYou ONLY have access to the following tools, and
      should NEVER make up tools that are not listed here:\n\nTool Name: dummy_tool\nTool
      Arguments: {''query'': {''description'': None, ''type'': ''str''}}\nTool Description:
-      Useful for when you need to get a dummy result for a query.\n\nUse the following
-      format:\n\nThought: you should always think about what to do\nAction: the action
-      to take, only one name of [dummy_tool], just the name, exactly as it''s written.\nAction
-      Input: the input to the action, just a simple python dictionary, enclosed in
-      curly braces, using \" to wrap keys and values.\nObservation: the result of
-      the action\n\nOnce all necessary information is gathered:\n\nThought: I now
-      know the final answer\nFinal Answer: the final answer to the original input
-      question"}, {"role": "user", "content": "\nCurrent Task: Use the dummy tool
-      to get a result for ''test query''\n\nThis is the expect criteria for your final
-      answer: The result from the dummy tool\nyou MUST return the actual complete
-      content as the final answer, not a summary.\n\nBegin! This is VERY important
-      to you, use the tools available and give your best Final Answer, your job depends
-      on it!\n\nThought:"}], "model": "gpt-3.5-turbo", "stop": ["\nObservation:"],
-      "stream": false}'
+      Useful for when you need to get a dummy result for a query.\n\nIMPORTANT: Use
+      the following format in your response:\n\n```\nThought: you should always think
+      about what to do\nAction: the action to take, only one name of [dummy_tool],
+      just the name, exactly as it''s written.\nAction Input: the input to the action,
+      just a simple JSON object, enclosed in curly braces, using \" to wrap keys and
+      values.\nObservation: the result of the action\n```\n\nOnce all necessary information
+      is gathered, return the following format:\n\n```\nThought: I now know the final
+      answer\nFinal Answer: the final answer to the original input question\n```"},{"role":"user","content":"\nCurrent
+      Task: Use the dummy tool to get a result for ''test query''\n\nThis is the expected
+      criteria for your final answer: The result from the dummy tool\nyou MUST return
+      the actual complete content as the final answer, not a summary.\n\nBegin! This
+      is VERY important to you, use the tools available and give your best Final Answer,
+      your job depends on it!\n\nThought:"}],"model":"gpt-3.5-turbo"}'
    headers:
      accept:
      - application/json
@@ -26,13 +25,13 @@ interactions:
      connection:
      - keep-alive
      content-length:
-      - '1363'
+      - '1381'
      content-type:
      - application/json
      host:
      - api.openai.com
      user-agent:
-      - OpenAI/Python 1.52.1
+      - OpenAI/Python 1.109.1
      x-stainless-arch:
      - arm64
      x-stainless-async:
@@ -42,35 +41,33 @@ interactions:
      x-stainless-os:
      - MacOS
      x-stainless-package-version:
-      - 1.52.1
-      x-stainless-raw-response:
-      - 'true'
+      - 1.109.1
+      x-stainless-read-timeout:
+      - '600'
      x-stainless-retry-count:
      - '0'
      x-stainless-runtime:
      - CPython
      x-stainless-runtime-version:
-      - 3.12.7
+      - 3.12.10
    method: POST
    uri: https://api.openai.com/v1/chat/completions
  response:
-    content: "{\n  \"id\": \"chatcmpl-AmjTkjHtNtJfKGo6wS35grXEzfoqv\",\n  \"object\":
-      \"chat.completion\",\n  \"created\": 1736177928,\n  \"model\": \"gpt-3.5-turbo-0125\",\n
-      \ \"choices\": [\n    {\n      \"index\": 0,\n      \"message\": {\n        \"role\":
-      \"assistant\",\n        \"content\": \"I should use the dummy tool to get a
-      result for the 'test query'.\\n\\nAction: dummy_tool\\nAction Input: {\\\"query\\\":
-      \\\"test query\\\"}\",\n        \"refusal\": null\n      },\n      \"logprobs\":
-      null,\n      \"finish_reason\": \"stop\"\n    }\n  ],\n  \"usage\": {\n    \"prompt_tokens\":
-      271,\n    \"completion_tokens\": 31,\n    \"total_tokens\": 302,\n    \"prompt_tokens_details\":
-      {\n      \"cached_tokens\": 0,\n      \"audio_tokens\": 0\n    },\n    \"completion_tokens_details\":
-      {\n      \"reasoning_tokens\": 0,\n      \"audio_tokens\": 0,\n      \"accepted_prediction_tokens\":
-      0,\n      \"rejected_prediction_tokens\": 0\n    }\n  },\n  \"system_fingerprint\":
-      null\n}\n"
+    body:
+      string: !!binary |
+        H4sIAAAAAAAAA4xTwW4TMRC95ytGvvSSVGlDWthbqYSIECAQSFRstXK8s7tuvR5jj5uGKv+O7CTd
+        FAriYtnz5j2/8YwfRgBC16IAoTrJqndmctl8ff3tJsxWd29vLu/7d1eXnz4vfq7cVft+1ohxYtDy
+        BhXvWceKemeQNdktrDxKxqR6cn72YjqdzU/mGeipRpNorePJ7Hg+4eiXNJmenM53zI60wiAK+D4C
+        AHjIa/Joa7wXBUzH+0iPIcgWRfGYBCA8mRQRMgQdWFoW4wFUZBlttr2A0FE0NcSAwB1CHft+XTGR
+        ASZokUGCxxANQ0M+pxwxBoYfEf366Li0FyoVXBww9zFYWBe5gIdS5OxS5H2NQXntUkaKfCCLYygF
+        rx2mcykC+1JsNqX9uAzo7+RW/8veHWR3nQzgkaO3WIPcIf92WtovHcW24wIWYGkFt2lJiY220oC0
+        YYW+tG/y6SKftvfudT31wytlH4fv6rGJQaa+2mjMASCtJc5l5I5e75DNYw8Ntc7TMvxGFY22OnSV
+        RxnIpn4FJicyuhkBXOdZiU/aL5yn3nHFdIv5utOXr7Z6YhjPAT2f7UAmlmaIz85Ox8/oVTWy1CYc
+        TJtQUnVYD9RhNGWsNR0Ao4Oq/3TznPa2cm3b/5EfAKXQMdaV81hr9bTiIc1j+r1/S3t85WxYpEnU
+        CivW6FMnamxkNNt/JcI6MPZVo22L3nmdP1fq5Ggz+gUAAP//AwDDsh2ZWwQAAA==
    headers:
-      CF-Cache-Status:
-      - DYNAMIC
      CF-RAY:
-      - 8fdccc13af387bb2-ATL
+      - 9a3a73adce2d43c2-EWR
      Connection:
      - keep-alive
      Content-Encoding:
@@ -78,15 +75,17 @@ interactions:
      Content-Type:
      - application/json
      Date:
-      - Mon, 06 Jan 2025 15:38:48 GMT
+      - Mon, 24 Nov 2025 16:58:36 GMT
      Server:
      - cloudflare
      Set-Cookie:
-      - __cf_bm=PdbRW9vzO7559czIqn0xmXQjbN8_vV_J7k1DlkB4d_Y-1736177928-1.0.1.1-7yNcyljwqHI.TVflr9ZnkS705G.K5hgPbHpxRzcO3ZMFi5lHCBPs_KB5pFE043wYzPmDIHpn6fu6jIY9mlNoLQ;
-        path=/; expires=Mon, 06-Jan-25 16:08:48 GMT; domain=.api.openai.com; HttpOnly;
+      - __cf_bm=Xa8khOM9zEqqwwmzvZrdS.nMU9nW06e0gk4Xg8ga5BI-1764003516-1.0.1.1-mR_vAWrgEyaykpsxgHq76VhaNTOdAWeNJweR1bmH1wVJgzoE0fuSPEKZMJy9Uon.1KBTV3yJVxLvQ4PjPLuE30IUdwY9Lrfbz.Rhb6UVbwY;
+        path=/; expires=Mon, 24-Nov-25 17:28:36 GMT; domain=.api.openai.com; HttpOnly;
        Secure; SameSite=None
-      - _cfuvid=lOOz0FbrrPaRb4IFEeHNcj7QghHzxI1tTV2N0jD9icA-1736177928767-0.0.1.1-604800000;
+      - _cfuvid=GP8hWglm1PiEe8AjYsdeCiIUtkA7483Hr9Ws4AZWe5U-1764003516772-0.0.1.1-604800000;
        path=/; domain=.api.openai.com; HttpOnly; Secure; SameSite=None
+      Strict-Transport-Security:
+      - max-age=31536000; includeSubDomains; preload
      Transfer-Encoding:
      - chunked
      X-Content-Type-Options:
@@ -95,14 +94,20 @@ interactions:
      - X-Request-ID
      alt-svc:
      - h3=":443"; ma=86400
+      cf-cache-status:
+      - DYNAMIC
      openai-organization:
-      - crewai-iuxna1
+      - REDACTED
      openai-processing-ms:
-      - '444'
+      - '1413'
+      openai-project:
+      - proj_xitITlrFeen7zjNSzML82h9x
      openai-version:
      - '2020-10-01'
-      strict-transport-security:
-      - max-age=31536000; includeSubDomains; preload
+      x-envoy-upstream-service-time:
+      - '1606'
+      x-openai-proxy-wasm:
+      - v0.1
      x-ratelimit-limit-requests:
      - '10000'
      x-ratelimit-limit-tokens:
@@ -110,36 +115,52 @@ interactions:
      x-ratelimit-remaining-requests:
      - '9999'
      x-ratelimit-remaining-tokens:
-      - '49999686'
+      - '49999684'
      x-ratelimit-reset-requests:
      - 6ms
      x-ratelimit-reset-tokens:
      - 0s
      x-request-id:
-      - req_5b3e93f5d4e6ab8feef83dc26b6eb623
-    http_version: HTTP/1.1
-    status_code: 200
+      - req_REDACTED
+    status:
+      code: 200
+      message: OK
 - request:
-    body: '{"messages": [{"role": "system", "content": "You are test role. test backstory\nYour
+    body: '{"messages":[{"role":"system","content":"You are test role. test backstory\nYour
      personal goal is: test goal\nYou ONLY have access to the following tools, and
      should NEVER make up tools that are not listed here:\n\nTool Name: dummy_tool\nTool
      Arguments: {''query'': {''description'': None, ''type'': ''str''}}\nTool Description:
-      Useful for when you need to get a dummy result for a query.\n\nUse the following
-      format:\n\nThought: you should always think about what to do\nAction: the action
-      to take, only one name of [dummy_tool], just the name, exactly as it''s written.\nAction
-      Input: the input to the action, just a simple python dictionary, enclosed in
-      curly braces, using \" to wrap keys and values.\nObservation: the result of
-      the action\n\nOnce all necessary information is gathered:\n\nThought: I now
-      know the final answer\nFinal Answer: the final answer to the original input
-      question"}, {"role": "user", "content": "\nCurrent Task: Use the dummy tool
-      to get a result for ''test query''\n\nThis is the expect criteria for your final
-      answer: The result from the dummy tool\nyou MUST return the actual complete
-      content as the final answer, not a summary.\n\nBegin! This is VERY important
-      to you, use the tools available and give your best Final Answer, your job depends
-      on it!\n\nThought:"}, {"role": "assistant", "content": "I should use the dummy
-      tool to get a result for the ''test query''.\n\nAction: dummy_tool\nAction Input:
-      {\"query\": \"test query\"}\nObservation: Dummy result for: test query"}], "model":
-      "gpt-3.5-turbo", "stop": ["\nObservation:"], "stream": false}'
+      Useful for when you need to get a dummy result for a query.\n\nIMPORTANT: Use
+      the following format in your response:\n\n```\nThought: you should always think
+      about what to do\nAction: the action to take, only one name of [dummy_tool],
+      just the name, exactly as it''s written.\nAction Input: the input to the action,
+      just a simple JSON object, enclosed in curly braces, using \" to wrap keys and
+      values.\nObservation: the result of the action\n```\n\nOnce all necessary information
+      is gathered, return the following format:\n\n```\nThought: I now know the final
+      answer\nFinal Answer: the final answer to the original input question\n```"},{"role":"user","content":"\nCurrent
+      Task: Use the dummy tool to get a result for ''test query''\n\nThis is the expected
+      criteria for your final answer: The result from the dummy tool\nyou MUST return
+      the actual complete content as the final answer, not a summary.\n\nBegin! This
+      is VERY important to you, use the tools available and give your best Final Answer,
+      your job depends on it!\n\nThought:"},{"role":"assistant","content":"I should
+      use the dummy_tool to get a result for the ''test query''.\nAction: dummy_tool\nAction
+      Input: {\"query\": {\"description\": None, \"type\": \"str\"}}\nObservation:
+      \nI encountered an error while trying to use the tool. This was the error: Arguments
+      validation failed: 1 validation error for Dummy_Tool\nquery\n  Input should
+      be a valid string [type=string_type, input_value={''description'': ''None'',
+      ''type'': ''str''}, input_type=dict]\n    For further information visit https://errors.pydantic.dev/2.12/v/string_type.\n
+      Tool dummy_tool accepts these inputs: Tool Name: dummy_tool\nTool Arguments:
+      {''query'': {''description'': None, ''type'': ''str''}}\nTool Description: Useful
+      for when you need to get a dummy result for a query..\nMoving on then. I MUST
+      either use a tool (use one at time) OR give my best final answer not both at
+      the same time. When responding, I must use the following format:\n\n```\nThought:
+      you should always think about what to do\nAction: the action to take, should
+      be one of [dummy_tool]\nAction Input: the input to the action, dictionary enclosed
+      in curly braces\nObservation: the result of the action\n```\nThis Thought/Action/Action
+      Input/Result can repeat N times. Once I know the final answer, I must return
+      the following format:\n\n```\nThought: I now can give a great answer\nFinal
+      Answer: Your final answer must be the great and the most complete as possible,
+      it must be outcome described\n\n```"}],"model":"gpt-3.5-turbo"}'
    headers:
      accept:
      - application/json
@@ -148,16 +169,16 @@ interactions:
      connection:
      - keep-alive
      content-length:
-      - '1574'
+      - '2841'
      content-type:
      - application/json
      cookie:
-      - __cf_bm=PdbRW9vzO7559czIqn0xmXQjbN8_vV_J7k1DlkB4d_Y-1736177928-1.0.1.1-7yNcyljwqHI.TVflr9ZnkS705G.K5hgPbHpxRzcO3ZMFi5lHCBPs_KB5pFE043wYzPmDIHpn6fu6jIY9mlNoLQ;
-        _cfuvid=lOOz0FbrrPaRb4IFEeHNcj7QghHzxI1tTV2N0jD9icA-1736177928767-0.0.1.1-604800000
+      - __cf_bm=Xa8khOM9zEqqwwmzvZrdS.nMU9nW06e0gk4Xg8ga5BI-1764003516-1.0.1.1-mR_vAWrgEyaykpsxgHq76VhaNTOdAWeNJweR1bmH1wVJgzoE0fuSPEKZMJy9Uon.1KBTV3yJVxLvQ4PjPLuE30IUdwY9Lrfbz.Rhb6UVbwY;
+        _cfuvid=GP8hWglm1PiEe8AjYsdeCiIUtkA7483Hr9Ws4AZWe5U-1764003516772-0.0.1.1-604800000
      host:
      - api.openai.com
      user-agent:
-      - OpenAI/Python 1.52.1
+      - OpenAI/Python 1.109.1
      x-stainless-arch:
      - arm64
      x-stainless-async:
@@ -167,34 +188,34 @@ interactions:
      x-stainless-os:
      - MacOS
      x-stainless-package-version:
-      - 1.52.1
-      x-stainless-raw-response:
-      - 'true'
+      - 1.109.1
+      x-stainless-read-timeout:
+      - '600'
      x-stainless-retry-count:
      - '0'
      x-stainless-runtime:
      - CPython
      x-stainless-runtime-version:
-      - 3.12.7
+      - 3.12.10
    method: POST
    uri: https://api.openai.com/v1/chat/completions
  response:
-    content: "{\n  \"id\": \"chatcmpl-AmjTkjtDnt98YQ3k4y71C523EQM9p\",\n  \"object\":
-      \"chat.completion\",\n  \"created\": 1736177928,\n  \"model\": \"gpt-3.5-turbo-0125\",\n
-      \ \"choices\": [\n    {\n      \"index\": 0,\n      \"message\": {\n        \"role\":
-      \"assistant\",\n        \"content\": \"Final Answer: Dummy result for: test
-      query\",\n        \"refusal\": null\n      },\n      \"logprobs\": null,\n      \"finish_reason\":
-      \"stop\"\n    }\n  ],\n  \"usage\": {\n    \"prompt_tokens\": 315,\n    \"completion_tokens\":
-      9,\n    \"total_tokens\": 324,\n    \"prompt_tokens_details\": {\n      \"cached_tokens\":
-      0,\n      \"audio_tokens\": 0\n    },\n    \"completion_tokens_details\": {\n
-      \     \"reasoning_tokens\": 0,\n      \"audio_tokens\": 0,\n      \"accepted_prediction_tokens\":
-      0,\n      \"rejected_prediction_tokens\": 0\n    }\n  },\n  \"system_fingerprint\":
-      null\n}\n"
+    body:
+      string: !!binary |
+        H4sIAAAAAAAAAwAAAP//pFPbahsxEH33Vwx6yYtt7LhO0n1LWgomlFKaFko3LLJ2dletdrSRRklN
+        8L8HyZdd9wKFvgikM2cuOmeeRwBClyIDoRrJqu3M5E31+UaeL+ct335c3Ty8/frFLW5vF6G9dNfv
+        xTgy7Po7Kj6wpsq2nUHWlnawcigZY9b55cWr2WyxnF8loLUlmkirO54spssJB7e2k9n8fLlnNlYr
+        9CKDbyMAgOd0xh6pxJ8ig9n48NKi97JGkR2DAISzJr4I6b32LInFuAeVJUZKbd81NtQNZ7CCJ20M
+        KOscKgZuEDR1gaGyrpUMkkpgt4HgNdUJLkPbbgq21oCspaZpTtcqzp4NoMMbrGKyDJ5z8RDQbXKR
+        QS4YPcP+vs3pw9qje5S7HDndNQgOfTAMlbNtXxRSUe0z+BSUQu+rYMwG7JqlJixB7sMOZOsS96wv
+        dzbNKRY4Dk/2CZQkqPUjgoQ6CgeS/BO6nN5pkgau0+0/ag4lcFgFL6MFKBgzACSR5fQFSfz7PbI9
+        ym1s3Tm79r9QRaVJ+6ZwKL2lKK1n24mEbkcA98lW4cQponO27bhg+wNTuYvzva1E7+Qevbzag2xZ
+        mgHr9QE4yVeUyFIbPzCmUFI1WPbU3sUylNoOgNFg6t+7+VPu3eSa6n9J3wNKYcdYFp3DUqvTifsw
+        h3HR/xZ2/OXUsIgu1goL1uiiEiVWMpjdCgq/8YxtUWmq0XVOpz2MSo62oxcAAAD//wMA+UmELoYE
+        AAA=
    headers:
-      CF-Cache-Status:
-      - DYNAMIC
      CF-RAY:
-      - 8fdccc171b647bb2-ATL
+      - 9a3a73bbf9d943c2-EWR
      Connection:
      - keep-alive
      Content-Encoding:
@@ -202,9 +223,11 @@ interactions:
      Content-Type:
      - application/json
      Date:
-      - Mon, 06 Jan 2025 15:38:49 GMT
+      - Mon, 24 Nov 2025 16:58:39 GMT
      Server:
      - cloudflare
+      Strict-Transport-Security:
+      - max-age=31536000; includeSubDomains; preload
      Transfer-Encoding:
      - chunked
      X-Content-Type-Options:
@@ -213,14 +236,20 @@ interactions:
      - X-Request-ID
      alt-svc:
      - h3=":443"; ma=86400
+      cf-cache-status:
+      - DYNAMIC
      openai-organization:
-      - crewai-iuxna1
+      - REDACTED
      openai-processing-ms:
-      - '249'
+      - '1513'
+      openai-project:
+      - proj_xitITlrFeen7zjNSzML82h9x
      openai-version:
      - '2020-10-01'
-      strict-transport-security:
-      - max-age=31536000; includeSubDomains; preload
+      x-envoy-upstream-service-time:
+      - '1753'
+      x-openai-proxy-wasm:
+      - v0.1
      x-ratelimit-limit-requests:
      - '10000'
      x-ratelimit-limit-tokens:
@@ -228,103 +257,156 @@ interactions:
      x-ratelimit-remaining-requests:
      - '9999'
      x-ratelimit-remaining-tokens:
-      - '49999643'
+      - '49999334'
      x-ratelimit-reset-requests:
      - 6ms
      x-ratelimit-reset-tokens:
      - 0s
      x-request-id:
-      - req_cdc7b25a3877bb9a7cb7c6d2645ff447
-    http_version: HTTP/1.1
-    status_code: 200
+      - req_REDACTED
+    status:
+      code: 200
+      message: OK
 - request:
-    body: '{"trace_id": "1581aff1-2567-43f4-a1f2-a2816533eb7d", "execution_type":
-      "crew", "user_identifier": null, "execution_context": {"crew_fingerprint": null,
-      "crew_name": "Unknown Crew", "flow_name": null, "crewai_version": "0.201.1",
-      "privacy_level": "standard"}, "execution_metadata": {"expected_duration_estimate":
-      300, "agent_count": 0, "task_count": 0, "flow_method_count": 0, "execution_started_at":
-      "2025-10-08T18:11:28.008595+00:00"}}'
+    body: '{"messages":[{"role":"system","content":"You are test role. test backstory\nYour
+      personal goal is: test goal\nYou ONLY have access to the following tools, and
+      should NEVER make up tools that are not listed here:\n\nTool Name: dummy_tool\nTool
+      Arguments: {''query'': {''description'': None, ''type'': ''str''}}\nTool Description:
+      Useful for when you need to get a dummy result for a query.\n\nIMPORTANT: Use
+      the following format in your response:\n\n```\nThought: you should always think
+      about what to do\nAction: the action to take, only one name of [dummy_tool],
+      just the name, exactly as it''s written.\nAction Input: the input to the action,
+      just a simple JSON object, enclosed in curly braces, using \" to wrap keys and
+      values.\nObservation: the result of the action\n```\n\nOnce all necessary information
+      is gathered, return the following format:\n\n```\nThought: I now know the final
+      answer\nFinal Answer: the final answer to the original input question\n```"},{"role":"user","content":"\nCurrent
+      Task: Use the dummy tool to get a result for ''test query''\n\nThis is the expected
+      criteria for your final answer: The result from the dummy tool\nyou MUST return
+      the actual complete content as the final answer, not a summary.\n\nBegin! This
+      is VERY important to you, use the tools available and give your best Final Answer,
+      your job depends on it!\n\nThought:"},{"role":"assistant","content":"I should
+      use the dummy_tool to get a result for the ''test query''.\nAction: dummy_tool\nAction
+      Input: {\"query\": {\"description\": None, \"type\": \"str\"}}\nObservation:
+      \nI encountered an error while trying to use the tool. This was the error: Arguments
+      validation failed: 1 validation error for Dummy_Tool\nquery\n  Input should
+      be a valid string [type=string_type, input_value={''description'': ''None'',
+      ''type'': ''str''}, input_type=dict]\n    For further information visit https://errors.pydantic.dev/2.12/v/string_type.\n
+      Tool dummy_tool accepts these inputs: Tool Name: dummy_tool\nTool Arguments:
+      {''query'': {''description'': None, ''type'': ''str''}}\nTool Description: Useful
+      for when you need to get a dummy result for a query..\nMoving on then. I MUST
+      either use a tool (use one at time) OR give my best final answer not both at
+      the same time. When responding, I must use the following format:\n\n```\nThought:
+      you should always think about what to do\nAction: the action to take, should
+      be one of [dummy_tool]\nAction Input: the input to the action, dictionary enclosed
+      in curly braces\nObservation: the result of the action\n```\nThis Thought/Action/Action
+      Input/Result can repeat N times. Once I know the final answer, I must return
+      the following format:\n\n```\nThought: I now can give a great answer\nFinal
+      Answer: Your final answer must be the great and the most complete as possible,
+      it must be outcome described\n\n```"},{"role":"assistant","content":"Thought:
+      I will correct the input format and try using the dummy_tool again.\nAction:
+      dummy_tool\nAction Input: {\"query\": \"test query\"}\nObservation: Dummy result
+      for: test query"}],"model":"gpt-3.5-turbo"}'
    headers:
-      Accept:
-      - '*/*'
-      Accept-Encoding:
-      - gzip, deflate, zstd
-      Connection:
-      - keep-alive
-      Content-Length:
-      - '436'
-      Content-Type:
+      accept:
      - application/json
-      User-Agent:
-      - CrewAI-CLI/0.201.1
-      X-Crewai-Organization-Id:
-      - d3a3d10c-35db-423f-a7a4-c026030ba64d
-      X-Crewai-Version:
-      - 0.201.1
+      accept-encoding:
+      - gzip, deflate
+      connection:
+      - keep-alive
+      content-length:
+      - '3057'
+      content-type:
+      - application/json
+      cookie:
+      - __cf_bm=Xa8khOM9zEqqwwmzvZrdS.nMU9nW06e0gk4Xg8ga5BI-1764003516-1.0.1.1-mR_vAWrgEyaykpsxgHq76VhaNTOdAWeNJweR1bmH1wVJgzoE0fuSPEKZMJy9Uon.1KBTV3yJVxLvQ4PjPLuE30IUdwY9Lrfbz.Rhb6UVbwY;
+        _cfuvid=GP8hWglm1PiEe8AjYsdeCiIUtkA7483Hr9Ws4AZWe5U-1764003516772-0.0.1.1-604800000
+      host:
+      - api.openai.com
+      user-agent:
+      - OpenAI/Python 1.109.1
+      x-stainless-arch:
+      - arm64
+      x-stainless-async:
+      - 'false'
+      x-stainless-lang:
+      - python
+      x-stainless-os:
+      - MacOS
+      x-stainless-package-version:
+      - 1.109.1
+      x-stainless-read-timeout:
+      - '600'
+      x-stainless-retry-count:
+      - '0'
+      x-stainless-runtime:
+      - CPython
+      x-stainless-runtime-version:
+      - 3.12.10
    method: POST
-    uri: http://localhost:3000/crewai_plus/api/v1/tracing/batches
+    uri: https://api.openai.com/v1/chat/completions
  response:
    body:
-      string: '{"id":"30844ebe-8ac6-4f67-939a-7a072d792654","trace_id":"1581aff1-2567-43f4-a1f2-a2816533eb7d","execution_type":"crew","crew_name":"Unknown
-        Crew","flow_name":null,"status":"running","duration_ms":null,"crewai_version":"0.201.1","privacy_level":"standard","total_events":0,"execution_context":{"crew_fingerprint":null,"crew_name":"Unknown
-        Crew","flow_name":null,"crewai_version":"0.201.1","privacy_level":"standard"},"created_at":"2025-10-08T18:11:28.353Z","updated_at":"2025-10-08T18:11:28.353Z"}'
+      string: !!binary |
+        H4sIAAAAAAAAAwAAAP//jFLBbhMxEL3vV4x8TqqkTULZWwFFAq4gpEK18npnd028HmOPW6Iq/47s
+        pNktFKkXS/abN37vzTwWAEI3ogSheslqcGb+vv36rt7e0uqzbna0ut18uv8mtxSDrddKzBKD6p+o
+        +Il1oWhwBlmTPcLKo2RMXZdvNqvF4mq9fJuBgRo0idY5nl9drOccfU3zxfJyfWL2pBUGUcL3AgDg
+        MZ9Jo23wtyhhMXt6GTAE2aEoz0UAwpNJL0KGoANLy2I2gooso82yv/QUu55L+AiWHmCXDu4RWm2l
+        AWnDA/ofdptvN/lWwoc4DHvwGKJhaMmXwBgYfkX0++k3HtsYZLJpozETQFpLLFNM2eDdCTmcLRnq
+        nKc6/EUVrbY69JVHGcgm+YHJiYweCoC7HF18loZwngbHFdMO83ebzerYT4zTGtHl9QlkYmkmrOvL
+        2Qv9qgZZahMm4QslVY/NSB0nJWOjaQIUE9f/qnmp99G5tt1r2o+AUugYm8p5bLR67ngs85iW+X9l
+        55SzYBHQ32uFFWv0aRINtjKa45qJsA+MQ9Vq26F3XuddS5MsDsUfAAAA//8DANWDXp9qAwAA
    headers:
-      Content-Length:
-      - '496'
-      cache-control:
-      - no-store
-      content-security-policy:
-      - 'default-src ''self'' *.crewai.com crewai.com; script-src ''self'' ''unsafe-inline''
-        *.crewai.com crewai.com https://cdn.jsdelivr.net/npm/apexcharts https://www.gstatic.com
-        https://run.pstmn.io https://apis.google.com https://apis.google.com/js/api.js
-        https://accounts.google.com https://accounts.google.com/gsi/client https://cdnjs.cloudflare.com/ajax/libs/normalize/8.0.1/normalize.min.css.map
-        https://*.google.com https://docs.google.com https://slides.google.com https://js.hs-scripts.com
-        https://js.sentry-cdn.com https://browser.sentry-cdn.com https://www.googletagmanager.com
-        https://js-na1.hs-scripts.com https://share.descript.com/; style-src ''self''
-        ''unsafe-inline'' *.crewai.com crewai.com https://cdn.jsdelivr.net/npm/apexcharts;
-        img-src ''self'' data: *.crewai.com crewai.com https://zeus.tools.crewai.com
-        https://dashboard.tools.crewai.com https://cdn.jsdelivr.net; font-src ''self''
-        data: *.crewai.com crewai.com; connect-src ''self'' *.crewai.com crewai.com
-        https://zeus.tools.crewai.com https://connect.useparagon.com/ https://zeus.useparagon.com/*
-        https://*.useparagon.com/* https://run.pstmn.io https://connect.tools.crewai.com/
-        https://*.sentry.io https://www.google-analytics.com ws://localhost:3036 wss://localhost:3036;
-        frame-src ''self'' *.crewai.com crewai.com https://connect.useparagon.com/
-        https://zeus.tools.crewai.com https://zeus.useparagon.com/* https://connect.tools.crewai.com/
-        https://docs.google.com https://drive.google.com https://slides.google.com
-        https://accounts.google.com https://*.google.com https://www.youtube.com https://share.descript.com'
-      content-type:
-      - application/json; charset=utf-8
-      etag:
-      - W/"a548892c6a8a52833595a42b35b10009"
-      expires:
-      - '0'
-      permissions-policy:
-      - camera=(), microphone=(self), geolocation=()
-      pragma:
-      - no-cache
-      referrer-policy:
-      - strict-origin-when-cross-origin
-      server-timing:
-      - cache_read.active_support;dur=0.05, cache_fetch_hit.active_support;dur=0.00,
-        cache_read_multi.active_support;dur=0.12, start_processing.action_controller;dur=0.00,
-        sql.active_record;dur=30.46, instantiation.active_record;dur=0.38, feature_operation.flipper;dur=0.03,
-        start_transaction.active_record;dur=0.01, transaction.active_record;dur=16.78,
-        process_action.action_controller;dur=309.67
-      vary:
-      - Accept
-      x-content-type-options:
+      CF-RAY:
+      - 9a3a73cd4ff343c2-EWR
+      Connection:
+      - keep-alive
+      Content-Encoding:
+      - gzip
+      Content-Type:
+      - application/json
+      Date:
+      - Mon, 24 Nov 2025 16:58:40 GMT
+      Server:
+      - cloudflare
+      Strict-Transport-Security:
+      - max-age=31536000; includeSubDomains; preload
+      Transfer-Encoding:
+      - chunked
+      X-Content-Type-Options:
      - nosniff
-      x-frame-options:
-      - SAMEORIGIN
-      x-permitted-cross-domain-policies:
-      - none
+      access-control-expose-headers:
+      - X-Request-ID
+      alt-svc:
+      - h3=":443"; ma=86400
+      cf-cache-status:
+      - DYNAMIC
+      openai-organization:
+      - REDACTED
+      openai-processing-ms:
+      - '401'
+      openai-project:
+      - proj_xitITlrFeen7zjNSzML82h9x
+      openai-version:
+      - '2020-10-01'
+      x-envoy-upstream-service-time:
+      - '421'
+      x-openai-proxy-wasm:
+      - v0.1
+      x-ratelimit-limit-requests:
+      - '10000'
+      x-ratelimit-limit-tokens:
+      - '50000000'
+      x-ratelimit-remaining-requests:
+      - '9999'
+      x-ratelimit-remaining-tokens:
+      - '49999290'
+      x-ratelimit-reset-requests:
+      - 6ms
+      x-ratelimit-reset-tokens:
+      - 0s
      x-request-id:
-      - 7ec132be-e871-4b0a-93f7-81f8d7c0ccae
-      x-runtime:
-      - '0.358533'
-      x-xss-protection:
-      - 1; mode=block
+      - req_REDACTED
    status:
-      code: 201
-      message: Created
+      code: 200
+      message: OK
 version: 1
--- a/lib/crewai/tests/cassettes/test_agent_repeated_tool_usage.yaml
+++ b/lib/crewai/tests/cassettes/test_agent_repeated_tool_usage.yaml
--- a/lib/crewai/tests/cassettes/test_cache_hitting.yaml
+++ b/lib/crewai/tests/cassettes/test_cache_hitting.yaml
--- a/lib/crewai/tests/experimental/evaluation/test_agent_evaluator.py
+++ b/lib/crewai/tests/experimental/evaluation/test_agent_evaluator.py
@@ -128,8 +128,6 @@ class TestAgentEvaluator:

    @pytest.mark.vcr(filter_headers=["authorization"])
    def test_eval_specific_agents_from_crew(self, mock_crew):
-        from crewai.events.types.task_events import TaskCompletedEvent
-
        agent = Agent(
            role="Test Agent Eval",
            goal="Complete test tasks successfully",
@@ -145,7 +143,7 @@ class TestAgentEvaluator:

        events = {}
        results_condition = threading.Condition()
-        results_ready = False
+        completed_event_received = False

        agent_evaluator = AgentEvaluator(
            agents=[agent], evaluators=[GoalAlignmentEvaluator()]
@@ -158,29 +156,23 @@ class TestAgentEvaluator:

        @crewai_event_bus.on(AgentEvaluationCompletedEvent)
        async def capture_completed(source, event):
+            nonlocal completed_event_received
            if event.agent_id == str(agent.id):
                events["completed"] = event
+                with results_condition:
+                    completed_event_received = True
+                    results_condition.notify()

        @crewai_event_bus.on(AgentEvaluationFailedEvent)
        def capture_failed(source, event):
            events["failed"] = event

-        @crewai_event_bus.on(TaskCompletedEvent)
-        async def on_task_completed(source, event):
-            nonlocal results_ready
-            if event.task and event.task.id == task.id:
-                while not agent_evaluator.get_evaluation_results().get(agent.role):
-                    pass
-                with results_condition:
-                    results_ready = True
-                    results_condition.notify()
-
        mock_crew.kickoff()

        with results_condition:
            assert results_condition.wait_for(
-                lambda: results_ready, timeout=5
-            ), "Timeout waiting for evaluation results"
+                lambda: completed_event_received, timeout=5
+            ), "Timeout waiting for evaluation completed event"

        assert events.keys() == {"started", "completed"}
        assert events["started"].agent_id == str(agent.id)