Revert "Update CodeQL workflow to include custom config file"

This reverts commit 9c54bfce1b.

.env.test

@@ -1,161 +0,0 @@
-# =============================================================================
-# Test Environment Variables
-# =============================================================================
-# This file contains all environment variables needed to run tests locally
-# in a way that mimics the GitHub Actions CI environment.
-
-# =============================================================================
-
-# -----------------------------------------------------------------------------
-# LLM Provider API Keys
-# -----------------------------------------------------------------------------
-OPENAI_API_KEY=fake-api-key
-ANTHROPIC_API_KEY=fake-anthropic-key
-GEMINI_API_KEY=fake-gemini-key
-AZURE_API_KEY=fake-azure-key
-OPENROUTER_API_KEY=fake-openrouter-key
-
-# -----------------------------------------------------------------------------
-# AWS Credentials
-# -----------------------------------------------------------------------------
-AWS_ACCESS_KEY_ID=fake-aws-access-key
-AWS_SECRET_ACCESS_KEY=fake-aws-secret-key
-AWS_DEFAULT_REGION=us-east-1
-AWS_REGION_NAME=us-east-1
-
-# -----------------------------------------------------------------------------
-# Azure OpenAI Configuration
-# -----------------------------------------------------------------------------
-AZURE_ENDPOINT=https://fake-azure-endpoint.openai.azure.com
-AZURE_OPENAI_ENDPOINT=https://fake-azure-endpoint.openai.azure.com
-AZURE_OPENAI_API_KEY=fake-azure-openai-key
-AZURE_API_VERSION=2024-02-15-preview
-OPENAI_API_VERSION=2024-02-15-preview
-
-# -----------------------------------------------------------------------------
-# Google Cloud Configuration
-# -----------------------------------------------------------------------------
-#GOOGLE_CLOUD_PROJECT=fake-gcp-project
-#GOOGLE_CLOUD_LOCATION=us-central1
-
-# -----------------------------------------------------------------------------
-# OpenAI Configuration
-# -----------------------------------------------------------------------------
-OPENAI_BASE_URL=https://api.openai.com/v1
-OPENAI_API_BASE=https://api.openai.com/v1
-
-# -----------------------------------------------------------------------------
-# Search & Scraping Tool API Keys
-# -----------------------------------------------------------------------------
-SERPER_API_KEY=fake-serper-key
-EXA_API_KEY=fake-exa-key
-BRAVE_API_KEY=fake-brave-key
-FIRECRAWL_API_KEY=fake-firecrawl-key
-TAVILY_API_KEY=fake-tavily-key
-SERPAPI_API_KEY=fake-serpapi-key
-SERPLY_API_KEY=fake-serply-key
-LINKUP_API_KEY=fake-linkup-key
-PARALLEL_API_KEY=fake-parallel-key
-
-# -----------------------------------------------------------------------------
-# Exa Configuration
-# -----------------------------------------------------------------------------
-EXA_BASE_URL=https://api.exa.ai
-
-# -----------------------------------------------------------------------------
-# Web Scraping & Automation
-# -----------------------------------------------------------------------------
-BRIGHT_DATA_API_KEY=fake-brightdata-key
-BRIGHT_DATA_ZONE=fake-zone
-BRIGHTDATA_API_URL=https://api.brightdata.com
-BRIGHTDATA_DEFAULT_TIMEOUT=600
-BRIGHTDATA_DEFAULT_POLLING_INTERVAL=1
-
-OXYLABS_USERNAME=fake-oxylabs-user
-OXYLABS_PASSWORD=fake-oxylabs-pass
-
-SCRAPFLY_API_KEY=fake-scrapfly-key
-SCRAPEGRAPH_API_KEY=fake-scrapegraph-key
-
-BROWSERBASE_API_KEY=fake-browserbase-key
-BROWSERBASE_PROJECT_ID=fake-browserbase-project
-
-HYPERBROWSER_API_KEY=fake-hyperbrowser-key
-MULTION_API_KEY=fake-multion-key
-APIFY_API_TOKEN=fake-apify-token
-
-# -----------------------------------------------------------------------------
-# Database & Vector Store Credentials
-# -----------------------------------------------------------------------------
-SINGLESTOREDB_URL=mysql://fake:fake@localhost:3306/fake
-SINGLESTOREDB_HOST=localhost
-SINGLESTOREDB_PORT=3306
-SINGLESTOREDB_USER=fake-user
-SINGLESTOREDB_PASSWORD=fake-password
-SINGLESTOREDB_DATABASE=fake-database
-SINGLESTOREDB_CONNECT_TIMEOUT=30
-
-SNOWFLAKE_USER=fake-snowflake-user
-SNOWFLAKE_PASSWORD=fake-snowflake-password
-SNOWFLAKE_ACCOUNT=fake-snowflake-account
-SNOWFLAKE_WAREHOUSE=fake-snowflake-warehouse
-SNOWFLAKE_DATABASE=fake-snowflake-database
-SNOWFLAKE_SCHEMA=fake-snowflake-schema
-
-WEAVIATE_URL=http://localhost:8080
-WEAVIATE_API_KEY=fake-weaviate-key
-
-EMBEDCHAIN_DB_URI=sqlite:///test.db
-
-# Databricks Credentials
-DATABRICKS_HOST=https://fake-databricks.cloud.databricks.com
-DATABRICKS_TOKEN=fake-databricks-token
-DATABRICKS_CONFIG_PROFILE=fake-profile
-
-# MongoDB Credentials
-MONGODB_URI=mongodb://fake:fake@localhost:27017/fake
-
-# -----------------------------------------------------------------------------
-# CrewAI Platform & Enterprise
-# -----------------------------------------------------------------------------
-# setting CREWAI_PLATFORM_INTEGRATION_TOKEN causes these test to fail:
-#=========================== short test summary info ============================
-#FAILED tests/test_context.py::TestPlatformIntegrationToken::test_platform_context_manager_basic_usage - AssertionError: assert 'fake-platform-token' is None
-# +  where 'fake-platform-token' = get_platform_integration_token()
-#FAILED tests/test_context.py::TestPlatformIntegrationToken::test_context_var_isolation_between_tests - AssertionError: assert 'fake-platform-token' is None
-# +  where 'fake-platform-token' = get_platform_integration_token()
-#FAILED tests/test_context.py::TestPlatformIntegrationToken::test_multiple_sequential_context_managers - AssertionError: assert 'fake-platform-token' is None
-# +  where 'fake-platform-token' = get_platform_integration_token()
-#CREWAI_PLATFORM_INTEGRATION_TOKEN=fake-platform-token
-CREWAI_PERSONAL_ACCESS_TOKEN=fake-personal-token
-CREWAI_PLUS_URL=https://fake.crewai.com
-
-# -----------------------------------------------------------------------------
-# Other Service API Keys
-# -----------------------------------------------------------------------------
-ZAPIER_API_KEY=fake-zapier-key
-PATRONUS_API_KEY=fake-patronus-key
-MINDS_API_KEY=fake-minds-key
-HF_TOKEN=fake-hf-token
-
-# -----------------------------------------------------------------------------
-# Feature Flags/Testing Modes
-# -----------------------------------------------------------------------------
-CREWAI_DISABLE_TELEMETRY=true
-OTEL_SDK_DISABLED=true
-CREWAI_TESTING=true
-CREWAI_TRACING_ENABLED=false
-
-# -----------------------------------------------------------------------------
-# Testing/CI Configuration
-# -----------------------------------------------------------------------------
-# VCR recording mode: "none" (default), "new_episodes", "all", "once"
-PYTEST_VCR_RECORD_MODE=none
-
-# Set to "true" by GitHub when running in GitHub Actions
-# GITHUB_ACTIONS=false
-
-# -----------------------------------------------------------------------------
-# Python Configuration
-# -----------------------------------------------------------------------------
-PYTHONUNBUFFERED=1

.github/codeql/codeql-config.yml

@@ -1,28 +0,0 @@
-name: "CodeQL Config"
-
-paths-ignore:
-  # Ignore template files - these are boilerplate code that shouldn't be analyzed
-  - "lib/crewai/src/crewai/cli/templates/**"
-  # Ignore test cassettes - these are test fixtures/recordings
-  - "lib/crewai/tests/cassettes/**"
-  - "lib/crewai-tools/tests/cassettes/**"
-  # Ignore cache and build artifacts
-  - ".cache/**"
-  # Ignore documentation build artifacts
-  - "docs/.cache/**"
-  # Ignore experimental code
-  - "lib/crewai/src/crewai/experimental/a2a/**"
-
-paths:
-  # Include all Python source code from workspace packages
-  - "lib/crewai/src/**"
-  - "lib/crewai-tools/src/**"
-  - "lib/devtools/src/**"
-  # Include tests (but exclude cassettes via paths-ignore)
-  - "lib/crewai/tests/**"
-  - "lib/crewai-tools/tests/**"
-  - "lib/devtools/tests/**"
-
-# Configure specific queries or packs if needed
-# queries:
-#   - uses: security-and-quality

.github/dependabot.yml

@@ -1,11 +0,0 @@
-# To get started with Dependabot version updates, you'll need to specify which 
-# package ecosystems to update and where the package manifests are located.
-# Please see the documentation for all configuration options:
-# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
-
-version: 2
-updates:
-  - package-ecosystem: uv # See documentation for possible values
-    directory: "/" # Location of package manifests
-    schedule:
-      interval: "weekly"

.github/security.md

@@ -1,50 +1,27 @@
-## CrewAI Security Policy
+## CrewAI Security Vulnerability Reporting Policy
 
-We are committed to protecting the confidentiality, integrity, and availability of the CrewAI ecosystem. This policy explains how to report potential vulnerabilities and what you can expect from us when you do.
+CrewAI prioritizes the security of our software products, services, and GitHub repositories. To promptly address vulnerabilities, follow these steps for reporting security issues:
 
-### Scope
+### Reporting Process
+Do **not** report vulnerabilities via public GitHub issues.
 
-We welcome reports for vulnerabilities that could impact:
+Email all vulnerability reports directly to:  
+**security@crewai.com**
 
-- CrewAI-maintained source code and repositories
-- CrewAI-operated infrastructure and services
-- Official CrewAI releases, packages, and distributions
+### Required Information
+To help us quickly validate and remediate the issue, your report must include:
 
-Issues affecting clearly unaffiliated third-party services or user-generated content are out of scope, unless you can demonstrate a direct impact on CrewAI systems or customers.
+- **Vulnerability Type:** Clearly state the vulnerability type (e.g., SQL injection, XSS, privilege escalation).
+- **Affected Source Code:** Provide full file paths and direct URLs (branch, tag, or commit).
+- **Reproduction Steps:** Include detailed, step-by-step instructions. Screenshots are recommended.
+- **Special Configuration:** Document any special settings or configurations required to reproduce.
+- **Proof-of-Concept (PoC):** Provide exploit or PoC code (if available).
+- **Impact Assessment:** Clearly explain the severity and potential exploitation scenarios.
 
