Fix result_as_answer handling in ToolUsage class

Co-Authored-By: Joe Moura <joao@crewai.com>

docs/changelog.mdx

@@ -4,6 +4,36 @@ description: View the latest updates and changes to CrewAI
 icon: timeline
 ---
 
+<Update label="2025-04-07" description="v0.114.0">
+  ## Release Highlights
+  <Frame>
+    <img src="/images/v01140.png" />
+  </Frame>
+
+  **New Features & Enhancements**
+  - Agents as an atomic unit. (`Agent(...).kickoff()`)
+  - Support for [Custom LLM implementations](https://docs.crewai.com/guides/advanced/custom-llm).
+  - Integrated External Memory and [Opik observability](https://docs.crewai.com/how-to/opik-observability).
+  - Enhanced YAML extraction.
+  - Multimodal agent validation.
+  - Added Secure fingerprints for agents and crews.
+
+  **Core Improvements & Fixes**
+  - Improved serialization, agent copying, and Python compatibility.
+  - Added wildcard support to `emit()`
+  - Added support for additional router calls and context window adjustments.
+  - Fixed typing issues, validation, and import statements.
+  - Improved method performance.
+  - Enhanced agent task handling, event emissions, and memory management.
+  - Fixed CLI issues, conditional tasks, cloning behavior, and tool outputs.
+
+  **Documentation & Guides**
+  - Improved documentation structure, theme, and organization.
+  - Added guides for Local NVIDIA NIM with WSL2, W&B Weave, and Arize Phoenix.
+  - Updated tool configuration examples, prompts, and observability docs.
+  - Guide on using singular agents within Flows.
+</Update>
+
 <Update label="2025-03-17" description="v0.108.0">
   **Features**
   - Converted tabs to spaces in `crew.py` template

docs/concepts/llamaindex-tools.mdx

@@ -1,71 +0,0 @@
----
-title: Using LlamaIndex Tools
-description: Learn how to integrate LlamaIndex tools with CrewAI agents to enhance search-based queries and more.
-icon: toolbox
----
-
-## Using LlamaIndex Tools
-
-<Info>
-    CrewAI seamlessly integrates with LlamaIndex’s comprehensive toolkit for RAG (Retrieval-Augmented Generation) and agentic pipelines, enabling advanced search-based queries and more. 
-</Info>
-
-Here are the available built-in tools offered by LlamaIndex.
-
-```python Code
-from crewai import Agent
-from crewai_tools import LlamaIndexTool
-
-# Example 1: Initialize from FunctionTool
-from llama_index.core.tools import FunctionTool
-
-your_python_function = lambda ...: ...
-og_tool = FunctionTool.from_defaults(
-    your_python_function, 
-    name="<name>", 
-    description='<description>'
-)
-tool = LlamaIndexTool.from_tool(og_tool)
-
-# Example 2: Initialize from LlamaHub Tools
-from llama_index.tools.wolfram_alpha import WolframAlphaToolSpec
-wolfram_spec = WolframAlphaToolSpec(app_id="<app_id>")
-wolfram_tools = wolfram_spec.to_tool_list()
-tools = [LlamaIndexTool.from_tool(t) for t in wolfram_tools]
-
-# Example 3: Initialize Tool from a LlamaIndex Query Engine
-query_engine = index.as_query_engine()
-query_tool = LlamaIndexTool.from_query_engine(
-    query_engine,
-    name="Uber 2019 10K Query Tool",
-    description="Use this tool to lookup the 2019 Uber 10K Annual Report"
-)
-
-# Create and assign the tools to an agent
-agent = Agent(
-    role='Research Analyst',
-    goal='Provide up-to-date market analysis',
-    backstory='An expert analyst with a keen eye for market trends.',
-    tools=[tool, *tools, query_tool]
-)
-
-# rest of the code ...
-```
-
-## Steps to Get Started
-
-To effectively use the LlamaIndexTool, follow these steps:
-
-<Steps>
-    <Step title="Package Installation">
-    Make sure that `crewai[tools]` package is installed in your Python environment:
-    <CodeGroup>
-        ```shell Terminal
-        pip install 'crewai[tools]'
-        ```
-    </CodeGroup>
-    </Step>
-    <Step title="Install and Use LlamaIndex">
-    Follow the LlamaIndex documentation [LlamaIndex Documentation](https://docs.llamaindex.ai/) to set up a RAG/agent pipeline.
-    </Step>
-</Steps>

docs/docs.json

@@ -11,22 +11,21 @@
   "navigation": {
     "tabs": [
       {
-        "tab": "Get Started",
+        "tab": "Documentation",
         "groups": [
           {
             "group": "Get Started",
             "pages": [
               "introduction",
               "installation",
-              "quickstart",
-              "changelog"
+              "quickstart"
             ]
           },
           {
             "group": "Guides",
             "pages": [
               {
-                "group": "Concepts",
+                "group": "Strategy",
                 "pages": [
                   "guides/concepts/evaluating-use-cases"
                 ]
@@ -79,41 +78,6 @@
               "concepts/event-listener"
             ]
           },
-          {
-            "group": "How to Guides",
-            "pages": [
-              "how-to/create-custom-tools",
-              "how-to/sequential-process",
-              "how-to/hierarchical-process",
-              "how-to/custom-manager-agent",
-              "how-to/llm-connections",
-              "how-to/customizing-agents",
-              "how-to/multimodal-agents",
-              "how-to/coding-agents",
-              "how-to/force-tool-output-as-result",
-              "how-to/human-input-on-execution",
-              "how-to/kickoff-async",
-              "how-to/kickoff-for-each",
-              "how-to/replay-tasks-from-latest-crew-kickoff",
-              "how-to/conditional-tasks",
-              "how-to/langchain-tools",
-              "how-to/llamaindex-tools"
-            ]
-          },
-          {
-            "group": "Agent Monitoring & Observability",
-            "pages": [
-              "how-to/agentops-observability",
-              "how-to/arize-phoenix-observability",
-              "how-to/langfuse-observability",
-              "how-to/langtrace-observability",
-              "how-to/mlflow-observability",
-              "how-to/openlit-observability",
-              "how-to/opik-observability",
-              "how-to/portkey-observability",
-              "how-to/weave-integration"
-            ]
-          },
           {
             "group": "Tools",
             "pages": [
@@ -141,6 +105,7 @@
               "tools/hyperbrowserloadtool",
               "tools/linkupsearchtool",
               "tools/llamaindextool",
+              "tools/langchaintool",
               "tools/serperdevtool",
               "tools/s3readertool",
               "tools/s3writertool",
@@ -170,6 +135,40 @@
               "tools/youtubevideosearchtool"
             ]
           },
+          {
+            "group": "Agent Monitoring & Observability",
+            "pages": [
+              "how-to/agentops-observability",
+              "how-to/arize-phoenix-observability",
+              "how-to/langfuse-observability",
+              "how-to/langtrace-observability",
+              "how-to/mlflow-observability",
+              "how-to/openlit-observability",
+              "how-to/opik-observability",
+              "how-to/portkey-observability",
+              "how-to/weave-integration"
+            ]
+          },
+          {
+            "group": "Learn",
+            "pages": [
+              "how-to/conditional-tasks",
+              "how-to/coding-agents",
+              "how-to/create-custom-tools",
+              "how-to/custom-llm",
+              "how-to/custom-manager-agent",
+              "how-to/customizing-agents",
+              "how-to/force-tool-output-as-result",
+              "how-to/hierarchical-process",
+              "how-to/human-input-on-execution",
+              "how-to/kickoff-async",
+              "how-to/kickoff-for-each",
+              "how-to/llm-connections",
+              "how-to/multimodal-agents",
+              "how-to/replay-tasks-from-latest-crew-kickoff",
+              "how-to/sequential-process"
+            ]
+          },
           {
             "group": "Telemetry",
             "pages": [
@@ -188,19 +187,35 @@
             ]
           }
         ]
+      },
+      {
+        "tab": "Releases",
+        "groups": [
+          {
+            "group": "Releases",
+            "pages": [
+              "changelog"
+            ]
+          }
+        ]
       }
     ],
     "global": {
       "anchors": [
         {
-          "anchor": "Community",
+          "anchor": "Website",
+          "href": "https://crewai.com",
+          "icon": "globe"
+        },
+        {
+          "anchor": "Forum",
           "href": "https://community.crewai.com",
           "icon": "discourse"
         },
         {
-          "anchor": "Tutorials",
-          "href": "https://www.youtube.com/@crewAIInc",
-          "icon": "youtube"
+          "anchor": "Get Help",
+          "href": "mailto:support@crewai.com",
+          "icon": "headset"
         }
       ]
     }
@@ -214,6 +229,12 @@
     "strict": false
   },
   "navbar": {
+    "links": [
+      {
+        "label": "Start Free Trial",
+        "href": "https://app.crewai.com"
+      }
+    ],
     "primary": {
       "type": "github",
       "href": "https://github.com/crewAIInc/crewAI"

docs/how-to/custom-llm.mdx

@@ -1,9 +1,13 @@
-# Custom LLM Implementations
+---
+title: Custom LLM Implementation
+description: Learn how to create custom LLM implementations in CrewAI.
+icon: code
+---
+
+## Custom LLM Implementations
 
 CrewAI now supports custom LLM implementations through the `BaseLLM` abstract base class. This allows you to create your own LLM implementations that don't rely on litellm's authentication mechanism.
 
-## Using Custom LLM Implementations
-
 To create a custom LLM implementation, you need to:
 
 1. Inherit from the `BaseLLM` abstract base class

docs/how-to/custom-manager-agent.mdx

@@ -1,5 +1,5 @@
 ---
-title: Create Your Own Manager Agent
+title: Custom Manager Agent
 description: Learn how to set a custom agent as the manager in CrewAI, providing more control over task management and coordination.
 icon: user-shield
 ---

docs/how-to/replay-tasks-from-latest-crew-kickoff.mdx

@@ -20,10 +20,8 @@ Here's an example of how to replay from a task:
 To use the replay feature, follow these steps:
 
 <Steps>
-   <Step title="Open your terminal or command prompt.">
-   </Step>
-   <Step title="Navigate to the directory where your CrewAI project is located.">
-   </Step>
+   <Step title="Open your terminal or command prompt."></Step>
+   <Step title="Navigate to the directory where your CrewAI project is located."></Step>
    <Step title="Run the following commands:">
       To view the latest kickoff task_ids use:
 

docs/quickstart.mdx

@@ -336,9 +336,22 @@ email_summarizer_task:
       - research_task
 ```
 
-## Deploying Your Project
+## Deploying Your Crew
 
-The easiest way to deploy your crew is through [CrewAI Enterprise](http://app.crewai.com), where you can deploy your crew in a few clicks.
+The easiest way to deploy your crew to production is through [CrewAI Enterprise](http://app.crewai.com).
+
+Watch this video tutorial for a step-by-step demonstration of deploying your crew to [CrewAI Enterprise](http://app.crewai.com) using the CLI.
+
+<iframe
+  width="100%"
+  height="400"
+  src="https://www.youtube.com/embed/3EqSV-CYDZA"
+  title="CrewAI Deployment Guide"
+  frameborder="0"
+  style={{ borderRadius: '10px' }}
+  allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
+  allowfullscreen
+></iframe>
 
 <CardGroup cols={2}>
   <Card

docs/tools/langchaintool.mdx

@@ -1,10 +1,10 @@
 ---
-title: Using LangChain Tools
-description: Learn how to integrate LangChain tools with CrewAI agents to enhance search-based queries and more.
+title: LangChain Tool
+description: The `LangChainTool` is a wrapper for LangChain tools and query engines.
 icon: link
 ---
 
-## Using LangChain Tools
+## `LangChainTool`
 
 <Info>
     CrewAI seamlessly integrates with LangChain's comprehensive [list of tools](https://python.langchain.com/docs/integrations/tools/), all of which can be used with CrewAI.

src/crewai/cli/tools/main.py

@@ -117,7 +117,9 @@ class ToolCommand(BaseCommand, PlusAPIMixin):
 
         published_handle = publish_response.json()["handle"]
         console.print(
-            f"Successfully published {published_handle} ({project_version}).\nInstall it in other projects with crewai tool install {published_handle}",
+            f"Successfully published `{published_handle}` ({project_version}).\n\n"
+            + "⚠️ Security checks are running in the background. Your tool will be available once these are complete.\n"
+            + f"You can monitor the status or access your tool here:\nhttps://app.crewai.com/crewai_plus/tools/{published_handle}",
             style="bold green",
         )
 
@@ -153,8 +155,12 @@ class ToolCommand(BaseCommand, PlusAPIMixin):
         login_response_json = login_response.json()
 
         settings = Settings()
-        settings.tool_repository_username = login_response_json["credential"]["username"]
-        settings.tool_repository_password = login_response_json["credential"]["password"]
+        settings.tool_repository_username = login_response_json["credential"][
+            "username"
+        ]
+        settings.tool_repository_password = login_response_json["credential"][
+            "password"
+        ]
         settings.dump()
 
         console.print(
@@ -179,7 +185,7 @@ class ToolCommand(BaseCommand, PlusAPIMixin):
             capture_output=False,
             env=self._build_env_with_credentials(repository_handle),
             text=True,
-            check=True
+            check=True,
         )
 
         if add_package_result.stderr:
@@ -204,7 +210,11 @@ class ToolCommand(BaseCommand, PlusAPIMixin):
         settings = Settings()
 
         env = os.environ.copy()
-        env[f"UV_INDEX_{repository_handle}_USERNAME"] = str(settings.tool_repository_username or "")
-        env[f"UV_INDEX_{repository_handle}_PASSWORD"] = str(settings.tool_repository_password or "")
+        env[f"UV_INDEX_{repository_handle}_USERNAME"] = str(
+            settings.tool_repository_username or ""
+        )
+        env[f"UV_INDEX_{repository_handle}_PASSWORD"] = str(
+            settings.tool_repository_password or ""
+        )
 
         return env

src/crewai/tools/tool_usage.py

@@ -75,6 +75,7 @@ class ToolUsage:
         agent: Optional[Union["BaseAgent", "LiteAgent"]] = None,
         action: Any = None,
         fingerprint_context: Optional[Dict[str, str]] = None,
+        original_tools: List[Any] = [],
     ) -> None:
         self._i18n: I18N = agent.i18n if agent else I18N()
         self._printer: Printer = Printer()
@@ -86,6 +87,7 @@ class ToolUsage:
         self.tools_description = render_text_description_and_args(tools)
         self.tools_names = get_tool_names(tools)
         self.tools_handler = tools_handler
+        self.original_tools = original_tools
         self.tools = tools
         self.task = task
         self.action = action
@@ -191,13 +193,16 @@ class ToolUsage:
             )  # type: ignore
             from_cache = result is not None
 
+        original_tool = None
+        if hasattr(self, 'original_tools') and self.original_tools:
+            original_tool = next(
+                (ot for ot in self.original_tools if ot.name == tool.name),
+                None
+            )
+        
         available_tool = next(
-            (
-                available_tool
-                for available_tool in self.tools
-                if available_tool.name == tool.name
-            ),
-            None,
+            (at for at in self.tools if at.name == tool.name),
+            None
         )
 
         if result is None:
@@ -259,10 +264,11 @@ class ToolUsage:
 
             if self.tools_handler:
                 should_cache = True
-                if (
-                    hasattr(available_tool, "cache_function")
-                    and available_tool.cache_function  # type: ignore # Item "None" of "Any | None" has no attribute "cache_function"
-                ):
+                if original_tool and hasattr(original_tool, "cache_function") and original_tool.cache_function:
+                    should_cache = original_tool.cache_function(
+                        calling.arguments, result
+                    )
+                elif available_tool and hasattr(available_tool, "cache_function") and available_tool.cache_function:
                     should_cache = available_tool.cache_function(  # type: ignore # Item "None" of "Any | None" has no attribute "cache_function"
                         calling.arguments, result
                     )
@@ -290,10 +296,10 @@ class ToolUsage:
             result=result,
         )
 
-        if (
-            hasattr(available_tool, "result_as_answer")
-            and available_tool.result_as_answer  # type: ignore # Item "None" of "Any | None" has no attribute "cache_function"
-        ):
+        if original_tool and hasattr(original_tool, "result_as_answer") and original_tool.result_as_answer:
+            result_as_answer = original_tool.result_as_answer
+            data["result_as_answer"] = result_as_answer
+        elif available_tool and hasattr(available_tool, "result_as_answer") and available_tool.result_as_answer:
             result_as_answer = available_tool.result_as_answer  # type: ignore # Item "None" of "Any | None" has no attribute "result_as_answer"
             data["result_as_answer"] = result_as_answer  # type: ignore
 

src/crewai/utilities/tool_utils.py

@@ -60,6 +60,7 @@ def execute_tool_and_check_finality(
             task=task,
             agent=agent,
             action=agent_action,
+            original_tools=tools,  # Pass original tools to ensure custom tools work
         )
 
         # Parse tool calling

tests/tools/test_custom_tool_invocation.py

@@ -0,0 +1,77 @@
+from unittest.mock import MagicMock
+
+import pytest
+from pydantic import BaseModel, Field
+
+from crewai import Agent, Task
+from crewai.agents.crew_agent_executor import CrewAgentExecutor
+from crewai.agents.parser import AgentAction
+from crewai.agents.tools_handler import ToolsHandler
+from crewai.tools import BaseTool
+from crewai.utilities.i18n import I18N
+from crewai.utilities.tool_utils import execute_tool_and_check_finality
+
+
+class TestToolInput(BaseModel):
+    test_param: str = Field(..., description="A test parameter")
+
+
+class TestCustomTool(BaseTool):
+    name: str = "Test Custom Tool"
+    description: str = "A test tool to verify custom tool invocation"
+    args_schema: type[BaseModel] = TestToolInput
+
+    def _run(self, test_param: str) -> str:
+        return f"Tool executed with param: {test_param}"
+
+
+def test_custom_tool_invocation():
+    custom_tool = TestCustomTool()
+    
+    mock_agent = MagicMock()
+    mock_task = MagicMock()
+    mock_llm = MagicMock()
+    mock_crew = MagicMock()
+    tools_handler = ToolsHandler()
+    
+    executor = CrewAgentExecutor(
+        llm=mock_llm,
+        task=mock_task,
+        crew=mock_crew,
+        agent=mock_agent,
+        prompt={},
+        max_iter=5,
+        tools=[custom_tool],
+        tools_names="Test Custom Tool",
+        stop_words=[],
+        tools_description="A test tool to verify custom tool invocation",
+        tools_handler=tools_handler,
+        original_tools=[custom_tool]
+    )
+    
+    action = AgentAction(
+        tool="Test Custom Tool",
+        tool_input={"test_param": "test_value"},
+        thought="I'll use the custom tool",
+        text="I'll use the Test Custom Tool to get a result"
+    )
+    
+    i18n = I18N()
+    
+    mock_agent.key = "test_agent"
+    mock_agent.role = "test_role"
+    
+    result = execute_tool_and_check_finality(
+        agent_action=action,
+        tools=[custom_tool],
+        i18n=i18n,
+        agent_key=mock_agent.key,
+        agent_role=mock_agent.role,
+        tools_handler=tools_handler,
+        task=mock_task,
+        agent=mock_agent,
+        function_calling_llm=mock_llm
+    )
+    
+    assert "Tool executed with param: test_value" in result.result
+    assert result.result_as_answer is False