-### How to Report
+### Our Response
+- We will acknowledge receipt of your report promptly via your provided email.
+- Confirmed vulnerabilities will receive priority remediation based on severity.
+- Patches will be released as swiftly as possible following verification.
 
-- **Please do not** disclose vulnerabilities via public GitHub issues, pull requests, or social media.
-- Email detailed reports to **security@crewai.com** with the subject line `Security Report`.
-- If you need to share large files or sensitive artifacts, mention it in your email and we will coordinate a secure transfer method.
-
-### What to Include
-
-Providing comprehensive information enables us to validate the issue quickly:
-
-- **Vulnerability overview** — a concise description and classification (e.g., RCE, privilege escalation)
-- **Affected components** — repository, branch, tag, or deployed service along with relevant file paths or endpoints
-- **Reproduction steps** — detailed, step-by-step instructions; include logs, screenshots, or screen recordings when helpful
-- **Proof-of-concept** — exploit details or code that demonstrates the impact (if available)
-- **Impact analysis** — severity assessment, potential exploitation scenarios, and any prerequisites or special configurations
-
-### Our Commitment
-
-- **Acknowledgement:** We aim to acknowledge your report within two business days.
-- **Communication:** We will keep you informed about triage results, remediation progress, and planned release timelines.
-- **Resolution:** Confirmed vulnerabilities will be prioritized based on severity and fixed as quickly as possible.
-- **Recognition:** We currently do not run a bug bounty program; any rewards or recognition are issued at CrewAI's discretion.
-
-### Coordinated Disclosure
-
-We ask that you allow us a reasonable window to investigate and remediate confirmed issues before any public disclosure. We will coordinate publication timelines with you whenever possible.
-
-### Safe Harbor
-
-We will not pursue or support legal action against individuals who, in good faith:
-
-- Follow this policy and refrain from violating any applicable laws
-- Avoid privacy violations, data destruction, or service disruption
-- Limit testing to systems in scope and respect rate limits and terms of service
-
-If you are unsure whether your testing is covered, please contact us at **security@crewai.com** before proceeding.
+### Reward Notice
+Currently, we do not offer a bug bounty program. Rewards, if issued, are discretionary.

.github/workflows/build-uv-cache.yml

@@ -7,8 +7,6 @@ on:
     paths:
       - "uv.lock"
       - "pyproject.toml"
-  schedule:
-    - cron: "0 0 */5 * *"  # Run every 5 days at midnight UTC to prevent cache expiration
   workflow_dispatch:
 
 permissions:

.github/workflows/canary.yml

@@ -0,0 +1,50 @@
+name: Canary Crew Check
+
+on:
+  push:
+    branches:
+      - main
+      - Canary-Crew-Github-Action
+  pull_request:
+    branches:
+      - main
+
+permissions:
+  contents: read
+
+env:
+  OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
+
+jobs:
+  canary-run:
+    name: Run Canary Crew
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Set up uv
+        uses: astral-sh/setup-uv@v6
+        with:
+          version: "0.8.4"
+          python-version: "3.11"
+
+      - name: Install canary dependencies
+        working-directory: canary
+        run: uv sync
+
+      - name: Run canary crew
+        working-directory: canary
+        run: uv run crewai run
+
+      - name: Upload canary report
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: canary-report
+          path: canary/report.md
+          if-no-files-found: ignore

.github/workflows/codeql.yml

@@ -15,11 +15,11 @@ on:
   push:
     branches: [ "main" ]
     paths-ignore:
-      - "lib/crewai/src/crewai/cli/templates/**"
+      - "src/crewai/cli/templates/**"
   pull_request:
     branches: [ "main" ]
     paths-ignore:
-      - "lib/crewai/src/crewai/cli/templates/**"
+      - "src/crewai/cli/templates/**"
 
 jobs:
   analyze:
@@ -73,7 +73,6 @@ jobs:
       with:
         languages: ${{ matrix.language }}
         build-mode: ${{ matrix.build-mode }}
-        config-file: ./.github/codeql/codeql-config.yml
         # If you wish to specify custom queries, you can do so here or in a config file.
         # By default, queries listed here will override any specified in a config file.
         # Prefix the list here with "+" to use these queries and those in the config file.

.github/workflows/docs-broken-links.yml

@@ -1,35 +0,0 @@
-name: Check Documentation Broken Links
-
-on:
-  pull_request:
-    paths:
-      - "docs/**"
-      - "docs.json"
-  push:
-    branches:
-      - main
-    paths:
-      - "docs/**"
-      - "docs.json"
-  workflow_dispatch:
-
-jobs:
-  check-links:
-    name: Check broken links
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Set up Node
-        uses: actions/setup-node@v4
-        with:
-          node-version: "latest"
-
-      - name: Install Mintlify CLI
-        run: npm i -g mintlify
-
-      - name: Run broken link checker
-        run: |
-          # Auto-answer the prompt with yes command
-          yes "" | mintlify broken-links || test $? -eq 141
-        working-directory: ./docs

.github/workflows/linter.yml

@@ -52,11 +52,10 @@ jobs:
       - name: Run Ruff on Changed Files
         if: ${{ steps.changed-files.outputs.files != '' }}
         run: |
-         echo "${{ steps.changed-files.outputs.files }}" \
-           | tr ' ' '\n' \
-           | grep -v 'src/crewai/cli/templates/' \
-           | grep -v '/tests/' \
-           | xargs -I{} uv run ruff check "{}"
+          echo "${{ steps.changed-files.outputs.files }}" \
+            | tr ' ' '\n' \
+            | grep -v 'src/crewai/cli/templates/' \
+            | xargs -I{} uv run ruff check "{}"
 
       - name: Save uv caches
         if: steps.cache-restore.outputs.cache-hit != 'true'

.github/workflows/publish.yml

@@ -1,81 +0,0 @@
-name: Publish to PyPI
-
-on:
-  release:
-    types: [ published ]
-  workflow_dispatch:
-
-jobs:
-  build:
-    name: Build packages
-    runs-on: ubuntu-latest
-    permissions:
-        contents: read
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.12"
-
-      - name: Install uv
-        uses: astral-sh/setup-uv@v4
-
-      - name: Build packages
-        run: |
-          uv build --all-packages
-          rm dist/.gitignore
-
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: dist
-          path: dist/
-
-  publish:
-    name: Publish to PyPI
-    needs: build
-    runs-on: ubuntu-latest
-    environment:
-      name: pypi
-      url: https://pypi.org/p/crewai
-    permissions:
-      id-token: write
-      contents: read
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Install uv
-        uses: astral-sh/setup-uv@v6
-        with:
-          version: "0.8.4"
-          python-version: "3.12"
-          enable-cache: false
-
-      - name: Download artifacts
-        uses: actions/download-artifact@v4
-        with:
-          name: dist
-          path: dist
-
-      - name: Publish to PyPI
-        env:
-          UV_PUBLISH_TOKEN: ${{ secrets.PYPI_API_TOKEN }}
-        run: |
-          failed=0
-          for package in dist/*; do
-            if [[ "$package" == *"crewai_devtools"* ]]; then
-              echo "Skipping private package: $package"
-              continue
-            fi
-            echo "Publishing $package"
-            if ! uv publish "$package"; then
-              echo "Failed to publish $package"
-              failed=1
-            fi
-          done
-          if [ $failed -eq 1 ]; then
-            echo "Some packages failed to publish"
-            exit 1
-          fi

.github/workflows/tests.yml

@@ -5,6 +5,10 @@ on: [pull_request]
 permissions:
   contents: read
 
+env:
+  OPENAI_API_KEY: fake-api-key
+  PYTHONUNBUFFERED: 1
+
 jobs:
   tests:
     name: tests (${{ matrix.python-version }})
@@ -52,13 +56,13 @@ jobs:
       - name: Run tests (group ${{ matrix.group }} of 8)
         run: |
           PYTHON_VERSION_SAFE=$(echo "${{ matrix.python-version }}" | tr '.' '_')
-          DURATION_FILE="../../.test_durations_py${PYTHON_VERSION_SAFE}"
-
+          DURATION_FILE=".test_durations_py${PYTHON_VERSION_SAFE}"
+          
           # Temporarily always skip cached durations to fix test splitting
           # When durations don't match, pytest-split runs duplicate tests instead of splitting
           echo "Using even test splitting (duration cache disabled until fix merged)"
           DURATIONS_ARG=""
-
+          
           # Original logic (disabled temporarily):
           # if [ ! -f "$DURATION_FILE" ]; then
           #   echo "No cached durations found, tests will be split evenly"
@@ -70,25 +74,18 @@ jobs:
           #   echo "No test changes detected, using cached test durations for optimal splitting"
           #   DURATIONS_ARG="--durations-path=${DURATION_FILE}"
           # fi
-
-          cd lib/crewai && uv run pytest \
+          
+          uv run pytest \
+            --block-network \
+            --timeout=30 \
             -vv \
             --splits 8 \
             --group ${{ matrix.group }} \
             $DURATIONS_ARG \
             --durations=10 \
+            -n auto \
             --maxfail=3
 
-      - name: Run tool tests (group ${{ matrix.group }} of 8)
-        run: |
-          cd lib/crewai-tools && uv run pytest \
-            -vv \
-            --splits 8 \
-            --group ${{ matrix.group }} \
-            --durations=10 \
-            --maxfail=3
-
-
       - name: Save uv caches
         if: steps.cache-restore.outputs.cache-hit != 'true'
         uses: actions/cache/save@v4

.gitignore

@@ -2,6 +2,7 @@
 .pytest_cache
 __pycache__
 dist/
+lib/
 .env
 assets/*
 .idea

.pre-commit-config.yaml

@@ -3,25 +3,17 @@ repos:
     hooks:
       - id: ruff
         name: ruff
-        entry: bash -c 'source .venv/bin/activate && uv run ruff check --config pyproject.toml "$@"' --
+        entry: uv run ruff check
         language: system
-        pass_filenames: true
         types: [python]
       - id: ruff-format
         name: ruff-format
-        entry: bash -c 'source .venv/bin/activate && uv run ruff format --config pyproject.toml "$@"' --
+        entry: uv run ruff format
         language: system
-        pass_filenames: true
         types: [python]
       - id: mypy
         name: mypy
-        entry: bash -c 'source .venv/bin/activate && uv run mypy --config-file pyproject.toml "$@"' --
+        entry: uv run mypy
         language: system
-        pass_filenames: true
         types: [python]
-        exclude: ^(lib/crewai/src/crewai/cli/templates/|lib/crewai/tests/|lib/crewai-tools/tests/)
-  - repo: https://github.com/astral-sh/uv-pre-commit
-    rev: 0.9.3
-    hooks:
-      - id: uv-lock
-
+        exclude: ^tests/

README.md

@@ -62,9 +62,9 @@
 With over 100,000 developers certified through our community courses at [learn.crewai.com](https://learn.crewai.com), CrewAI is rapidly becoming the
 standard for enterprise-ready AI automation.
 
-# CrewAI AOP Suite
+# CrewAI Enterprise Suite
 
-CrewAI AOP Suite is a comprehensive bundle tailored for organizations that require secure, scalable, and easy-to-manage agent-driven automation.
+CrewAI Enterprise Suite is a comprehensive bundle tailored for organizations that require secure, scalable, and easy-to-manage agent-driven automation.
 
 You can try one part of the suite the [Crew Control Plane for free](https://app.crewai.com)
 
@@ -76,9 +76,9 @@ You can try one part of the suite the [Crew Control Plane for free](https://app.
 - **Advanced Security**: Built-in robust security and compliance measures ensuring safe deployment and management.
 - **Actionable Insights**: Real-time analytics and reporting to optimize performance and decision-making.
 - **24/7 Support**: Dedicated enterprise support to ensure uninterrupted operation and quick resolution of issues.
-- **On-premise and Cloud Deployment Options**: Deploy CrewAI AOP on-premise or in the cloud, depending on your security and compliance requirements.
+- **On-premise and Cloud Deployment Options**: Deploy CrewAI Enterprise on-premise or in the cloud, depending on your security and compliance requirements.
 
-CrewAI AOP is designed for enterprises seeking a powerful, reliable solution to transform complex business processes into efficient,
+CrewAI Enterprise is designed for enterprises seeking a powerful, reliable solution to transform complex business processes into efficient,
 intelligent automations.
 
 ## Table of contents
@@ -674,9 +674,9 @@ CrewAI is released under the [MIT License](https://github.com/crewAIInc/crewAI/b
 
 ### Enterprise Features
 
-- [What additional features does CrewAI AOP offer?](#q-what-additional-features-does-crewai-amp-offer)
-- [Is CrewAI AOP available for cloud and on-premise deployments?](#q-is-crewai-amp-available-for-cloud-and-on-premise-deployments)
-- [Can I try CrewAI AOP for free?](#q-can-i-try-crewai-amp-for-free)
+- [What additional features does CrewAI Enterprise offer?](#q-what-additional-features-does-crewai-enterprise-offer)
+- [Is CrewAI Enterprise available for cloud and on-premise deployments?](#q-is-crewai-enterprise-available-for-cloud-and-on-premise-deployments)
+- [Can I try CrewAI Enterprise for free?](#q-can-i-try-crewai-enterprise-for-free)
 
 ### Q: What exactly is CrewAI?
 
@@ -732,17 +732,17 @@ A: Check out practical examples in the [CrewAI-examples repository](https://gith
 
 A: Contributions are warmly welcomed! Fork the repository, create your branch, implement your changes, and submit a pull request. See the Contribution section of the README for detailed guidelines.
 
-### Q: What additional features does CrewAI AOP offer?
+### Q: What additional features does CrewAI Enterprise offer?
 
-A: CrewAI AOP provides advanced features such as a unified control plane, real-time observability, secure integrations, advanced security, actionable insights, and dedicated 24/7 enterprise support.
+A: CrewAI Enterprise provides advanced features such as a unified control plane, real-time observability, secure integrations, advanced security, actionable insights, and dedicated 24/7 enterprise support.
 
-### Q: Is CrewAI AOP available for cloud and on-premise deployments?
+### Q: Is CrewAI Enterprise available for cloud and on-premise deployments?
 
-A: Yes, CrewAI AOP supports both cloud-based and on-premise deployment options, allowing enterprises to meet their specific security and compliance requirements.
+A: Yes, CrewAI Enterprise supports both cloud-based and on-premise deployment options, allowing enterprises to meet their specific security and compliance requirements.
 
-### Q: Can I try CrewAI AOP for free?
+### Q: Can I try CrewAI Enterprise for free?
 
-A: Yes, you can explore part of the CrewAI AOP Suite by accessing the [Crew Control Plane](https://app.crewai.com) for free.
+A: Yes, you can explore part of the CrewAI Enterprise Suite by accessing the [Crew Control Plane](https://app.crewai.com) for free.
 
 ### Q: Does CrewAI support fine-tuning or training custom models?
 
@@ -762,7 +762,7 @@ A: CrewAI is highly scalable, supporting simple automations and large-scale ente
 
 ### Q: Does CrewAI offer debugging and monitoring tools?
 
-A: Yes, CrewAI AOP includes advanced debugging, tracing, and real-time observability features, simplifying the management and troubleshooting of your automations.
+A: Yes, CrewAI Enterprise includes advanced debugging, tracing, and real-time observability features, simplifying the management and troubleshooting of your automations.
 
 ### Q: What programming languages does CrewAI support?
 

canary/.gitignore

@@ -0,0 +1,5 @@
+.env
+__pycache__/
+.DS_Store
+
+report.md

canary/README.md

@@ -0,0 +1,54 @@
+# Canary Crew
+
+Welcome to the Canary Crew project, powered by [crewAI](https://crewai.com). This template is designed to help you set up a multi-agent AI system with ease, leveraging the powerful and flexible framework provided by crewAI. Our goal is to enable your agents to collaborate effectively on complex tasks, maximizing their collective intelligence and capabilities.
+
+## Installation
+
+Ensure you have Python >=3.10 <3.13 installed on your system. This project uses [UV](https://docs.astral.sh/uv/) for dependency management and package handling, offering a seamless setup and execution experience.
+
+First, if you haven't already, install uv:
+
+```bash
+pip install uv
+```
+
+Next, navigate to your project directory and install the dependencies:
+
+(Optional) Lock the dependencies and install them by using the CLI command:
+```bash
+crewai install
+```
+### Customizing
+
+**Add your `OPENAI_API_KEY` into the `.env` file**
+
+- Modify `src/canary/config/agents.yaml` to define your agents
+- Modify `src/canary/config/tasks.yaml` to define your tasks
+- Modify `src/canary/crew.py` to add your own logic, tools and specific args
+- Modify `src/canary/main.py` to add custom inputs for your agents and tasks
+
+## Running the Project
+
+To kickstart your crew of AI agents and begin task execution, run this from the root folder of your project:
+
+```bash
+$ crewai run
+```
+
+This command initializes the canary Crew, assembling the agents and assigning them tasks as defined in your configuration.
+
+This example, unmodified, will run the create a `report.md` file with the output of a research on LLMs in the root folder.
+
+## Understanding Your Crew
+
+The canary Crew is composed of multiple AI agents, each with unique roles, goals, and tools. These agents collaborate on a series of tasks, defined in `config/tasks.yaml`, leveraging their collective skills to achieve complex objectives. The `config/agents.yaml` file outlines the capabilities and configurations of each agent in your crew.
+
+## Support
+
+For support, questions, or feedback regarding the Canary Crew or crewAI.
+- Visit our [documentation](https://docs.crewai.com)
+- Reach out to us through our [GitHub repository](https://github.com/joaomdmoura/crewai)
+- [Join our Discord](https://discord.com/invite/X4JWnZnxPb)
+- [Chat with our docs](https://chatg.pt/DWjSBZn)
+
+Let's create wonders together with the power and simplicity of crewAI.

canary/pyproject.toml

@@ -0,0 +1,23 @@
+[project]
+name = "canary"
+version = "0.1.0"
+description = "canary using crewAI"
+authors = [{ name = "Your Name", email = "you@example.com" }]
+requires-python = ">=3.10,<3.13"
+dependencies = [
+    "crewai[tools]>=0.120.1,<1.0.0"
+]
+
+[project.scripts]
+canary = "canary.main:run"
+run_crew = "canary.main:run"
+train = "canary.main:train"
+replay = "canary.main:replay"
+test = "canary.main:test"
+
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[tool.crewai]
+type = "crew"

canary/src/canary/crew.py

@@ -0,0 +1,64 @@
+from crewai import Agent, Crew, Process, Task
+from crewai.project import CrewBase, agent, crew, task
+from crewai.agents.agent_builder.base_agent import BaseAgent
+from typing import List
+# If you want to run a snippet of code before or after the crew starts,
+# you can use the @before_kickoff and @after_kickoff decorators
+# https://docs.crewai.com/concepts/crews#example-crew-class-with-decorators
+
+@CrewBase
+class Canary():
+    """Canary crew"""
+
+    agents: List[BaseAgent]
+    tasks: List[Task]
+
+    # Learn more about YAML configuration files here:
+    # Agents: https://docs.crewai.com/concepts/agents#yaml-configuration-recommended
+    # Tasks: https://docs.crewai.com/concepts/tasks#yaml-configuration-recommended
+    
+    # If you would like to add tools to your agents, you can learn more about it here:
+    # https://docs.crewai.com/concepts/agents#agent-tools
+    @agent
+    def researcher(self) -> Agent:
+        return Agent(
+            config=self.agents_config['researcher'], # type: ignore[index]
+            verbose=True
+        )
+
+    @agent
+    def reporting_analyst(self) -> Agent:
+        return Agent(
+            config=self.agents_config['reporting_analyst'], # type: ignore[index]
+            verbose=True
+        )
+
+    # To learn more about structured task outputs,
+    # task dependencies, and task callbacks, check out the documentation:
+    # https://docs.crewai.com/concepts/tasks#overview-of-a-task
+    @task
+    def research_task(self) -> Task:
+        return Task(
+            config=self.tasks_config['research_task'], # type: ignore[index]
+        )
+
+    @task
+    def reporting_task(self) -> Task:
+        return Task(
+            config=self.tasks_config['reporting_task'], # type: ignore[index]
+            output_file='report.md'
+        )
+
+    @crew
+    def crew(self) -> Crew:
+        """Creates the Canary crew"""
+        # To learn how to add knowledge sources to your crew, check out the documentation:
+        # https://docs.crewai.com/concepts/knowledge#what-is-knowledge
+
+        return Crew(
+            agents=self.agents, # Automatically created by the @agent decorator
+            tasks=self.tasks, # Automatically created by the @task decorator
+            process=Process.sequential,
+            verbose=True,
+            # process=Process.hierarchical, # In case you wanna use that instead https://docs.crewai.com/how-to/Hierarchical/
+        )

canary/src/canary/main.py

@@ -0,0 +1,68 @@
+#!/usr/bin/env python
+import sys
+import warnings
+
+from datetime import datetime
+
+from canary.crew import Canary
+
+warnings.filterwarnings("ignore", category=SyntaxWarning, module="pysbd")
+
+# This main file is intended to be a way for you to run your
+# crew locally, so refrain from adding unnecessary logic into this file.
+# Replace with inputs you want to test with, it will automatically
+# interpolate any tasks and agents information
+
+def run():
+    """
+    Run the crew.
+    """
+    inputs = {
+        'topic': 'AI LLMs',
+        'current_year': str(datetime.now().year)
+    }
+    
+    try:
+        Canary().crew().kickoff(inputs=inputs)
+    except Exception as e:
+        raise Exception(f"An error occurred while running the crew: {e}")
+
+
+def train():
+    """
+    Train the crew for a given number of iterations.
+    """
+    inputs = {
+        "topic": "AI LLMs",
+        'current_year': str(datetime.now().year)
+    }
+    try:
+        Canary().crew().train(n_iterations=int(sys.argv[1]), filename=sys.argv[2], inputs=inputs)
+
+    except Exception as e:
+        raise Exception(f"An error occurred while training the crew: {e}")
+
+def replay():
+    """
+    Replay the crew execution from a specific task.
+    """
+    try:
+        Canary().crew().replay(task_id=sys.argv[1])
+
+    except Exception as e:
+        raise Exception(f"An error occurred while replaying the crew: {e}")
+
+def test():
+    """
+    Test the crew execution and returns the results.
+    """
+    inputs = {
+        "topic": "AI LLMs",
+        "current_year": str(datetime.now().year)
+    }
+    
+    try:
+        Canary().crew().test(n_iterations=int(sys.argv[1]), eval_llm=sys.argv[2], inputs=inputs)
+
+    except Exception as e:
+        raise Exception(f"An error occurred while testing the crew: {e}")

conftest.py

@@ -1,197 +0,0 @@
-"""Pytest configuration for crewAI workspace."""
-
-from collections.abc import Generator
-import os
-from pathlib import Path
-import tempfile
-from typing import Any
-
-from dotenv import load_dotenv
-import pytest
-from vcr.request import Request  # type: ignore[import-untyped]
-
-
-env_test_path = Path(__file__).parent / ".env.test"
-load_dotenv(env_test_path, override=True)
-load_dotenv(override=True)
-
-
-@pytest.fixture(autouse=True, scope="function")
-def cleanup_event_handlers() -> Generator[None, Any, None]:
-    """Clean up event bus handlers after each test to prevent test pollution."""
-    yield
-
-    try:
-        from crewai.events.event_bus import crewai_event_bus
-
-        with crewai_event_bus._rwlock.w_locked():
-            crewai_event_bus._sync_handlers.clear()
-            crewai_event_bus._async_handlers.clear()
-    except Exception:  # noqa: S110
-        pass
-
-
-@pytest.fixture(autouse=True, scope="function")
-def setup_test_environment() -> Generator[None, Any, None]:
-    """Setup test environment for crewAI workspace."""
-    with tempfile.TemporaryDirectory() as temp_dir:
-        storage_dir = Path(temp_dir) / "crewai_test_storage"
-        storage_dir.mkdir(parents=True, exist_ok=True)
-
-        if not storage_dir.exists() or not storage_dir.is_dir():
-            raise RuntimeError(
-                f"Failed to create test storage directory: {storage_dir}"
-            )
-
-        try:
-            test_file = storage_dir / ".permissions_test"
-            test_file.touch()
-            test_file.unlink()
-        except (OSError, IOError) as e:
-            raise RuntimeError(
-                f"Test storage directory {storage_dir} is not writable: {e}"
-            ) from e
-
-        os.environ["CREWAI_STORAGE_DIR"] = str(storage_dir)
-        os.environ["CREWAI_TESTING"] = "true"
-
-        try:
-            yield
-        finally:
-            os.environ.pop("CREWAI_TESTING", "true")
-            os.environ.pop("CREWAI_STORAGE_DIR", None)
-            os.environ.pop("CREWAI_DISABLE_TELEMETRY", "true")
-            os.environ.pop("OTEL_SDK_DISABLED", "true")
-            os.environ.pop("OPENAI_BASE_URL", "https://api.openai.com/v1")
-            os.environ.pop("OPENAI_API_BASE", "https://api.openai.com/v1")
-
-
-HEADERS_TO_FILTER = {
-    "authorization": "AUTHORIZATION-XXX",
-    "content-security-policy": "CSP-FILTERED",
-    "cookie": "COOKIE-XXX",
-    "set-cookie": "SET-COOKIE-XXX",
-    "permissions-policy": "PERMISSIONS-POLICY-XXX",
-    "referrer-policy": "REFERRER-POLICY-XXX",
-    "strict-transport-security": "STS-XXX",
-    "x-content-type-options": "X-CONTENT-TYPE-XXX",
-    "x-frame-options": "X-FRAME-OPTIONS-XXX",
-    "x-permitted-cross-domain-policies": "X-PERMITTED-XXX",
-    "x-request-id": "X-REQUEST-ID-XXX",
-    "x-runtime": "X-RUNTIME-XXX",
-    "x-xss-protection": "X-XSS-PROTECTION-XXX",
-    "x-stainless-arch": "X-STAINLESS-ARCH-XXX",
-    "x-stainless-os": "X-STAINLESS-OS-XXX",
-    "x-stainless-read-timeout": "X-STAINLESS-READ-TIMEOUT-XXX",
-    "cf-ray": "CF-RAY-XXX",
-    "etag": "ETAG-XXX",
-    "Strict-Transport-Security": "STS-XXX",
-    "access-control-expose-headers": "ACCESS-CONTROL-XXX",
-    "openai-organization": "OPENAI-ORG-XXX",
-    "openai-project": "OPENAI-PROJECT-XXX",
-    "x-ratelimit-limit-requests": "X-RATELIMIT-LIMIT-REQUESTS-XXX",
-    "x-ratelimit-limit-tokens": "X-RATELIMIT-LIMIT-TOKENS-XXX",
-    "x-ratelimit-remaining-requests": "X-RATELIMIT-REMAINING-REQUESTS-XXX",
-    "x-ratelimit-remaining-tokens": "X-RATELIMIT-REMAINING-TOKENS-XXX",
-    "x-ratelimit-reset-requests": "X-RATELIMIT-RESET-REQUESTS-XXX",
-    "x-ratelimit-reset-tokens": "X-RATELIMIT-RESET-TOKENS-XXX",
-    "x-goog-api-key": "X-GOOG-API-KEY-XXX",
-    "api-key": "X-API-KEY-XXX",
-    "User-Agent": "X-USER-AGENT-XXX",
-    "apim-request-id:": "X-API-CLIENT-REQUEST-ID-XXX",
-    "azureml-model-session": "AZUREML-MODEL-SESSION-XXX",
-    "x-ms-client-request-id": "X-MS-CLIENT-REQUEST-ID-XXX",
-    "x-ms-region": "X-MS-REGION-XXX",
-    "apim-request-id": "APIM-REQUEST-ID-XXX",
-    "x-api-key": "X-API-KEY-XXX",
-    "anthropic-organization-id": "ANTHROPIC-ORGANIZATION-ID-XXX",
-    "request-id": "REQUEST-ID-XXX",
-    "anthropic-ratelimit-input-tokens-limit": "ANTHROPIC-RATELIMIT-INPUT-TOKENS-LIMIT-XXX",
-    "anthropic-ratelimit-input-tokens-remaining": "ANTHROPIC-RATELIMIT-INPUT-TOKENS-REMAINING-XXX",
-    "anthropic-ratelimit-input-tokens-reset": "ANTHROPIC-RATELIMIT-INPUT-TOKENS-RESET-XXX",
-    "anthropic-ratelimit-output-tokens-limit": "ANTHROPIC-RATELIMIT-OUTPUT-TOKENS-LIMIT-XXX",
-    "anthropic-ratelimit-output-tokens-remaining": "ANTHROPIC-RATELIMIT-OUTPUT-TOKENS-REMAINING-XXX",
-    "anthropic-ratelimit-output-tokens-reset": "ANTHROPIC-RATELIMIT-OUTPUT-TOKENS-RESET-XXX",
-    "anthropic-ratelimit-tokens-limit": "ANTHROPIC-RATELIMIT-TOKENS-LIMIT-XXX",
-    "anthropic-ratelimit-tokens-remaining": "ANTHROPIC-RATELIMIT-TOKENS-REMAINING-XXX",
-    "anthropic-ratelimit-tokens-reset": "ANTHROPIC-RATELIMIT-TOKENS-RESET-XXX",
-    "x-amz-date": "X-AMZ-DATE-XXX",
-    "amz-sdk-invocation-id": "AMZ-SDK-INVOCATION-ID-XXX",
-    "accept-encoding": "ACCEPT-ENCODING-XXX",
-    "x-amzn-requestid": "X-AMZN-REQUESTID-XXX",
-    "x-amzn-RequestId": "X-AMZN-REQUESTID-XXX",
-}
-
-
-def _filter_request_headers(request: Request) -> Request:  # type: ignore[no-any-unimported]
-    """Filter sensitive headers from request before recording."""
-    for header_name, replacement in HEADERS_TO_FILTER.items():
-        for variant in [header_name, header_name.upper(), header_name.title()]:
-            if variant in request.headers:
-                request.headers[variant] = [replacement]
-
-    request.method = request.method.upper()
-    return request
-
-
-def _filter_response_headers(response: dict[str, Any]) -> dict[str, Any]:
-    """Filter sensitive headers from response before recording."""
-    # Remove Content-Encoding to prevent decompression issues on replay
-    for encoding_header in ["Content-Encoding", "content-encoding"]:
-        response["headers"].pop(encoding_header, None)
-
-    for header_name, replacement in HEADERS_TO_FILTER.items():
-        for variant in [header_name, header_name.upper(), header_name.title()]:
-            if variant in response["headers"]:
-                response["headers"][variant] = [replacement]
-    return response
-
-
-@pytest.fixture(scope="module")
-def vcr_cassette_dir(request: Any) -> str:
-    """Generate cassette directory path based on test module location.
-
-    Organizes cassettes to mirror test directory structure within each package:
-    lib/crewai/tests/llms/google/test_google.py -> lib/crewai/tests/cassettes/llms/google/
-    lib/crewai-tools/tests/tools/test_search.py -> lib/crewai-tools/tests/cassettes/tools/
-    """
-    test_file = Path(request.fspath)
-
-    for parent in test_file.parents:
-        if parent.name in ("crewai", "crewai-tools") and parent.parent.name == "lib":
-            package_root = parent
-            break
-    else:
-        package_root = test_file.parent
-
-    tests_root = package_root / "tests"
-    test_dir = test_file.parent
-
-    if test_dir != tests_root:
-        relative_path = test_dir.relative_to(tests_root)
-        cassette_dir = tests_root / "cassettes" / relative_path
-    else:
-        cassette_dir = tests_root / "cassettes"
-
-    cassette_dir.mkdir(parents=True, exist_ok=True)
-
-    return str(cassette_dir)
-
-
-@pytest.fixture(scope="module")
-def vcr_config(vcr_cassette_dir: str) -> dict[str, Any]:
-    """Configure VCR with organized cassette storage."""
-    config = {
-        "cassette_library_dir": vcr_cassette_dir,
-        "record_mode": os.getenv("PYTEST_VCR_RECORD_MODE", "once"),
-        "filter_headers": [(k, v) for k, v in HEADERS_TO_FILTER.items()],
-        "before_record_request": _filter_request_headers,
-        "before_record_response": _filter_response_headers,
-        "filter_query_parameters": ["key"],
-        "match_on": ["method", "scheme", "host", "port", "path"],
-    }
-
-    if os.getenv("GITHUB_ACTIONS") == "true":
-        config["record_mode"] = "none"
-
-    return config

docs/docs.json

@@ -9,22 +9,7 @@
   },
   "favicon": "/images/favicon.svg",
   "contextual": {
-    "options": [
-      "copy",
-      "view",
-      "chatgpt",
-      "claude",
-      "perplexity",
-      "mcp",
-      "cursor",
-      "vscode",
-      {
-        "title": "Request a feature",
-        "description": "Join the discussion on GitHub to request a new feature",
-        "icon": "plus",
-        "href": "https://github.com/crewAIInc/crewAI/issues/new/choose"
-      }
-    ]
+    "options": ["copy", "view", "chatgpt", "claude"]
   },
   "navigation": {
     "languages": [
@@ -55,16 +40,6 @@
           ]
         },
         "tabs": [
-          {
-            "tab": "Home",
-            "icon": "house",
-            "groups": [
-              {
-                "group": "Welcome",
-                "pages": ["index"]
-              }
-            ]
-          },
           {
             "tab": "Documentation",
             "icon": "book-open",
@@ -134,7 +109,6 @@
                 "group": "MCP Integration",
                 "pages": [
                   "en/mcp/overview",
-                  "en/mcp/dsl-integration",
                   "en/mcp/stdio",
                   "en/mcp/sse",
                   "en/mcp/streamable-http",
@@ -251,10 +225,9 @@
                     "group": "Integrations",
                     "icon": "plug",
                     "pages": [
-                      "en/tools/integration/overview",
-                      "en/tools/integration/bedrockinvokeagenttool",
-                      "en/tools/integration/crewaiautomationtool",
-                      "en/tools/integration/mergeagenthandlertool"
+                      "en/tools/tool-integrations/overview",
+                      "en/tools/tool-integrations/bedrockinvokeagenttool",
+                      "en/tools/tool-integrations/crewaiautomationtool"
                     ]
                   },
                   {
@@ -273,11 +246,8 @@
               {
                 "group": "Observability",
                 "pages": [
-                  "en/observability/tracing",
                   "en/observability/overview",
                   "en/observability/arize-phoenix",
-                  "en/observability/braintrust",
-                  "en/observability/datadog",
                   "en/observability/langdb",
                   "en/observability/langfuse",
                   "en/observability/langtrace",
@@ -307,17 +277,13 @@
                   "en/learn/force-tool-output-as-result",
                   "en/learn/hierarchical-process",
                   "en/learn/human-input-on-execution",
-                  "en/learn/human-in-the-loop",
                   "en/learn/kickoff-async",
                   "en/learn/kickoff-for-each",
                   "en/learn/llm-connections",
                   "en/learn/multimodal-agents",
                   "en/learn/replay-tasks-from-latest-crew-kickoff",
                   "en/learn/sequential-process",
-                  "en/learn/using-annotations",
-                  "en/learn/execution-hooks",
-                  "en/learn/llm-hooks",
-                  "en/learn/tool-hooks"
+                  "en/learn/using-annotations"
                 ]
               },
               {
@@ -327,7 +293,7 @@
             ]
           },
           {
-            "tab": "AOP",
+            "tab": "Enterprise",
             "icon": "briefcase",
             "groups": [
               {
@@ -335,27 +301,15 @@
                 "pages": ["en/enterprise/introduction"]
               },
               {
-                "group": "Build",
+                "group": "Features",
                 "pages": [
-                  "en/enterprise/features/automations",
-                  "en/enterprise/features/crew-studio",
-                  "en/enterprise/features/marketplace",
-                  "en/enterprise/features/agent-repositories",
-                  "en/enterprise/features/tools-and-integrations"
-                ]
-              },
-              {
-                "group": "Operate",
-                "pages": [
-                  "en/enterprise/features/traces",
+                  "en/enterprise/features/rbac",
+                  "en/enterprise/features/tool-repository",
                   "en/enterprise/features/webhook-streaming",
-                  "en/enterprise/features/hallucination-guardrail"
-                ]
-              },
-              {
-                "group": "Manage",
-                "pages": [
-                  "en/enterprise/features/rbac"
+                  "en/enterprise/features/traces",
+                  "en/enterprise/features/hallucination-guardrail",
+                  "en/enterprise/features/integrations",
+                  "en/enterprise/features/agent-repositories"
                 ]
               },
               {
@@ -367,20 +321,10 @@
                   "en/enterprise/integrations/github",
                   "en/enterprise/integrations/gmail",
                   "en/enterprise/integrations/google_calendar",
-                  "en/enterprise/integrations/google_contacts",
-                  "en/enterprise/integrations/google_docs",
-                  "en/enterprise/integrations/google_drive",
                   "en/enterprise/integrations/google_sheets",
-                  "en/enterprise/integrations/google_slides",
                   "en/enterprise/integrations/hubspot",
                   "en/enterprise/integrations/jira",
                   "en/enterprise/integrations/linear",
-                  "en/enterprise/integrations/microsoft_excel",
-                  "en/enterprise/integrations/microsoft_onedrive",
-                  "en/enterprise/integrations/microsoft_outlook",
-                  "en/enterprise/integrations/microsoft_sharepoint",
-                  "en/enterprise/integrations/microsoft_teams",
-                  "en/enterprise/integrations/microsoft_word",
                   "en/enterprise/integrations/notion",
                   "en/enterprise/integrations/salesforce",
                   "en/enterprise/integrations/shopify",
@@ -389,22 +333,6 @@
                   "en/enterprise/integrations/zendesk"
                 ]
               },
-              {
-                "group": "Triggers",
-                "pages": [
-                  "en/enterprise/guides/automation-triggers",
-                  "en/enterprise/guides/gmail-trigger",
-                  "en/enterprise/guides/google-calendar-trigger",
-                  "en/enterprise/guides/google-drive-trigger",
-                  "en/enterprise/guides/outlook-trigger",
-                  "en/enterprise/guides/onedrive-trigger",
-                  "en/enterprise/guides/microsoft-teams-trigger",
-                  "en/enterprise/guides/slack-trigger",
-                  "en/enterprise/guides/hubspot-trigger",
-                  "en/enterprise/guides/salesforce-trigger",
-                  "en/enterprise/guides/zapier-trigger"
-                ]
-              },
               {
                 "group": "How-To Guides",
                 "pages": [
@@ -413,13 +341,16 @@
                   "en/enterprise/guides/kickoff-crew",
                   "en/enterprise/guides/update-crew",
                   "en/enterprise/guides/enable-crew-studio",
-                  "en/enterprise/guides/capture_telemetry_logs",
                   "en/enterprise/guides/azure-openai-setup",
-                  "en/enterprise/guides/tool-repository",
+                  "en/enterprise/guides/automation-triggers",
+                  "en/enterprise/guides/hubspot-trigger",
                   "en/enterprise/guides/react-component-export",
+                  "en/enterprise/guides/salesforce-trigger",
+                  "en/enterprise/guides/slack-trigger",
                   "en/enterprise/guides/team-management",
+                  "en/enterprise/guides/webhook-automation",
                   "en/enterprise/guides/human-in-the-loop",
-                  "en/enterprise/guides/webhook-automation"
+                  "en/enterprise/guides/zapier-trigger"
                 ]
               },
               {
@@ -438,7 +369,6 @@
                   "en/api-reference/introduction",
                   "en/api-reference/inputs",
                   "en/api-reference/kickoff",
-                  "en/api-reference/resume",
                   "en/api-reference/status"
                 ]
               }
@@ -493,16 +423,6 @@
           ]
         },
         "tabs": [
-          {
-            "tab": "Início",
-            "icon": "house",
-            "groups": [
-              {
-                "group": "Bem-vindo",
-                "pages": ["pt-BR/index"]
-              }
-            ]
-          },
           {
             "tab": "Documentação",
             "icon": "book-open",
@@ -576,7 +496,6 @@
                 "group": "Integração MCP",
                 "pages": [
                   "pt-BR/mcp/overview",
-                  "pt-BR/mcp/dsl-integration",
                   "pt-BR/mcp/stdio",
                   "pt-BR/mcp/sse",
                   "pt-BR/mcp/streamable-http",
@@ -679,12 +598,12 @@
                     ]
                   },
                   {
-                    "group": "Integrations",
+                    "group": "Integrações",
                     "icon": "plug",
                     "pages": [
-                      "pt-BR/tools/integration/overview",
-                      "pt-BR/tools/integration/bedrockinvokeagenttool",
-                      "pt-BR/tools/integration/crewaiautomationtool"
+                      "pt-BR/tools/tool-integrations/overview",
+                      "pt-BR/tools/tool-integrations/bedrockinvokeagenttool",
+                      "pt-BR/tools/tool-integrations/crewaiautomationtool"
                     ]
                   },
                   {
@@ -704,8 +623,6 @@
                 "pages": [
                   "pt-BR/observability/overview",
                   "pt-BR/observability/arize-phoenix",
-                  "pt-BR/observability/braintrust",
-                  "pt-BR/observability/datadog",
                   "pt-BR/observability/langdb",
                   "pt-BR/observability/langfuse",
                   "pt-BR/observability/langtrace",
@@ -734,17 +651,13 @@
                   "pt-BR/learn/force-tool-output-as-result",
                   "pt-BR/learn/hierarchical-process",
                   "pt-BR/learn/human-input-on-execution",
-                  "pt-BR/learn/human-in-the-loop",
                   "pt-BR/learn/kickoff-async",
                   "pt-BR/learn/kickoff-for-each",
                   "pt-BR/learn/llm-connections",
                   "pt-BR/learn/multimodal-agents",
                   "pt-BR/learn/replay-tasks-from-latest-crew-kickoff",
                   "pt-BR/learn/sequential-process",
-                  "pt-BR/learn/using-annotations",
-                  "pt-BR/learn/execution-hooks",
-                  "pt-BR/learn/llm-hooks",
-                  "pt-BR/learn/tool-hooks"
+                  "pt-BR/learn/using-annotations"
                 ]
               },
               {
@@ -754,7 +667,7 @@
             ]
           },
           {
-            "tab": "AOP",
+            "tab": "Enterprise",
             "icon": "briefcase",
             "groups": [
               {
@@ -762,27 +675,14 @@
                 "pages": ["pt-BR/enterprise/introduction"]
               },
               {
-                "group": "Construir",
+                "group": "Funcionalidades",
                 "pages": [
-                  "pt-BR/enterprise/features/automations",
-                  "pt-BR/enterprise/features/crew-studio",
-                  "pt-BR/enterprise/features/marketplace",
-                  "pt-BR/enterprise/features/agent-repositories",
-                  "pt-BR/enterprise/features/tools-and-integrations"
-                ]
-              },
-              {
-                "group": "Operar",
-                "pages": [
-                  "pt-BR/enterprise/features/traces",
+                  "pt-BR/enterprise/features/rbac",
+                  "pt-BR/enterprise/features/tool-repository",
                   "pt-BR/enterprise/features/webhook-streaming",
-                  "pt-BR/enterprise/features/hallucination-guardrail"
-                ]
-              },
-              {
-                "group": "Gerenciar",
-                "pages": [
-                  "pt-BR/enterprise/features/rbac"
+                  "pt-BR/enterprise/features/traces",
+                  "pt-BR/enterprise/features/hallucination-guardrail",
+                  "pt-BR/enterprise/features/integrations"
                 ]
               },
               {
@@ -794,20 +694,10 @@
                   "pt-BR/enterprise/integrations/github",
                   "pt-BR/enterprise/integrations/gmail",
                   "pt-BR/enterprise/integrations/google_calendar",
-                  "pt-BR/enterprise/integrations/google_contacts",
-                  "pt-BR/enterprise/integrations/google_docs",
-                  "pt-BR/enterprise/integrations/google_drive",
                   "pt-BR/enterprise/integrations/google_sheets",
-                  "pt-BR/enterprise/integrations/google_slides",
                   "pt-BR/enterprise/integrations/hubspot",
                   "pt-BR/enterprise/integrations/jira",
                   "pt-BR/enterprise/integrations/linear",
-                  "pt-BR/enterprise/integrations/microsoft_excel",
-                  "pt-BR/enterprise/integrations/microsoft_onedrive",
-                  "pt-BR/enterprise/integrations/microsoft_outlook",
-                  "pt-BR/enterprise/integrations/microsoft_sharepoint",
-                  "pt-BR/enterprise/integrations/microsoft_teams",
-                  "pt-BR/enterprise/integrations/microsoft_word",
                   "pt-BR/enterprise/integrations/notion",
                   "pt-BR/enterprise/integrations/salesforce",
                   "pt-BR/enterprise/integrations/shopify",
@@ -825,26 +715,14 @@
                   "pt-BR/enterprise/guides/update-crew",
                   "pt-BR/enterprise/guides/enable-crew-studio",
                   "pt-BR/enterprise/guides/azure-openai-setup",
-                  "pt-BR/enterprise/guides/tool-repository",
-                  "pt-BR/enterprise/guides/react-component-export",
-                  "pt-BR/enterprise/guides/team-management",
-                  "pt-BR/enterprise/guides/human-in-the-loop",
-                  "pt-BR/enterprise/guides/webhook-automation"
-                ]
-              },
-              {
-                "group": "Triggers",
-                "pages": [
                   "pt-BR/enterprise/guides/automation-triggers",
-                  "pt-BR/enterprise/guides/gmail-trigger",
-                  "pt-BR/enterprise/guides/google-calendar-trigger",
-                  "pt-BR/enterprise/guides/google-drive-trigger",
-                  "pt-BR/enterprise/guides/outlook-trigger",
-                  "pt-BR/enterprise/guides/onedrive-trigger",
-                  "pt-BR/enterprise/guides/microsoft-teams-trigger",
-                  "pt-BR/enterprise/guides/slack-trigger",
                   "pt-BR/enterprise/guides/hubspot-trigger",
+                  "pt-BR/enterprise/guides/react-component-export",
                   "pt-BR/enterprise/guides/salesforce-trigger",
+                  "pt-BR/enterprise/guides/slack-trigger",
+                  "pt-BR/enterprise/guides/team-management",
+                  "pt-BR/enterprise/guides/webhook-automation",
+                  "pt-BR/enterprise/guides/human-in-the-loop",
                   "pt-BR/enterprise/guides/zapier-trigger"
                 ]
               },
@@ -866,7 +744,6 @@
                   "pt-BR/api-reference/introduction",
                   "pt-BR/api-reference/inputs",
                   "pt-BR/api-reference/kickoff",
-                  "pt-BR/api-reference/resume",
                   "pt-BR/api-reference/status"
                 ]
               }
@@ -921,16 +798,6 @@
           ]
         },
         "tabs": [
-          {
-            "tab": "홈",
-            "icon": "house",
-            "groups": [
-              {
-                "group": "환영합니다",
-                "pages": ["ko/index"]
-              }
-            ]
-          },
           {
             "tab": "기술 문서",
             "icon": "book-open",
@@ -1000,7 +867,6 @@
                 "group": "MCP 통합",
                 "pages": [
                   "ko/mcp/overview",
-                  "ko/mcp/dsl-integration",
                   "ko/mcp/stdio",
                   "ko/mcp/sse",
                   "ko/mcp/streamable-http",
@@ -1110,16 +976,17 @@
                       "ko/tools/cloud-storage/overview",
                       "ko/tools/cloud-storage/s3readertool",
                       "ko/tools/cloud-storage/s3writertool",
+                      "ko/tools/cloud-storage/bedrockinvokeagenttool",
                       "ko/tools/cloud-storage/bedrockkbretriever"
                     ]
                   },
                   {
-                    "group": "Integrations",
+                    "group": "통합",
                     "icon": "plug",
                     "pages": [
-                      "ko/tools/integration/overview",
-                      "ko/tools/integration/bedrockinvokeagenttool",
-                      "ko/tools/integration/crewaiautomationtool"
+                      "ko/tools/tool-integrations/overview",
+                      "ko/tools/tool-integrations/bedrockinvokeagenttool",
+                      "ko/tools/tool-integrations/crewaiautomationtool"
                     ]
                   },
                   {
@@ -1140,8 +1007,6 @@
                 "pages": [
                   "ko/observability/overview",
                   "ko/observability/arize-phoenix",
-                  "ko/observability/braintrust",
-                  "ko/observability/datadog",
                   "ko/observability/langdb",
                   "ko/observability/langfuse",
                   "ko/observability/langtrace",
@@ -1170,17 +1035,13 @@
                   "ko/learn/force-tool-output-as-result",
                   "ko/learn/hierarchical-process",
                   "ko/learn/human-input-on-execution",
-                  "ko/learn/human-in-the-loop",
                   "ko/learn/kickoff-async",
                   "ko/learn/kickoff-for-each",
                   "ko/learn/llm-connections",
                   "ko/learn/multimodal-agents",
                   "ko/learn/replay-tasks-from-latest-crew-kickoff",
                   "ko/learn/sequential-process",
-                  "ko/learn/using-annotations",
-                  "ko/learn/execution-hooks",
-                  "ko/learn/llm-hooks",
-                  "ko/learn/tool-hooks"
+                  "ko/learn/using-annotations"
                 ]
               },
               {
@@ -1198,27 +1059,15 @@
                 "pages": ["ko/enterprise/introduction"]
               },
               {
-                "group": "빌드",
+                "group": "특징",
                 "pages": [
-                  "ko/enterprise/features/automations",
-                  "ko/enterprise/features/crew-studio",
-                  "ko/enterprise/features/marketplace",
-                  "ko/enterprise/features/agent-repositories",
-                  "ko/enterprise/features/tools-and-integrations"
-                ]
-              },
-              {
-                "group": "운영",
-                "pages": [
-                  "ko/enterprise/features/traces",
+                  "ko/enterprise/features/rbac",
+                  "ko/enterprise/features/tool-repository",
                   "ko/enterprise/features/webhook-streaming",
-                  "ko/enterprise/features/hallucination-guardrail"
-                ]
-              },
-              {
-                "group": "관리",
-                "pages": [
-                  "ko/enterprise/features/rbac"
+                  "ko/enterprise/features/traces",
+                  "ko/enterprise/features/hallucination-guardrail",
+                  "ko/enterprise/features/integrations",
+                  "ko/enterprise/features/agent-repositories"
                 ]
               },
               {
@@ -1230,20 +1079,10 @@
                   "ko/enterprise/integrations/github",
                   "ko/enterprise/integrations/gmail",
                   "ko/enterprise/integrations/google_calendar",
-                  "ko/enterprise/integrations/google_contacts",
-                  "ko/enterprise/integrations/google_docs",
-                  "ko/enterprise/integrations/google_drive",
                   "ko/enterprise/integrations/google_sheets",
-                  "ko/enterprise/integrations/google_slides",
                   "ko/enterprise/integrations/hubspot",
                   "ko/enterprise/integrations/jira",
                   "ko/enterprise/integrations/linear",
-                  "ko/enterprise/integrations/microsoft_excel",
-                  "ko/enterprise/integrations/microsoft_onedrive",
-                  "ko/enterprise/integrations/microsoft_outlook",
-                  "ko/enterprise/integrations/microsoft_sharepoint",
-                  "ko/enterprise/integrations/microsoft_teams",
-                  "ko/enterprise/integrations/microsoft_word",
                   "ko/enterprise/integrations/notion",
                   "ko/enterprise/integrations/salesforce",
                   "ko/enterprise/integrations/shopify",
@@ -1261,26 +1100,14 @@
                   "ko/enterprise/guides/update-crew",
                   "ko/enterprise/guides/enable-crew-studio",
                   "ko/enterprise/guides/azure-openai-setup",
-                  "ko/enterprise/guides/tool-repository",
-                  "ko/enterprise/guides/react-component-export",
-                  "ko/enterprise/guides/team-management",
-                  "ko/enterprise/guides/human-in-the-loop",
-                  "ko/enterprise/guides/webhook-automation"
-                ]
-              },
-              {
-                "group": "트리거",
-                "pages": [
                   "ko/enterprise/guides/automation-triggers",
-                  "ko/enterprise/guides/gmail-trigger",
-                  "ko/enterprise/guides/google-calendar-trigger",
-                  "ko/enterprise/guides/google-drive-trigger",
-                  "ko/enterprise/guides/outlook-trigger",
-                  "ko/enterprise/guides/onedrive-trigger",
-                  "ko/enterprise/guides/microsoft-teams-trigger",
-                  "ko/enterprise/guides/slack-trigger",
                   "ko/enterprise/guides/hubspot-trigger",
+                  "ko/enterprise/guides/react-component-export",
                   "ko/enterprise/guides/salesforce-trigger",
+                  "ko/enterprise/guides/slack-trigger",
+                  "ko/enterprise/guides/team-management",
+                  "ko/enterprise/guides/webhook-automation",
+                  "ko/enterprise/guides/human-in-the-loop",
                   "ko/enterprise/guides/zapier-trigger"
                 ]
               },
@@ -1300,7 +1127,6 @@
                   "ko/api-reference/introduction",
                   "ko/api-reference/inputs",
                   "ko/api-reference/kickoff",
-                  "ko/api-reference/resume",
                   "ko/api-reference/status"
                 ]
               }

docs/en/api-reference/introduction.mdx

@@ -1,29 +1,29 @@
 ---
 title: "Introduction"
-description: "Complete reference for the CrewAI AOP REST API"
+description: "Complete reference for the CrewAI Enterprise REST API"
 icon: "code"
 mode: "wide"
 ---
 
-# CrewAI AOP API
+# CrewAI Enterprise API
 
-Welcome to the CrewAI AOP API reference. This API allows you to programmatically interact with your deployed crews, enabling integration with your applications, workflows, and services.
+Welcome to the CrewAI Enterprise API reference. This API allows you to programmatically interact with your deployed crews, enabling integration with your applications, workflows, and services.
 
 ## Quick Start
 
 <Steps>
   <Step title="Get Your API Credentials">
-    Navigate to your crew's detail page in the CrewAI AOP dashboard and copy your Bearer Token from the Status tab.
+    Navigate to your crew's detail page in the CrewAI Enterprise dashboard and copy your Bearer Token from the Status tab.
   </Step>
-
+  
   <Step title="Discover Required Inputs">
     Use the `GET /inputs` endpoint to see what parameters your crew expects.
   </Step>
-
+  
   <Step title="Start a Crew Execution">
     Call `POST /kickoff` with your inputs to start the crew execution and receive a `kickoff_id`.
   </Step>
-
+  
   <Step title="Monitor Progress">
     Use `GET /status/{kickoff_id}` to check execution status and retrieve results.
   </Step>
@@ -46,7 +46,7 @@ curl -H "Authorization: Bearer YOUR_CREW_TOKEN" \
 | **User Bearer Token** | User-scoped access | Limited permissions, suitable for user-specific operations |
 
 <Tip>
-You can find both token types in the Status tab of your crew's detail page in the CrewAI AOP dashboard.
+You can find both token types in the Status tab of your crew's detail page in the CrewAI Enterprise dashboard.
 </Tip>
 
 ## Base URL
@@ -62,7 +62,7 @@ Replace `your-crew-name` with your actual crew's URL from the dashboard.
 ## Typical Workflow
 
 1. **Discovery**: Call `GET /inputs` to understand what your crew needs
-2. **Execution**: Submit inputs via `POST /kickoff` to start processing
+2. **Execution**: Submit inputs via `POST /kickoff` to start processing  
 3. **Monitoring**: Poll `GET /status/{kickoff_id}` until completion
 4. **Results**: Extract the final output from the completed response
 
@@ -82,12 +82,12 @@ The API uses standard HTTP status codes:
 ## Interactive Testing
 
 <Info>
-**Why no "Send" button?** Since each CrewAI AOP user has their own unique crew URL, we use **reference mode** instead of an interactive playground to avoid confusion. This shows you exactly what the requests should look like without non-functional send buttons.
+**Why no "Send" button?** Since each CrewAI Enterprise user has their own unique crew URL, we use **reference mode** instead of an interactive playground to avoid confusion. This shows you exactly what the requests should look like without non-functional send buttons.
 </Info>
 
 Each endpoint page shows you:
 - ✅ **Exact request format** with all parameters
-- ✅ **Response examples** for success and error cases
+- ✅ **Response examples** for success and error cases  
 - ✅ **Code samples** in multiple languages (cURL, Python, JavaScript, etc.)
 - ✅ **Authentication examples** with proper Bearer token format
 
@@ -104,7 +104,7 @@ Each endpoint page shows you:
 
 **Example workflow:**
 1. **Copy this cURL example** from any endpoint page
-2. **Replace `your-actual-crew-name.crewai.com`** with your real crew URL
+2. **Replace `your-actual-crew-name.crewai.com`** with your real crew URL  
 3. **Replace the Bearer token** with your real token from the dashboard
 4. **Run the request** in your terminal or API client
 

docs/en/api-reference/resume.mdx

@@ -1,6 +0,0 @@
----
-title: "POST /resume"
-description: "Resume crew execution with human feedback"
-openapi: "/enterprise-api.en.yaml POST /resume"
-mode: "wide"
----

docs/en/concepts/agents.mdx

@@ -20,7 +20,7 @@ Think of an agent as a specialized team member with specific skills, expertise,
 </Tip>
 
 <Note type="info" title="Enterprise Enhancement: Visual Agent Builder">
-CrewAI AOP includes a Visual Agent Builder that simplifies agent creation and configuration without writing code. Design your agents visually and test them in real-time.
+CrewAI Enterprise includes a Visual Agent Builder that simplifies agent creation and configuration without writing code. Design your agents visually and test them in real-time.
 
 ![Visual Agent Builder Screenshot](/images/enterprise/crew-studio-interface.png)
 

docs/en/concepts/cli.mdx

@@ -5,7 +5,7 @@ icon: terminal
 mode: "wide"
 ---
 
-<Warning>Since release 0.140.0, CrewAI AOP started a process of migrating their login provider. As such, the authentication flow via CLI was updated. Users that use Google to login, or that created their account after July 3rd, 2025 will be unable to log in with older versions of the `crewai` library.</Warning>
+<Warning>Since release 0.140.0, CrewAI Enterprise started a process of migrating their login provider. As such, the authentication flow via CLI was updated. Users that use Google to login, or that created their account after July 3rd, 2025 will be unable to log in with older versions of the `crewai` library.</Warning>
 
 ## Overview
 
@@ -186,9 +186,9 @@ def crew(self) -> Crew:
 
 ### 10. Deploy
 
-Deploy the crew or flow to [CrewAI AOP](https://app.crewai.com).
+Deploy the crew or flow to [CrewAI Enterprise](https://app.crewai.com).
 
-- **Authentication**: You need to be authenticated to deploy to CrewAI AOP.
+- **Authentication**: You need to be authenticated to deploy to CrewAI Enterprise.
     You can login or create an account with:
     ```shell Terminal
     crewai login
@@ -203,7 +203,7 @@ Deploy the crew or flow to [CrewAI AOP](https://app.crewai.com).
 
 ### 11. Organization Management
 
-Manage your CrewAI AOP organizations.
+Manage your CrewAI Enterprise organizations.
 
 ```shell Terminal
 crewai org [COMMAND] [OPTIONS]
@@ -227,17 +227,17 @@ crewai org switch <organization_id>
 ```
 
 <Note>
-You must be authenticated to CrewAI AOP to use these organization management commands.
+You must be authenticated to CrewAI Enterprise to use these organization management commands.
 </Note>
 
 - **Create a deployment** (continued):
     - Links the deployment to the corresponding remote GitHub repository (it usually detects this automatically).
 
-- **Deploy the Crew**: Once you are authenticated, you can deploy your crew or flow to CrewAI AOP.
+- **Deploy the Crew**: Once you are authenticated, you can deploy your crew or flow to CrewAI Enterprise.
     ```shell Terminal
     crewai deploy push
     ```
-    - Initiates the deployment process on the CrewAI AOP platform.
+    - Initiates the deployment process on the CrewAI Enterprise platform.
     - Upon successful initiation, it will output the Deployment created successfully! message along with the Deployment Name and a unique Deployment ID (UUID).
 
 - **Deployment Status**: You can check the status of your deployment with:
@@ -262,7 +262,7 @@ You must be authenticated to CrewAI AOP to use these organization management com
     ```shell Terminal
     crewai deploy remove
     ```
-    This deletes the deployment from the CrewAI AOP platform.
+    This deletes the deployment from the CrewAI Enterprise platform.
 
 - **Help Command**: You can get help with the CLI with:
     ```shell Terminal
@@ -270,20 +270,22 @@ You must be authenticated to CrewAI AOP to use these organization management com
     ```
     This shows the help message for the CrewAI Deploy CLI.
 
-Watch this video tutorial for a step-by-step demonstration of deploying your crew to [CrewAI AOP](http://app.crewai.com) using the CLI.
+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
-  className="w-full aspect-video rounded-xl"
+  width="100%"
+  height="400"
   src="https://www.youtube.com/embed/3EqSV-CYDZA"
   title="CrewAI Deployment Guide"
-  frameBorder="0"
+  frameborder="0"
+  style={{ borderRadius: '10px' }}
   allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
-  allowFullScreen
+  allowfullscreen
 ></iframe>
 
 ### 11. Login
 
-Authenticate with CrewAI AOP using a secure device code flow (no email entry required).
+Authenticate with CrewAI Enterprise using a secure device code flow (no email entry required).
 
 ```shell Terminal
 crewai login
@@ -354,7 +356,7 @@ crewai config reset
 
 #### Available Configuration Parameters
 
-- `enterprise_base_url`: Base URL of the CrewAI AOP instance
+- `enterprise_base_url`: Base URL of the CrewAI Enterprise instance
 - `oauth2_provider`: OAuth2 provider used for authentication (e.g., workos, okta, auth0)
 - `oauth2_audience`: OAuth2 audience value, typically used to identify the target API or resource
 - `oauth2_client_id`: OAuth2 client ID issued by the provider, used during authentication requests
@@ -370,7 +372,7 @@ crewai config list
 Example output:
 | Setting             | Value                    | Description                                                 |
 | :------------------ | :----------------------- | :---------------------------------------------------------- |
-| enterprise_base_url | https://app.crewai.com   | Base URL of the CrewAI AOP instance                  |
+| enterprise_base_url | https://app.crewai.com   | Base URL of the CrewAI Enterprise instance                  |
 | org_name            | Not set                  | Name of the currently active organization                   |
 | org_uuid            | Not set                  | UUID of the currently active organization                   |
 | oauth2_provider     | workos                   | OAuth2 provider (e.g., workos, okta, auth0)                 |
@@ -402,81 +404,6 @@ crewai config reset
 After resetting configuration, re-run `crewai login` to authenticate again.
 </Tip>
 
-### 14. Trace Management
-
-Manage trace collection preferences for your Crew and Flow executions.
-
-```shell Terminal
-crewai traces [COMMAND]
-```
-
-#### Commands:
-
-- `enable`: Enable trace collection for crew/flow executions
-```shell Terminal
-crewai traces enable
-```
-
-- `disable`: Disable trace collection for crew/flow executions
-```shell Terminal
-crewai traces disable
-```
-
-- `status`: Show current trace collection status
-```shell Terminal
-crewai traces status
-```
-
-#### How Tracing Works
-
-Trace collection is controlled by checking three settings in priority order:
-
-1. **Explicit flag in code** (highest priority - can enable OR disable):
-   ```python
-   crew = Crew(agents=[...], tasks=[...], tracing=True)   # Always enable
-   crew = Crew(agents=[...], tasks=[...], tracing=False)  # Always disable
-   crew = Crew(agents=[...], tasks=[...])                 # Check lower priorities (default)
-   ```
-   - `tracing=True` will **always enable** tracing (overrides everything)
-   - `tracing=False` will **always disable** tracing (overrides everything)
-   - `tracing=None` or omitted will check lower priority settings
-
-2. **Environment variable** (second priority):
-   ```env
-   CREWAI_TRACING_ENABLED=true
-   ```
-   - Checked only if `tracing` is not explicitly set to `True` or `False` in code
-   - Set to `true` or `1` to enable tracing
-
-3. **User preference** (lowest priority):
-   ```shell Terminal
-   crewai traces enable
-   ```
-   - Checked only if `tracing` is not set in code and `CREWAI_TRACING_ENABLED` is not set to `true`
-   - Running `crewai traces enable` is sufficient to enable tracing by itself
-
-<Note>
-**To enable tracing**, use any one of these methods:
-- Set `tracing=True` in your Crew/Flow code, OR
-- Add `CREWAI_TRACING_ENABLED=true` to your `.env` file, OR
-- Run `crewai traces enable`
-
-**To disable tracing**, use any ONE of these methods:
-- Set `tracing=False` in your Crew/Flow code (overrides everything), OR
-- Remove or set to `false` the `CREWAI_TRACING_ENABLED` env var, OR
-- Run `crewai traces disable`
-
-Higher priority settings override lower ones.
-</Note>
-
-<Tip>
-For more information about tracing, see the [Tracing documentation](/observability/tracing).
-</Tip>
-
-<Tip>
-CrewAI CLI handles authentication to the Tool Repository automatically when adding packages to your project. Just append `crewai` before any `uv` command to use it. E.g. `crewai uv add requests`. For more information, see [Tool Repository](https://docs.crewai.com/enterprise/features/tool-repository) docs.
-</Tip>
-
 <Note>
 Configuration settings are stored in `~/.config/crewai/settings.json`. Some settings like organization name and UUID are read-only and managed through authentication and organization commands. Tool repository related settings are hidden and cannot be set directly by users.
 </Note>

docs/en/concepts/crews.mdx

@@ -33,7 +33,6 @@ A crew in crewAI represents a collaborative group of agents working together to
 | **Planning** *(optional)*             | `planning`             | Adds planning ability to the Crew. When activated before each Crew iteration, all Crew data is sent to an AgentPlanner that will plan the tasks and this plan will be added to each task description.                                                     |
 | **Planning LLM** *(optional)*         | `planning_llm`         | The language model used by the AgentPlanner in a planning process.                                                                                                                                                                                        |
 | **Knowledge Sources** _(optional)_    | `knowledge_sources`    | Knowledge sources available at the crew level, accessible to all the agents.                                                                                                                                                                                    |
-| **Stream** _(optional)_               | `stream`               | Enable streaming output to receive real-time updates during crew execution. Returns a `CrewStreamingOutput` object that can be iterated for chunks. Defaults to `False`.                                                                                    |
 
 <Tip>
 **Crew Max RPM**: The `max_rpm` attribute sets the maximum number of requests per minute the crew can perform to avoid rate limits and will override individual agents' `max_rpm` settings if you set it.
@@ -307,27 +306,12 @@ print(result)
 
 ### Different Ways to Kick Off a Crew
 
-Once your crew is assembled, initiate the workflow with the appropriate kickoff method. CrewAI provides several methods for better control over the kickoff process.
-
-#### Synchronous Methods
+Once your crew is assembled, initiate the workflow with the appropriate kickoff method. CrewAI provides several methods for better control over the kickoff process: `kickoff()`, `kickoff_for_each()`, `kickoff_async()`, and `kickoff_for_each_async()`.
 
 - `kickoff()`: Starts the execution process according to the defined process flow.
 - `kickoff_for_each()`: Executes tasks sequentially for each provided input event or item in the collection.
-
-#### Asynchronous Methods
-
-CrewAI offers two approaches for async execution:
-
-| Method | Type | Description |
-|--------|------|-------------|
-| `akickoff()` | Native async | True async/await throughout the entire execution chain |
-| `akickoff_for_each()` | Native async | Native async execution for each input in a list |
-| `kickoff_async()` | Thread-based | Wraps synchronous execution in `asyncio.to_thread` |
-| `kickoff_for_each_async()` | Thread-based | Thread-based async for each input in a list |
-
-<Note>
-For high-concurrency workloads, `akickoff()` and `akickoff_for_each()` are recommended as they use native async for task execution, memory operations, and knowledge retrieval.
-</Note>
+- `kickoff_async()`: Initiates the workflow asynchronously.
+- `kickoff_for_each_async()`: Executes tasks concurrently for each provided input event or item, leveraging asynchronous processing.
 
 ```python Code
 # Start the crew's task execution
@@ -340,53 +324,19 @@ results = my_crew.kickoff_for_each(inputs=inputs_array)
 for result in results:
     print(result)
 
-# Example of using native async with akickoff
-inputs = {'topic': 'AI in healthcare'}
-async_result = await my_crew.akickoff(inputs=inputs)
-print(async_result)
-
-# Example of using native async with akickoff_for_each
-inputs_array = [{'topic': 'AI in healthcare'}, {'topic': 'AI in finance'}]
-async_results = await my_crew.akickoff_for_each(inputs=inputs_array)
-for async_result in async_results:
-    print(async_result)
-
-# Example of using thread-based kickoff_async
+# Example of using kickoff_async
 inputs = {'topic': 'AI in healthcare'}
 async_result = await my_crew.kickoff_async(inputs=inputs)
 print(async_result)
 
-# Example of using thread-based kickoff_for_each_async
+# Example of using kickoff_for_each_async
 inputs_array = [{'topic': 'AI in healthcare'}, {'topic': 'AI in finance'}]
 async_results = await my_crew.kickoff_for_each_async(inputs=inputs_array)
 for async_result in async_results:
     print(async_result)
 ```
 
-These methods provide flexibility in how you manage and execute tasks within your crew, allowing for both synchronous and asynchronous workflows tailored to your needs. For detailed async examples, see the [Kickoff Crew Asynchronously](/en/learn/kickoff-async) guide.
-
-### Streaming Crew Execution
-
-For real-time visibility into crew execution, you can enable streaming to receive output as it's generated:
-
-```python Code
-# Enable streaming
-crew = Crew(
-    agents=[researcher],
-    tasks=[task],
-    stream=True
-)
-
-# Iterate over streaming output
-streaming = crew.kickoff(inputs={"topic": "AI"})
-for chunk in streaming:
-    print(chunk.content, end="", flush=True)
-
-# Access final result
-result = streaming.result
-```
-
-Learn more about streaming in the [Streaming Crew Execution](/en/learn/streaming-crew-execution) guide.
+These methods provide flexibility in how you manage and execute tasks within your crew, allowing for both synchronous and asynchronous workflows tailored to your needs.
 
 ### Replaying from a Specific Task
 

docs/en/concepts/event-listener.mdx

@@ -20,7 +20,7 @@ CrewAI uses an event bus architecture to emit events throughout the execution li
 When specific actions occur in CrewAI (like a Crew starting execution, an Agent completing a task, or a tool being used), the system emits corresponding events. You can register handlers for these events to execute custom code when they occur.
 
 <Note type="info" title="Enterprise Enhancement: Prompt Tracing">
-CrewAI AOP provides a built-in Prompt Tracing feature that leverages the event system to track, store, and visualize all prompts, completions, and associated metadata. This provides powerful debugging capabilities and transparency into your agent operations.
+CrewAI Enterprise provides a built-in Prompt Tracing feature that leverages the event system to track, store, and visualize all prompts, completions, and associated metadata. This provides powerful debugging capabilities and transparency into your agent operations.
 
 ![Prompt Tracing Dashboard](/images/enterprise/traces-overview.png)
 

docs/en/concepts/flows.mdx

@@ -875,13 +875,14 @@ By exploring these examples, you can gain insights into how to leverage CrewAI F
 Also, check out our YouTube video on how to use flows in CrewAI below!
 
 <iframe
-  className="w-full aspect-video rounded-xl"
+  width="560"
+  height="315"
   src="https://www.youtube.com/embed/MTb5my6VOT8"
-  title="CrewAI Flows overview"
-  frameBorder="0"
+  title="YouTube video player"
+  frameborder="0"
   allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share"
-  referrerPolicy="strict-origin-when-cross-origin"
-  allowFullScreen
+  referrerpolicy="strict-origin-when-cross-origin"
+  allowfullscreen
 ></iframe>
 
 ## Running Flows
@@ -897,31 +898,6 @@ flow = ExampleFlow()
 result = flow.kickoff()
 ```
 
-### Streaming Flow Execution
-
-For real-time visibility into flow execution, you can enable streaming to receive output as it's generated:
-
-```python
-class StreamingFlow(Flow):
-    stream = True  # Enable streaming
-
-    @start()
-    def research(self):
-        # Your flow implementation
-        pass
-
-# Iterate over streaming output
-flow = StreamingFlow()
-streaming = flow.kickoff()
-for chunk in streaming:
-    print(chunk.content, end="", flush=True)
-
-# Access final result
-result = streaming.result
-```
-
-Learn more about streaming in the [Streaming Flow Execution](/en/learn/streaming-flow-execution) guide.
-
 ### Using the CLI
 
 Starting from version 0.103.0, you can run flows using the `crewai run` command:

docs/en/concepts/knowledge.mdx

@@ -388,8 +388,8 @@ crew = Crew(
     agents=[sales_agent, tech_agent, support_agent],
     tasks=[...],
     embedder={  # Fallback embedder for agents without their own
-        "provider": "google-generativeai",
-        "config": {"model_name": "gemini-embedding-001"}
+        "provider": "google",
+        "config": {"model": "text-embedding-004"}
     }
 )
 
@@ -629,9 +629,9 @@ agent = Agent(
     backstory="Expert researcher",
     knowledge_sources=[knowledge_source],
     embedder={
-        "provider": "google-generativeai",
+        "provider": "google",
         "config": {
-            "model_name": "gemini-embedding-001",
+            "model": "models/text-embedding-004",
             "api_key": "your-google-key"
         }
     }
@@ -739,7 +739,7 @@ class KnowledgeMonitorListener(BaseEventListener):
 knowledge_monitor = KnowledgeMonitorListener()
 ```
 
-For more information on using events, see the [Event Listeners](/en/concepts/event-listener) documentation.
+For more information on using events, see the [Event Listeners](https://docs.crewai.com/concepts/event-listener) documentation.
 
 ### Custom Knowledge Sources