docs translations

* doc changes for better deplyment guidelines and checklist

* chore: remove .claude folder from version control

The .claude folder contains local Claude Code skills and configuration
that should not be tracked in the repository. Already in .gitignore.

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

* Better project structure for flows

* docs.json updated structure

* Ko and Pt traslations for deploying guidelines to AMP

* fix broken links

---------

Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>
Co-authored-by: Greyson LaLonde <greyson.r.lalonde@gmail.com>

.gitignore

@@ -26,3 +26,4 @@ plan.md
 conceptual_plan.md
 build_image
 chromadb-*.lock
+.claude

docs/docs.json

@@ -291,6 +291,7 @@
                   "en/observability/arize-phoenix",
                   "en/observability/braintrust",
                   "en/observability/datadog",
+                  "en/observability/galileo",
                   "en/observability/langdb",
                   "en/observability/langfuse",
                   "en/observability/langtrace",
@@ -428,7 +429,8 @@
                 "group": "How-To Guides",
                 "pages": [
                   "en/enterprise/guides/build-crew",
-                  "en/enterprise/guides/deploy-crew",
+                  "en/enterprise/guides/prepare-for-deployment",
+                  "en/enterprise/guides/deploy-to-amp",
                   "en/enterprise/guides/kickoff-crew",
                   "en/enterprise/guides/update-crew",
                   "en/enterprise/guides/enable-crew-studio",
@@ -742,6 +744,7 @@
                   "pt-BR/observability/arize-phoenix",
                   "pt-BR/observability/braintrust",
                   "pt-BR/observability/datadog",
+                  "pt-BR/observability/galileo",
                   "pt-BR/observability/langdb",
                   "pt-BR/observability/langfuse",
                   "pt-BR/observability/langtrace",
@@ -862,7 +865,8 @@
                 "group": "Guias",
                 "pages": [
                   "pt-BR/enterprise/guides/build-crew",
-                  "pt-BR/enterprise/guides/deploy-crew",
+                  "pt-BR/enterprise/guides/prepare-for-deployment",
+                  "pt-BR/enterprise/guides/deploy-to-amp",
                   "pt-BR/enterprise/guides/kickoff-crew",
                   "pt-BR/enterprise/guides/update-crew",
                   "pt-BR/enterprise/guides/enable-crew-studio",
@@ -1203,6 +1207,7 @@
                   "ko/observability/arize-phoenix",
                   "ko/observability/braintrust",
                   "ko/observability/datadog",
+                  "ko/observability/galileo",
                   "ko/observability/langdb",
                   "ko/observability/langfuse",
                   "ko/observability/langtrace",
@@ -1323,7 +1328,8 @@
                 "group": "How-To Guides",
                 "pages": [
                   "ko/enterprise/guides/build-crew",
-                  "ko/enterprise/guides/deploy-crew",
+                  "ko/enterprise/guides/prepare-for-deployment",
+                  "ko/enterprise/guides/deploy-to-amp",
                   "ko/enterprise/guides/kickoff-crew",
                   "ko/enterprise/guides/update-crew",
                   "ko/enterprise/guides/enable-crew-studio",
@@ -1511,6 +1517,18 @@
       "source": "/enterprise/:path*",
       "destination": "/en/enterprise/:path*"
     },
+    {
+      "source": "/en/enterprise/guides/deploy-crew",
+      "destination": "/en/enterprise/guides/deploy-to-amp"
+    },
+    {
+      "source": "/ko/enterprise/guides/deploy-crew",
+      "destination": "/ko/enterprise/guides/deploy-to-amp"
+    },
+    {
+      "source": "/pt-BR/enterprise/guides/deploy-crew",
+      "destination": "/pt-BR/enterprise/guides/deploy-to-amp"
+    },
     {
       "source": "/api-reference/:path*",
       "destination": "/en/api-reference/:path*"

docs/en/concepts/llms.mdx

@@ -375,10 +375,13 @@ In this section, you'll find detailed examples that help you select, configure,
     GOOGLE_API_KEY=<your-api-key>
     GEMINI_API_KEY=<your-api-key>
 
-    # Optional - for Vertex AI
+    # For Vertex AI Express mode (API key authentication)
+    GOOGLE_GENAI_USE_VERTEXAI=true
+    GOOGLE_API_KEY=<your-api-key>
+
+    # For Vertex AI with service account
     GOOGLE_CLOUD_PROJECT=<your-project-id>
     GOOGLE_CLOUD_LOCATION=<location>  # Defaults to us-central1
-    GOOGLE_GENAI_USE_VERTEXAI=true  # Set to use Vertex AI
     ```
 
     **Basic Usage:**
@@ -412,7 +415,35 @@ In this section, you'll find detailed examples that help you select, configure,
     )
     ```
 
-    **Vertex AI Configuration:**
+    **Vertex AI Express Mode (API Key Authentication):**
+
+    Vertex AI Express mode allows you to use Vertex AI with simple API key authentication instead of service account credentials. This is the quickest way to get started with Vertex AI.
+
+    To enable Express mode, set both environment variables in your `.env` file:
+    ```toml .env
+    GOOGLE_GENAI_USE_VERTEXAI=true
+    GOOGLE_API_KEY=<your-api-key>
+    ```
+
+    Then use the LLM as usual:
+    ```python Code
+    from crewai import LLM
+
+    llm = LLM(
+        model="gemini/gemini-2.0-flash",
+        temperature=0.7
+    )
+    ```
+
+    <Info>
+      To get an Express mode API key:
+      - New Google Cloud users: Get an [express mode API key](https://cloud.google.com/vertex-ai/generative-ai/docs/start/quickstart?usertype=apikey)
+      - Existing Google Cloud users: Get a [Google Cloud API key bound to a service account](https://cloud.google.com/docs/authentication/api-keys)
+      
+      For more details, see the [Vertex AI Express mode documentation](https://docs.cloud.google.com/vertex-ai/generative-ai/docs/start/quickstart?usertype=apikey).
+    </Info>
+
+    **Vertex AI Configuration (Service Account):**
     ```python Code
     from crewai import LLM
 
@@ -424,10 +455,10 @@ In this section, you'll find detailed examples that help you select, configure,
     ```
 
     **Supported Environment Variables:**
-    - `GOOGLE_API_KEY` or `GEMINI_API_KEY`: Your Google API key (required for Gemini API)
-    - `GOOGLE_CLOUD_PROJECT`: Google Cloud project ID (for Vertex AI)
+    - `GOOGLE_API_KEY` or `GEMINI_API_KEY`: Your Google API key (required for Gemini API and Vertex AI Express mode)
+    - `GOOGLE_GENAI_USE_VERTEXAI`: Set to `true` to use Vertex AI (required for Express mode)
+    - `GOOGLE_CLOUD_PROJECT`: Google Cloud project ID (for Vertex AI with service account)
     - `GOOGLE_CLOUD_LOCATION`: GCP location (defaults to `us-central1`)
-    - `GOOGLE_GENAI_USE_VERTEXAI`: Set to `true` to use Vertex AI
 
     **Features:**
     - Native function calling support for Gemini 1.5+ and 2.x models

docs/en/enterprise/guides/deploy-to-amp.mdx

@@ -1,12 +1,12 @@
 ---
-title: "Deploy Crew"
-description: "Deploying a Crew on CrewAI AMP"
+title: "Deploy to AMP"
+description: "Deploy your Crew or Flow to CrewAI AMP"
 icon: "rocket"
 mode: "wide"
 ---
 
 <Note>
-  After creating a crew locally or through Crew Studio, the next step is
+  After creating a Crew or Flow locally (or through Crew Studio), the next step is
   deploying it to the CrewAI AMP platform. This guide covers multiple deployment
   methods to help you choose the best approach for your workflow.
 </Note>
@@ -14,19 +14,26 @@ mode: "wide"
 ## Prerequisites
 
 <CardGroup cols={2}>
-  <Card title="Crew Ready for Deployment" icon="users">
-    You should have a working crew either built locally or created through Crew
-    Studio
+  <Card title="Project Ready for Deployment" icon="check-circle">
+    You should have a working Crew or Flow that runs successfully locally.
+    Follow our [preparation guide](/en/enterprise/guides/prepare-for-deployment) to verify your project structure.
   </Card>
   <Card title="GitHub Repository" icon="github">
-    Your crew code should be in a GitHub repository (for GitHub integration
+    Your code should be in a GitHub repository (for GitHub integration
     method)
   </Card>
 </CardGroup>
 
+<Info>
+  **Crews vs Flows**: Both project types can be deployed as "automations" on CrewAI AMP.
+  The deployment process is the same, but they have different project structures.
+  See [Prepare for Deployment](/en/enterprise/guides/prepare-for-deployment) for details.
+</Info>
+
 ## Option 1: Deploy Using CrewAI CLI
 
-The CLI provides the fastest way to deploy locally developed crews to the Enterprise platform.
+The CLI provides the fastest way to deploy locally developed Crews or Flows to the AMP platform.
+The CLI automatically detects your project type from `pyproject.toml` and builds accordingly.
 
 <Steps>
   <Step title="Install CrewAI CLI">
@@ -128,7 +135,7 @@ crewai deploy remove <deployment_id>
 
 ## Option 2: Deploy Directly via Web Interface
 
-You can also deploy your crews directly through the CrewAI AMP web interface by connecting your GitHub account. This approach doesn't require using the CLI on your local machine.
+You can also deploy your Crews or Flows directly through the CrewAI AMP web interface by connecting your GitHub account. This approach doesn't require using the CLI on your local machine. The platform automatically detects your project type and handles the build appropriately.
 
 <Steps>
 
@@ -282,68 +289,7 @@ For automated deployments in CI/CD pipelines, you can use the CrewAI API to trig
 
   </Steps>
 
-## ⚠️ Environment Variable Security Requirements
-
-<Warning>
-  **Important**: CrewAI AMP has security restrictions on environment variable
-  names that can cause deployment failures if not followed.
-</Warning>
-
-### Blocked Environment Variable Patterns
-
-For security reasons, the following environment variable naming patterns are **automatically filtered** and will cause deployment issues:
-
-**Blocked Patterns:**
-
-- Variables ending with `_TOKEN` (e.g., `MY_API_TOKEN`)
-- Variables ending with `_PASSWORD` (e.g., `DB_PASSWORD`)
-- Variables ending with `_SECRET` (e.g., `API_SECRET`)
-- Variables ending with `_KEY` in certain contexts
-
-**Specific Blocked Variables:**
-
-- `GITHUB_USER`, `GITHUB_TOKEN`
-- `AWS_REGION`, `AWS_DEFAULT_REGION`
-- Various internal CrewAI system variables
-
-### Allowed Exceptions
-
-Some variables are explicitly allowed despite matching blocked patterns:
-
-- `AZURE_AD_TOKEN`
-- `AZURE_OPENAI_AD_TOKEN`
-- `ENTERPRISE_ACTION_TOKEN`
-- `CREWAI_ENTEPRISE_TOOLS_TOKEN`
-
-### How to Fix Naming Issues
-
-If your deployment fails due to environment variable restrictions:
-
-```bash
-# ❌ These will cause deployment failures
-OPENAI_TOKEN=sk-...
-DATABASE_PASSWORD=mypassword
-API_SECRET=secret123
-
-# ✅ Use these naming patterns instead
-OPENAI_API_KEY=sk-...
-DATABASE_CREDENTIALS=mypassword
-API_CONFIG=secret123
-```
-
-### Best Practices
-
-1. **Use standard naming conventions**: `PROVIDER_API_KEY` instead of `PROVIDER_TOKEN`
-2. **Test locally first**: Ensure your crew works with the renamed variables
-3. **Update your code**: Change any references to the old variable names
-4. **Document changes**: Keep track of renamed variables for your team
-
-<Tip>
-  If you encounter deployment failures with cryptic environment variable errors,
-  check your variable names against these patterns first.
-</Tip>
-
-### Interact with Your Deployed Crew
+## Interact with Your Deployed Automation
 
 Once deployment is complete, you can access your crew through:
 
@@ -387,7 +333,108 @@ The Enterprise platform also offers:
 - **Custom Tools Repository**: Create, share, and install tools
 - **Crew Studio**: Build crews through a chat interface without writing code
 
+## Troubleshooting Deployment Failures
+
+If your deployment fails, check these common issues:
+
+### Build Failures
+
+#### Missing uv.lock File
+
+**Symptom**: Build fails early with dependency resolution errors
+
+**Solution**: Generate and commit the lock file:
+
+```bash
+uv lock
+git add uv.lock
+git commit -m "Add uv.lock for deployment"
+git push
+```
+
+<Warning>
+  The `uv.lock` file is required for all deployments. Without it, the platform
+  cannot reliably install your dependencies.
+</Warning>
+
+#### Wrong Project Structure
+
+**Symptom**: "Could not find entry point" or "Module not found" errors
+
+**Solution**: Verify your project matches the expected structure:
+
+- **Both Crews and Flows**: Must have entry point at `src/project_name/main.py`
+- **Crews**: Use a `run()` function as entry point
+- **Flows**: Use a `kickoff()` function as entry point
+
+See [Prepare for Deployment](/en/enterprise/guides/prepare-for-deployment) for detailed structure diagrams.
+
+#### Missing CrewBase Decorator
+
+**Symptom**: "Crew not found", "Config not found", or agent/task configuration errors
+
+**Solution**: Ensure **all** crew classes use the `@CrewBase` decorator:
+
+```python
+from crewai.project import CrewBase, agent, crew, task
+
+@CrewBase  # This decorator is REQUIRED
+class YourCrew():
+    """Your crew description"""
+
+    @agent
+    def my_agent(self) -> Agent:
+        return Agent(
+            config=self.agents_config['my_agent'],  # type: ignore[index]
+            verbose=True
+        )
+
+    # ... rest of crew definition
+```
+
+<Info>
+  This applies to standalone Crews AND crews embedded inside Flow projects.
+  Every crew class needs the decorator.
+</Info>
+
+#### Incorrect pyproject.toml Type
+
+**Symptom**: Build succeeds but runtime fails, or unexpected behavior
+
+**Solution**: Verify the `[tool.crewai]` section matches your project type:
+
+```toml
+# For Crew projects:
+[tool.crewai]
+type = "crew"
+
+# For Flow projects:
+[tool.crewai]
+type = "flow"
+```
+
+### Runtime Failures
+
+#### LLM Connection Failures
+
+**Symptom**: API key errors, "model not found", or authentication failures
+
+**Solution**:
+1. Verify your LLM provider's API key is correctly set in environment variables
+2. Ensure the environment variable names match what your code expects
+3. Test locally with the exact same environment variables before deploying
+
+#### Crew Execution Errors
+
+**Symptom**: Crew starts but fails during execution
+
+**Solution**:
+1. Check the execution logs in the AMP dashboard (Traces tab)
+2. Verify all tools have required API keys configured
+3. Ensure agent configurations in `agents.yaml` are valid
+4. Check task configurations in `tasks.yaml` for syntax errors
+
 <Card title="Need Help?" icon="headset" href="mailto:support@crewai.com">
   Contact our support team for assistance with deployment issues or questions
-  about the Enterprise platform.
+  about the AMP platform.
 </Card>

docs/en/enterprise/guides/prepare-for-deployment.mdx

@@ -0,0 +1,305 @@
+---
+title: "Prepare for Deployment"
+description: "Ensure your Crew or Flow is ready for deployment to CrewAI AMP"
+icon: "clipboard-check"
+mode: "wide"
+---
+
+<Note>
+  Before deploying to CrewAI AMP, it's crucial to verify your project is correctly structured.
+  Both Crews and Flows can be deployed as "automations," but they have different project structures
+  and requirements that must be met for successful deployment.
+</Note>
+
+## Understanding Automations
+
+In CrewAI AMP, **automations** is the umbrella term for deployable Agentic AI projects. An automation can be either:
+
+- **A Crew**: A standalone team of AI agents working together on tasks
+- **A Flow**: An orchestrated workflow that can combine multiple crews, direct LLM calls, and procedural logic
+
+Understanding which type you're deploying is essential because they have different project structures and entry points.
+
+## Crews vs Flows: Key Differences
+
+<CardGroup cols={2}>
+  <Card title="Crew Projects" icon="users">
+    Standalone AI agent teams with `crew.py` defining agents and tasks. Best for focused, collaborative tasks.
+  </Card>
+  <Card title="Flow Projects" icon="diagram-project">
+    Orchestrated workflows with embedded crews in a `crews/` folder. Best for complex, multi-stage processes.
+  </Card>
+</CardGroup>
+
+| Aspect | Crew | Flow |
+|--------|------|------|
+| **Project structure** | `src/project_name/` with `crew.py` | `src/project_name/` with `crews/` folder |
+| **Main logic location** | `src/project_name/crew.py` | `src/project_name/main.py` (Flow class) |
+| **Entry point function** | `run()` in `main.py` | `kickoff()` in `main.py` |
+| **pyproject.toml type** | `type = "crew"` | `type = "flow"` |
+| **CLI create command** | `crewai create crew name` | `crewai create flow name` |
+| **Config location** | `src/project_name/config/` | `src/project_name/crews/crew_name/config/` |
+| **Can contain other crews** | No | Yes (in `crews/` folder) |
+
+## Project Structure Reference
+
+### Crew Project Structure
+
+When you run `crewai create crew my_crew`, you get this structure:
+
+```
+my_crew/
+├── .gitignore
+├── pyproject.toml          # Must have type = "crew"
+├── README.md
+├── .env
+├── uv.lock                  # REQUIRED for deployment
+└── src/
+    └── my_crew/
+        ├── __init__.py
+        ├── main.py          # Entry point with run() function
+        ├── crew.py          # Crew class with @CrewBase decorator
+        ├── tools/
+        │   ├── custom_tool.py
+        │   └── __init__.py
+        └── config/
+            ├── agents.yaml  # Agent definitions
+            └── tasks.yaml   # Task definitions
+```
+
+<Warning>
+  The nested `src/project_name/` structure is critical for Crews.
+  Placing files at the wrong level will cause deployment failures.
+</Warning>
+
+### Flow Project Structure
+
+When you run `crewai create flow my_flow`, you get this structure:
+
+```
+my_flow/
+├── .gitignore
+├── pyproject.toml          # Must have type = "flow"
+├── README.md
+├── .env
+├── uv.lock                  # REQUIRED for deployment
+└── src/
+    └── my_flow/
+        ├── __init__.py
+        ├── main.py          # Entry point with kickoff() function + Flow class
+        ├── crews/           # Embedded crews folder
+        │   └── poem_crew/
+        │       ├── __init__.py
+        │       ├── poem_crew.py  # Crew with @CrewBase decorator
+        │       └── config/
+        │           ├── agents.yaml
+        │           └── tasks.yaml
+        └── tools/
+            ├── __init__.py
+            └── custom_tool.py
+```
+
+<Info>
+  Both Crews and Flows use the `src/project_name/` structure.
+  The key difference is that Flows have a `crews/` folder for embedded crews,
+  while Crews have `crew.py` directly in the project folder.
+</Info>
+
+## Pre-Deployment Checklist
+
+Use this checklist to verify your project is ready for deployment.
+
+### 1. Verify pyproject.toml Configuration
+
+Your `pyproject.toml` must include the correct `[tool.crewai]` section:
+
+<Tabs>
+  <Tab title="For Crews">
+    ```toml
+    [tool.crewai]
+    type = "crew"
+    ```
+  </Tab>
+  <Tab title="For Flows">
+    ```toml
+    [tool.crewai]
+    type = "flow"
+    ```
+  </Tab>
+</Tabs>
+
+<Warning>
+  If the `type` doesn't match your project structure, the build will fail or
+  the automation won't run correctly.
+</Warning>
+
+### 2. Ensure uv.lock File Exists
+
+CrewAI uses `uv` for dependency management. The `uv.lock` file ensures reproducible builds and is **required** for deployment.
+
+```bash
+# Generate or update the lock file
+uv lock
+
+# Verify it exists
+ls -la uv.lock
+```
+
+If the file doesn't exist, run `uv lock` and commit it to your repository:
+
+```bash
+uv lock
+git add uv.lock
+git commit -m "Add uv.lock for deployment"
+git push
+```
+
+### 3. Validate CrewBase Decorator Usage
+
+**Every crew class must use the `@CrewBase` decorator.** This applies to:
+
+- Standalone crew projects
+- Crews embedded inside Flow projects
+
+```python
+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
+
+@CrewBase  # This decorator is REQUIRED
+class MyCrew():
+    """My crew description"""
+
+    agents: List[BaseAgent]
+    tasks: List[Task]
+
+    @agent
+    def my_agent(self) -> Agent:
+        return Agent(
+            config=self.agents_config['my_agent'],  # type: ignore[index]
+            verbose=True
+        )
+
+    @task
+    def my_task(self) -> Task:
+        return Task(
+            config=self.tasks_config['my_task']  # type: ignore[index]
+        )
+
+    @crew
+    def crew(self) -> Crew:
+        return Crew(
+            agents=self.agents,
+            tasks=self.tasks,
+            process=Process.sequential,
+            verbose=True,
+        )
+```
+
+<Warning>
+  If you forget the `@CrewBase` decorator, your deployment will fail with
+  errors about missing agents or tasks configurations.
+</Warning>
+
+### 4. Check Project Entry Points
+
+Both Crews and Flows have their entry point in `src/project_name/main.py`:
+
+<Tabs>
+  <Tab title="For Crews">
+    The entry point uses a `run()` function:
+
+    ```python
+    # src/my_crew/main.py
+    from my_crew.crew import MyCrew
+
+    def run():
+        """Run the crew."""
+        inputs = {'topic': 'AI in Healthcare'}
+        result = MyCrew().crew().kickoff(inputs=inputs)
+        return result
+
+    if __name__ == "__main__":
+        run()
+    ```
+  </Tab>
+  <Tab title="For Flows">
+    The entry point uses a `kickoff()` function with a Flow class:
+
+    ```python
+    # src/my_flow/main.py
+    from crewai.flow import Flow, listen, start
+    from my_flow.crews.poem_crew.poem_crew import PoemCrew
+
+    class MyFlow(Flow):
+        @start()
+        def begin(self):
+            # Flow logic here
+            result = PoemCrew().crew().kickoff(inputs={...})
+            return result
+
+    def kickoff():
+        """Run the flow."""
+        MyFlow().kickoff()
+
+    if __name__ == "__main__":
+        kickoff()
+    ```
+  </Tab>
+</Tabs>
+
+### 5. Prepare Environment Variables
+
+Before deployment, ensure you have:
+
+1. **LLM API keys** ready (OpenAI, Anthropic, Google, etc.)
+2. **Tool API keys** if using external tools (Serper, etc.)
+
+<Tip>
+  Test your project locally with the same environment variables before deploying
+  to catch configuration issues early.
+</Tip>
+
+## Quick Validation Commands
+
+Run these commands from your project root to quickly verify your setup:
+
+```bash
+# 1. Check project type in pyproject.toml
+grep -A2 "\[tool.crewai\]" pyproject.toml
+
+# 2. Verify uv.lock exists
+ls -la uv.lock || echo "ERROR: uv.lock missing! Run 'uv lock'"
+
+# 3. Verify src/ structure exists
+ls -la src/*/main.py 2>/dev/null || echo "No main.py found in src/"
+
+# 4. For Crews - verify crew.py exists
+ls -la src/*/crew.py 2>/dev/null || echo "No crew.py (expected for Crews)"
+
+# 5. For Flows - verify crews/ folder exists
+ls -la src/*/crews/ 2>/dev/null || echo "No crews/ folder (expected for Flows)"
+
+# 6. Check for CrewBase usage
+grep -r "@CrewBase" . --include="*.py"
+```
+
+## Common Setup Mistakes
+
+| Mistake | Symptom | Fix |
+|---------|---------|-----|
+| Missing `uv.lock` | Build fails during dependency resolution | Run `uv lock` and commit |
+| Wrong `type` in pyproject.toml | Build succeeds but runtime fails | Change to correct type |
+| Missing `@CrewBase` decorator | "Config not found" errors | Add decorator to all crew classes |
+| Files at root instead of `src/` | Entry point not found | Move to `src/project_name/` |
+| Missing `run()` or `kickoff()` | Cannot start automation | Add correct entry function |
+
+## Next Steps
+
+Once your project passes all checklist items, you're ready to deploy:
+
+<Card title="Deploy to AMP" icon="rocket" href="/en/enterprise/guides/deploy-to-amp">
+  Follow the deployment guide to deploy your Crew or Flow to CrewAI AMP using
+  the CLI, web interface, or CI/CD integration.
+</Card>

docs/en/learn/a2a-agent-delegation.mdx

@@ -1,43 +1,48 @@
 ---
 title: Agent-to-Agent (A2A) Protocol
-description: Enable CrewAI agents to delegate tasks to remote A2A-compliant agents for specialized handling
+description: Agents delegate tasks to remote A2A agents and/or operate as A2A-compliant server agents.
 icon: network-wired
 mode: "wide"
 ---
 
 ## A2A Agent Delegation
 
-CrewAI supports the Agent-to-Agent (A2A) protocol, allowing agents to delegate tasks to remote specialized agents. The agent's LLM automatically decides whether to handle a task directly or delegate to an A2A agent based on the task requirements.
-
-<Note>
-  A2A delegation requires the `a2a-sdk` package. Install with: `uv add 'crewai[a2a]'` or `pip install 'crewai[a2a]'`
-</Note>
+CrewAI treats [A2A protocol](https://a2a-protocol.org/latest/) as a first-class delegation primitive, enabling agents to delegate tasks, request information, and collaborate with remote agents, as well as act as A2A-compliant server agents.
+In client mode, agents autonomously choose between local execution and remote delegation based on task requirements.
 
 ## How It Works
 
 When an agent is configured with A2A capabilities:
 
-1. The LLM analyzes each task
+1. The Agent analyzes each task
 2. It decides to either:
    - Handle the task directly using its own capabilities
    - Delegate to a remote A2A agent for specialized handling
 3. If delegating, the agent communicates with the remote A2A agent through the protocol
 4. Results are returned to the CrewAI workflow
 
+<Note>
+  A2A delegation requires the `a2a-sdk` package. Install with: `uv add 'crewai[a2a]'` or `pip install 'crewai[a2a]'`
+</Note>
+
 ## Basic Configuration
 
+<Warning>
+  `crewai.a2a.config.A2AConfig` is deprecated and will be removed in v2.0.0. Use `A2AClientConfig` for connecting to remote agents and/or `A2AServerConfig` for exposing agents as servers.
+</Warning>
+
 Configure an agent for A2A delegation by setting the `a2a` parameter:
 
 ```python Code
 from crewai import Agent, Crew, Task
-from crewai.a2a import A2AConfig
+from crewai.a2a import A2AClientConfig
 
 agent = Agent(
     role="Research Coordinator",
     goal="Coordinate research tasks efficiently",
     backstory="Expert at delegating to specialized research agents",
     llm="gpt-4o",
-    a2a=A2AConfig(
+    a2a=A2AClientConfig(
         endpoint="https://example.com/.well-known/agent-card.json",
         timeout=120,
         max_turns=10
@@ -54,9 +59,9 @@ crew = Crew(agents=[agent], tasks=[task], verbose=True)
 result = crew.kickoff()
 ```
 
-## Configuration Options
+## Client Configuration Options
 
-The `A2AConfig` class accepts the following parameters:
+The `A2AClientConfig` class accepts the following parameters:
 
 <ParamField path="endpoint" type="str" required>
   The A2A agent endpoint URL (typically points to `.well-known/agent-card.json`)
@@ -91,14 +96,34 @@ The `A2AConfig` class accepts the following parameters:
   Update mechanism for receiving task status. Options: `StreamingConfig`, `PollingConfig`, or `PushNotificationConfig`.
 </ParamField>
 
+<ParamField path="transport_protocol" type="Literal['JSONRPC', 'GRPC', 'HTTP+JSON']" default="JSONRPC">
+  Transport protocol for A2A communication. Options: `JSONRPC` (default), `GRPC`, or `HTTP+JSON`.
+</ParamField>
+
+<ParamField path="accepted_output_modes" type="list[str]" default='["application/json"]'>
+  Media types the client can accept in responses.
+</ParamField>
+
+<ParamField path="supported_transports" type="list[str]" default='["JSONRPC"]'>
+  Ordered list of transport protocols the client supports.
+</ParamField>
+
+<ParamField path="use_client_preference" type="bool" default="False">
+  Whether to prioritize client transport preferences over server.
+</ParamField>
+
+<ParamField path="extensions" type="list[str]" default="[]">
+  Extension URIs the client supports.
+</ParamField>
+
 ## Authentication
 
 For A2A agents that require authentication, use one of the provided auth schemes:
 
 <Tabs>
   <Tab title="Bearer Token">
-    ```python Code
-from crewai.a2a import A2AConfig
+```python bearer_token_auth.py lines
+from crewai.a2a import A2AClientConfig
 from crewai.a2a.auth import BearerTokenAuth
 
 agent = Agent(
@@ -106,18 +131,18 @@ agent = Agent(
     goal="Coordinate tasks with secured agents",
     backstory="Manages secure agent communications",
     llm="gpt-4o",
-    a2a=A2AConfig(
+    a2a=A2AClientConfig(
         endpoint="https://secure-agent.example.com/.well-known/agent-card.json",
         auth=BearerTokenAuth(token="your-bearer-token"),
         timeout=120
     )
 )
-    ```
+```
   </Tab>
 
   <Tab title="API Key">
-    ```python Code
-from crewai.a2a import A2AConfig
+```python api_key_auth.py lines
+from crewai.a2a import A2AClientConfig
 from crewai.a2a.auth import APIKeyAuth
 
 agent = Agent(
@@ -125,7 +150,7 @@ agent = Agent(
     goal="Coordinate with API-based agents",
     backstory="Manages API-authenticated communications",
     llm="gpt-4o",
-    a2a=A2AConfig(
+    a2a=A2AClientConfig(
         endpoint="https://api-agent.example.com/.well-known/agent-card.json",
         auth=APIKeyAuth(
             api_key="your-api-key",
@@ -135,12 +160,12 @@ agent = Agent(
         timeout=120
     )
 )
-    ```
+```
   </Tab>
 
   <Tab title="OAuth2">
-    ```python Code
-from crewai.a2a import A2AConfig
+```python oauth2_auth.py lines
+from crewai.a2a import A2AClientConfig
 from crewai.a2a.auth import OAuth2ClientCredentials
 
 agent = Agent(
@@ -148,7 +173,7 @@ agent = Agent(
     goal="Coordinate with OAuth-secured agents",
     backstory="Manages OAuth-authenticated communications",
     llm="gpt-4o",
-    a2a=A2AConfig(
+    a2a=A2AClientConfig(
         endpoint="https://oauth-agent.example.com/.well-known/agent-card.json",
         auth=OAuth2ClientCredentials(
             token_url="https://auth.example.com/oauth/token",
@@ -159,12 +184,12 @@ agent = Agent(
         timeout=120
     )
 )
-    ```
+```
   </Tab>
 
   <Tab title="HTTP Basic">
-    ```python Code
-from crewai.a2a import A2AConfig
+```python http_basic_auth.py lines
+from crewai.a2a import A2AClientConfig
 from crewai.a2a.auth import HTTPBasicAuth
 
 agent = Agent(
@@ -172,7 +197,7 @@ agent = Agent(
     goal="Coordinate with basic auth agents",
     backstory="Manages basic authentication communications",
     llm="gpt-4o",
-    a2a=A2AConfig(
+    a2a=A2AClientConfig(
         endpoint="https://basic-agent.example.com/.well-known/agent-card.json",
         auth=HTTPBasicAuth(
             username="your-username",
@@ -181,7 +206,7 @@ agent = Agent(
         timeout=120
     )
 )
-    ```
+```
   </Tab>
 </Tabs>
 
@@ -190,7 +215,7 @@ agent = Agent(
 Configure multiple A2A agents for delegation by passing a list:
 
 ```python Code
-from crewai.a2a import A2AConfig
+from crewai.a2a import A2AClientConfig
 from crewai.a2a.auth import BearerTokenAuth
 
 agent = Agent(
@@ -199,11 +224,11 @@ agent = Agent(
     backstory="Expert at delegating to the right specialist",
     llm="gpt-4o",
     a2a=[
-        A2AConfig(
+        A2AClientConfig(
             endpoint="https://research.example.com/.well-known/agent-card.json",
             timeout=120
         ),
-        A2AConfig(
+        A2AClientConfig(
             endpoint="https://data.example.com/.well-known/agent-card.json",
             auth=BearerTokenAuth(token="data-token"),
             timeout=90
@@ -219,7 +244,7 @@ The LLM will automatically choose which A2A agent to delegate to based on the ta
 Control how agent connection failures are handled using the `fail_fast` parameter:
 
 ```python Code
-from crewai.a2a import A2AConfig
+from crewai.a2a import A2AClientConfig
 
 # Fail immediately on connection errors (default)
 agent = Agent(
@@ -227,7 +252,7 @@ agent = Agent(
     goal="Coordinate research tasks",
     backstory="Expert at delegation",
     llm="gpt-4o",
-    a2a=A2AConfig(
+    a2a=A2AClientConfig(
         endpoint="https://research.example.com/.well-known/agent-card.json",
         fail_fast=True
     )
@@ -240,11 +265,11 @@ agent = Agent(
     backstory="Expert at working with available resources",
     llm="gpt-4o",
     a2a=[
-        A2AConfig(
+        A2AClientConfig(
             endpoint="https://primary.example.com/.well-known/agent-card.json",
             fail_fast=False
         ),
-        A2AConfig(
+        A2AClientConfig(
             endpoint="https://backup.example.com/.well-known/agent-card.json",
             fail_fast=False
         )
@@ -263,8 +288,8 @@ Control how your agent receives task status updates from remote A2A agents:
 
 <Tabs>
   <Tab title="Streaming (Default)">
-    ```python Code
-from crewai.a2a import A2AConfig
+```python streaming_config.py lines
+from crewai.a2a import A2AClientConfig
 from crewai.a2a.updates import StreamingConfig
 
 agent = Agent(
@@ -272,17 +297,17 @@ agent = Agent(
     goal="Coordinate research tasks",
     backstory="Expert at delegation",
     llm="gpt-4o",
-    a2a=A2AConfig(
+    a2a=A2AClientConfig(
         endpoint="https://research.example.com/.well-known/agent-card.json",
         updates=StreamingConfig()
     )
 )
-    ```
+```
   </Tab>
 
   <Tab title="Polling">
-    ```python Code
-from crewai.a2a import A2AConfig
+```python polling_config.py lines
+from crewai.a2a import A2AClientConfig
 from crewai.a2a.updates import PollingConfig
 
 agent = Agent(
@@ -290,7 +315,7 @@ agent = Agent(
     goal="Coordinate research tasks",
     backstory="Expert at delegation",
     llm="gpt-4o",
-    a2a=A2AConfig(
+    a2a=A2AClientConfig(
         endpoint="https://research.example.com/.well-known/agent-card.json",
         updates=PollingConfig(
             interval=2.0,
@@ -299,12 +324,12 @@ agent = Agent(
         )
     )
 )
-    ```
+```
   </Tab>
 
   <Tab title="Push Notifications">
-    ```python Code
-from crewai.a2a import A2AConfig
+```python push_notifications_config.py lines
+from crewai.a2a import A2AClientConfig
 from crewai.a2a.updates import PushNotificationConfig
 
 agent = Agent(
@@ -312,19 +337,137 @@ agent = Agent(
     goal="Coordinate research tasks",
     backstory="Expert at delegation",
     llm="gpt-4o",
-    a2a=A2AConfig(
+    a2a=A2AClientConfig(
         endpoint="https://research.example.com/.well-known/agent-card.json",
         updates=PushNotificationConfig(
-            url={base_url}/a2a/callback",
+            url="{base_url}/a2a/callback",
             token="your-validation-token",
             timeout=300.0
         )
     )
 )
-    ```
+```
   </Tab>
 </Tabs>
 
+## Exposing Agents as A2A Servers
+
+You can expose your CrewAI agents as A2A-compliant servers, allowing other A2A clients to delegate tasks to them.
+
+### Server Configuration
+
+Add an `A2AServerConfig` to your agent to enable server capabilities:
+
+```python a2a_server_agent.py lines
+from crewai import Agent
+from crewai.a2a import A2AServerConfig
+
+agent = Agent(
+    role="Data Analyst",
+    goal="Analyze datasets and provide insights",
+    backstory="Expert data scientist with statistical analysis skills",
+    llm="gpt-4o",
+    a2a=A2AServerConfig(url="https://your-server.com")
+)
+```
+
+### Server Configuration Options
+
+<ParamField path="name" type="str" default="None">
+  Human-readable name for the agent. Defaults to the agent's role if not provided.
+</ParamField>
+
+<ParamField path="description" type="str" default="None">
+  Human-readable description. Defaults to the agent's goal and backstory if not provided.
+</ParamField>
+
+<ParamField path="version" type="str" default="1.0.0">
+  Version string for the agent card.
+</ParamField>
+
+<ParamField path="skills" type="list[AgentSkill]" default="[]">
+  List of agent skills. Auto-generated from agent tools if not provided.
+</ParamField>
+
+<ParamField path="capabilities" type="AgentCapabilities" default="AgentCapabilities(streaming=True, push_notifications=False)">
+  Declaration of optional capabilities supported by the agent.
+</ParamField>
+
+<ParamField path="default_input_modes" type="list[str]" default='["text/plain", "application/json"]'>
+  Supported input MIME types.
+</ParamField>
+
+<ParamField path="default_output_modes" type="list[str]" default='["text/plain", "application/json"]'>
+  Supported output MIME types.
+</ParamField>
+
+<ParamField path="url" type="str" default="None">
+  Preferred endpoint URL. If set, overrides the URL passed to `to_agent_card()`.
+</ParamField>
+
+<ParamField path="preferred_transport" type="Literal['JSONRPC', 'GRPC', 'HTTP+JSON']" default="JSONRPC">
+  Transport protocol for the preferred endpoint.
+</ParamField>
+
+<ParamField path="protocol_version" type="str" default="0.3">
+  A2A protocol version this agent supports.
+</ParamField>
+
+<ParamField path="provider" type="AgentProvider" default="None">
+  Information about the agent's service provider.
+</ParamField>
+
+<ParamField path="documentation_url" type="str" default="None">
+  URL to the agent's documentation.
+</ParamField>
+
+<ParamField path="icon_url" type="str" default="None">
+  URL to an icon for the agent.
+</ParamField>
+
+<ParamField path="additional_interfaces" type="list[AgentInterface]" default="[]">
+  Additional supported interfaces (transport and URL combinations).
+</ParamField>
+
+<ParamField path="security" type="list[dict[str, list[str]]]" default="[]">
+  Security requirement objects for all agent interactions.
+</ParamField>
+
+<ParamField path="security_schemes" type="dict[str, SecurityScheme]" default="{}">
+  Security schemes available to authorize requests.
+</ParamField>
+
+<ParamField path="supports_authenticated_extended_card" type="bool" default="False">
+  Whether agent provides extended card to authenticated users.
+</ParamField>
+
+<ParamField path="signatures" type="list[AgentCardSignature]" default="[]">
+  JSON Web Signatures for the AgentCard.
+</ParamField>
+
+### Combined Client and Server
+
+An agent can act as both client and server by providing both configurations:
+
+```python Code
+from crewai import Agent
+from crewai.a2a import A2AClientConfig, A2AServerConfig
+
+agent = Agent(
+    role="Research Coordinator",
+    goal="Coordinate research and serve analysis requests",
+    backstory="Expert at delegation and analysis",
+    llm="gpt-4o",
+    a2a=[
+        A2AClientConfig(
+            endpoint="https://specialist.example.com/.well-known/agent-card.json",
+            timeout=120
+        ),
+        A2AServerConfig(url="https://your-server.com")
+    ]
+)
+```
+
 ## Best Practices
 
 <CardGroup cols={2}>

docs/en/observability/galileo.mdx

@@ -0,0 +1,115 @@
+---
+title: Galileo
+description: Galileo integration for CrewAI tracing and evaluation
+icon: telescope
+mode: "wide"
+---
+
+## Overview
+
+This guide demonstrates how to integrate **Galileo** with **CrewAI**
+for comprehensive tracing and Evaluation Engineering.
+By the end of this guide, you will be able to trace your CrewAI agents,
+monitor their performance, and evaluate their behaviour with
+Galileo's powerful observability platform.
+
+> **What is Galileo?** [Galileo](https://galileo.ai) is AI evaluation and observability
+platform that delivers end-to-end tracing, evaluation,
+and monitoring for AI applications. It enables teams to capture ground truth,
+create robust guardrails, and run systematic experiments with
+built-in experiment tracking and performance analytics—ensuring reliability,
+transparency, and continuous improvement across the AI lifecycle.
+
+## Getting started
+
+This tutorial follows the [CrewAI quickstart](/en/quickstart) and shows how to add
+Galileo's [CrewAIEventListener](https://v2docs.galileo.ai/sdk-api/python/reference/handlers/crewai/handler),
+an event handler.
+For more information, see Galileo’s
+[Add Galileo to a CrewAI Application](https://v2docs.galileo.ai/how-to-guides/third-party-integrations/add-galileo-to-crewai/add-galileo-to-crewai)
+how-to guide.
+
+> **Note** This tutorial assumes you have completed the [CrewAI quickstart](/en/quickstart).
+If you want a completed comprehensive example, see the Galileo
+[CrewAI sdk-example repo](https://github.com/rungalileo/sdk-examples/tree/main/python/agent/crew-ai).
+
+### Step 1: Install dependencies
+
+Install the required dependencies for your app.
+Create a virtual environment using your preferred method,
+then install dependencies inside that environment using your
+preferred tool:
+
+```bash
+uv add galileo 
+```
+
+### Step 2: Add to the .env file from the [CrewAI quickstart](/en/quickstart)
+
+```bash
+# Your Galileo API key
+GALILEO_API_KEY="your-galileo-api-key"
+
+# Your Galileo project name
+GALILEO_PROJECT="your-galileo-project-name"
+
+# The name of the Log stream you want to use for logging
+GALILEO_LOG_STREAM="your-galileo-log-stream "
+```
+
+### Step 3: Add the Galileo event listener
+
+To enable logging with Galileo, you need to create an instance of the `CrewAIEventListener`.
+Import the Galileo CrewAI handler package by
+adding the following code at the top of your main.py file:
+
+```python
+from galileo.handlers.crewai.handler import CrewAIEventListener
+```
+
+At the start of your run function, create the event listener:
+
+```python
+def run():
+    # Create the event listener
+    CrewAIEventListener()
+    # The rest of your existing code goes here
+```
+
+When you create the listener instance, it is automatically
+registered with CrewAI.
+
+### Step 4: Run your crew
+
+Run your crew with the CrewAI CLI:
+
+```bash
+crewai run
+```
+
+### Step 5: View the traces in Galileo
+
+Once your crew has finished, the traces will be flushed and appear in Galileo.
+
+![Galileo trace view](/images/galileo-trace-veiw.png)
+  
+## Understanding the Galileo Integration
+
+Galileo integrates with CrewAI by registering an event listener
+that captures Crew execution events (e.g., agent actions, tool calls, model responses)
+and forwards them to Galileo for observability and evaluation.
+
+### Understanding the event listener
+
+Creating a `CrewAIEventListener()` instance is all that’s
+required to enable Galileo for a CrewAI run. When instantiated, the listener:
+
+- Automatically registers itself with CrewAI
+- Reads Galileo configuration from environment variables
+- Logs all run data to the Galileo project and log stream specified by
+  `GALILEO_PROJECT` and `GALILEO_LOG_STREAM`
+
+No additional configuration or code changes are required.
+All data from this run is logged to the Galileo project and
+log stream specified by your environment configuration
+(for example, GALILEO_PROJECT and GALILEO_LOG_STREAM).

docs/ko/concepts/llms.mdx

@@ -107,7 +107,7 @@ CrewAI 코드 내에는 사용할 모델을 지정할 수 있는 여러 위치
 
 ## 공급자 구성 예시
 
-CrewAI는 고유한 기능, 인증 방법, 모델 역량을 제공하는 다양한 LLM 공급자를 지원합니다.  
+CrewAI는 고유한 기능, 인증 방법, 모델 역량을 제공하는 다양한 LLM 공급자를 지원합니다.
 이 섹션에서는 프로젝트의 요구에 가장 적합한 LLM을 선택, 구성, 최적화하는 데 도움이 되는 자세한 예시를 제공합니다.
 
 <AccordionGroup>
@@ -153,8 +153,8 @@ CrewAI는 고유한 기능, 인증 방법, 모델 역량을 제공하는 다양
   </Accordion>
 
   <Accordion title="Meta-Llama">
-    Meta의 Llama API는 Meta의 대형 언어 모델 패밀리 접근을 제공합니다.  
-    API는 [Meta Llama API](https://llama.developer.meta.com?utm_source=partner-crewai&utm_medium=website)에서 사용할 수 있습니다.  
+    Meta의 Llama API는 Meta의 대형 언어 모델 패밀리 접근을 제공합니다.
+    API는 [Meta Llama API](https://llama.developer.meta.com?utm_source=partner-crewai&utm_medium=website)에서 사용할 수 있습니다.
     `.env` 파일에 다음 환경 변수를 설정하십시오:
 
     ```toml Code
@@ -207,11 +207,20 @@ CrewAI는 고유한 기능, 인증 방법, 모델 역량을 제공하는 다양
     `.env` 파일에 API 키를 설정하십시오. 키가 필요하거나 기존 키를 찾으려면 [AI Studio](https://aistudio.google.com/apikey)를 확인하세요.
 
     ```toml .env
-    # https://ai.google.dev/gemini-api/docs/api-key
+    # Gemini API 사용 시 (다음 중 하나)
+    GOOGLE_API_KEY=<your-api-key>
     GEMINI_API_KEY=<your-api-key>
+
+    # Vertex AI Express 모드 사용 시 (API 키 인증)
+    GOOGLE_GENAI_USE_VERTEXAI=true
+    GOOGLE_API_KEY=<your-api-key>
+
+    # Vertex AI 서비스 계정 사용 시
+    GOOGLE_CLOUD_PROJECT=<your-project-id>
+    GOOGLE_CLOUD_LOCATION=<location>  # 기본값: us-central1
     ```
 
-    CrewAI 프로젝트에서의 예시 사용법:
+    **기본 사용법:**
     ```python Code
     from crewai import LLM
 
@@ -221,6 +230,34 @@ CrewAI는 고유한 기능, 인증 방법, 모델 역량을 제공하는 다양
     )
     ```
 
+    **Vertex AI Express 모드 (API 키 인증):**
+
+    Vertex AI Express 모드를 사용하면 서비스 계정 자격 증명 대신 간단한 API 키 인증으로 Vertex AI를 사용할 수 있습니다. Vertex AI를 시작하는 가장 빠른 방법입니다.
+
+    Express 모드를 활성화하려면 `.env` 파일에 두 환경 변수를 모두 설정하세요:
+    ```toml .env
+    GOOGLE_GENAI_USE_VERTEXAI=true
+    GOOGLE_API_KEY=<your-api-key>
+    ```
+
+    그런 다음 평소처럼 LLM을 사용하세요:
+    ```python Code
+    from crewai import LLM
+
+    llm = LLM(
+        model="gemini/gemini-2.0-flash",
+        temperature=0.7
+    )
+    ```
+
+    <Info>
+      Express 모드 API 키를 받으려면:
+      - 신규 Google Cloud 사용자: [Express 모드 API 키](https://cloud.google.com/vertex-ai/generative-ai/docs/start/quickstart?usertype=apikey) 받기
+      - 기존 Google Cloud 사용자: [서비스 계정에 바인딩된 Google Cloud API 키](https://cloud.google.com/docs/authentication/api-keys) 받기
+
+      자세한 내용은 [Vertex AI Express 모드 문서](https://docs.cloud.google.com/vertex-ai/generative-ai/docs/start/quickstart?usertype=apikey)를 참조하세요.
+    </Info>
+
     ### Gemini 모델
 
     Google은 다양한 용도에 최적화된 강력한 모델을 제공합니다.
@@ -476,7 +513,7 @@ CrewAI는 고유한 기능, 인증 방법, 모델 역량을 제공하는 다양
 
   <Accordion title="Local NVIDIA NIM Deployed using WSL2">
 
-    NVIDIA NIM을 이용하면 Windows 기기에서 WSL2(Windows Subsystem for Linux)를 통해 강력한 LLM을 로컬로 실행할 수 있습니다.  
+    NVIDIA NIM을 이용하면 Windows 기기에서 WSL2(Windows Subsystem for Linux)를 통해 강력한 LLM을 로컬로 실행할 수 있습니다.
     이 방식은 Nvidia GPU를 활용하여 프라이빗하고, 안전하며, 비용 효율적인 AI 추론을 클라우드 서비스에 의존하지 않고 구현할 수 있습니다.
     데이터 프라이버시, 오프라인 기능이 필요한 개발, 테스트, 또는 프로덕션 환경에 최적입니다.
 
@@ -954,4 +991,4 @@ LLM 설정을 최대한 활용하는 방법을 알아보세요:
     llm = LLM(model="openai/gpt-4o")  # 128K tokens
     ```
   </Tab>
-</Tabs>
+</Tabs>

docs/ko/concepts/production-architecture.mdx

@@ -128,7 +128,7 @@ Flow를 배포할 때 다음을 고려하세요:
 ### CrewAI Enterprise
 Flow를 배포하는 가장 쉬운 방법은 CrewAI Enterprise를 사용하는 것입니다. 인프라, 인증 및 모니터링을 대신 처리합니다.
 
-시작하려면 [배포 가이드](/ko/enterprise/guides/deploy-crew)를 확인하세요.
+시작하려면 [배포 가이드](/ko/enterprise/guides/deploy-to-amp)를 확인하세요.
 
 ```bash
 crewai deploy create

docs/ko/enterprise/features/automations.mdx

@@ -91,7 +91,7 @@ Git 없이 빠르게 배포 — 프로젝트 ZIP 패키지를 업로드하세요
 ## 관련 문서
 
 <CardGroup cols={3}>
-  <Card title="크루 배포" href="/ko/enterprise/guides/deploy-crew" icon="rocket">
+  <Card title="크루 배포" href="/ko/enterprise/guides/deploy-to-amp" icon="rocket">
     GitHub 또는 ZIP 파일로 크루 배포
   </Card>
   <Card title="자동화 트리거" href="/ko/enterprise/guides/automation-triggers" icon="trigger">

docs/ko/enterprise/features/crew-studio.mdx

@@ -79,7 +79,7 @@ Crew Studio는 자연어와 시각적 워크플로 에디터로 처음부터 자
   <Card title="크루 빌드" href="/ko/enterprise/guides/build-crew" icon="paintbrush">
     크루를 빌드하세요.
   </Card>
-  <Card title="크루 배포" href="/ko/enterprise/guides/deploy-crew" icon="rocket">
+  <Card title="크루 배포" href="/ko/enterprise/guides/deploy-to-amp" icon="rocket">
     GitHub 또는 ZIP 파일로 크루 배포.
   </Card>
   <Card title="React 컴포넌트 내보내기" href="/ko/enterprise/guides/react-component-export" icon="download">

docs/ko/enterprise/guides/deploy-crew.mdx

@@ -1,305 +0,0 @@
----
-title: "Crew 배포"
-description: "CrewAI 엔터프라이즈에서 Crew 배포하기"
-icon: "rocket"
-mode: "wide"
----
-
-<Note>
-  로컬에서 또는 Crew Studio를 통해 crew를 생성한 후, 다음 단계는 이를 CrewAI AMP
-  플랫폼에 배포하는 것입니다. 본 가이드에서는 다양한 배포 방법을 다루며,
-  여러분의 워크플로우에 가장 적합한 방식을 선택할 수 있도록 안내합니다.
-</Note>
-
-## 사전 준비 사항
-
-<CardGroup cols={2}>
-  <Card title="배포 준비가 된 Crew" icon="users">
-    작동 중인 crew가 로컬에서 빌드되었거나 Crew Studio를 통해 생성되어 있어야
-    합니다.
-  </Card>
-  <Card title="GitHub 저장소" icon="github">
-    crew 코드가 GitHub 저장소에 있어야 합니다(GitHub 연동 방식의 경우).
-  </Card>
-</CardGroup>
-
-## 옵션 1: CrewAI CLI를 사용한 배포
-
-CLI는 로컬에서 개발된 crew를 Enterprise 플랫폼에 가장 빠르게 배포할 수 있는 방법을 제공합니다.
-
-<Steps>
-  <Step title="CrewAI CLI 설치">
-    아직 설치하지 않았다면 CrewAI CLI를 설치하세요:
-
-    ```bash
-    pip install crewai[tools]
-    ```
-
-    <Tip>
-    CLI는 기본 CrewAI 패키지에 포함되어 있지만, `[tools]` 추가 옵션을 사용하면 모든 배포 종속성을 함께 설치할 수 있습니다.
-    </Tip>
-
-  </Step>
-
-  <Step title="Enterprise 플랫폼에 인증">
-    먼저, CrewAI AMP 플랫폼에 CLI를 인증해야 합니다:
-
-    ```bash
-    # 이미 CrewAI AMP 계정이 있거나 새로 생성하고 싶을 때:
-    crewai login
-    ```
-
-    위 명령어를 실행하면 CLI가 다음을 진행합니다:
-    1. URL과 고유 기기 코드를 표시합니다
-    2. 브라우저를 열어 인증 페이지로 이동합니다
-    3. 기기 확인을 요청합니다
-    4. 인증 과정을 완료합니다
-
-    인증이 성공적으로 완료되면 터미널에 확인 메시지가 표시됩니다!
-
-  </Step>
-
-  <Step title="배포 생성">
-
-    프로젝트 디렉터리에서 다음 명령어를 실행하세요:
-
-    ```bash
-    crewai deploy create
-    ```
-
-    이 명령어는 다음을 수행합니다:
-    1. GitHub 저장소 정보를 감지합니다
-    2. 로컬 `.env` 파일의 환경 변수를 식별합니다
-    3. 이러한 변수를 Enterprise 플랫폼으로 안전하게 전송합니다
-    4. 고유 식별자가 부여된 새 배포를 만듭니다
-
-    성공적으로 생성되면 다음과 같은 메시지가 표시됩니다:
-    ```shell
-    Deployment created successfully!
-    Name: your_project_name
-    Deployment ID: 01234567-89ab-cdef-0123-456789abcdef
-    Current Status: Deploy Enqueued
-    ```
-
-  </Step>
-
-  <Step title="배포 진행 상황 모니터링">
-
-    다음 명령어로 배포 상태를 추적할 수 있습니다:
-
-    ```bash
-    crewai deploy status
-    ```
-
-    빌드 과정의 상세 로그가 필요하다면:
-
-    ```bash
-    crewai deploy logs
-    ```
-
-    <Tip>
-    첫 배포는 컨테이너 이미지를 빌드하므로 일반적으로 10~15분 정도 소요됩니다. 이후 배포는 훨씬 빠릅니다.
-    </Tip>
-
-  </Step>
-</Steps>
-
-## 추가 CLI 명령어
-
-CrewAI CLI는 배포를 관리하기 위한 여러 명령어를 제공합니다:
-
-```bash
-# 모든 배포 목록 확인
-crewai deploy list
-
-# 배포 상태 확인
-crewai deploy status
-
-# 배포 로그 보기
-crewai deploy logs
-
-# 코드 변경 후 업데이트 푸시
-crewai deploy push
-
-# 배포 삭제
-crewai deploy remove <deployment_id>
-```
-
-## 옵션 2: 웹 인터페이스를 통한 직접 배포
-
-GitHub 계정을 연결하여 CrewAI AMP 웹 인터페이스를 통해 crews를 직접 배포할 수도 있습니다. 이 방법은 로컬 머신에서 CLI를 사용할 필요가 없습니다.
-
-<Steps>
-
-  <Step title="GitHub로 푸시하기">
-
-crew를 GitHub 저장소에 푸시해야 합니다. 아직 crew를 만들지 않았다면, [이 튜토리얼](/ko/quickstart)을 따라할 수 있습니다.
-
-  </Step>
-
-  <Step title="GitHub를 CrewAI AOP에 연결하기">
-
-    1. [CrewAI AMP](https://app.crewai.com)에 로그인합니다.
-    2. "Connect GitHub" 버튼을 클릭합니다.
-
-    <Frame>
-      ![Connect GitHub Button](/images/enterprise/connect-github.png)
-    </Frame>
-
-  </Step>
-
-  <Step title="저장소 선택하기">
-
-    GitHub 계정을 연결한 후 배포할 저장소를 선택할 수 있습니다:
-
-    <Frame>
-      ![Select Repository](/images/enterprise/select-repo.png)
-    </Frame>
-
-  </Step>
-
-  <Step title="환경 변수 설정하기">
-
-    배포 전에, LLM 제공업체 또는 기타 서비스에 연결할 환경 변수를 설정해야 합니다:
-
-    1. 변수를 개별적으로 또는 일괄적으로 추가할 수 있습니다.
-    2. 환경 변수는 `KEY=VALUE` 형식(한 줄에 하나씩)으로 입력합니다.
-
-    <Frame>
-      ![Set Environment Variables](/images/enterprise/set-env-variables.png)
-    </Frame>
-
-  </Step>
-
-  <Step title="Crew 배포하기">
-
-    1. "Deploy" 버튼을 클릭하여 배포 프로세스를 시작합니다.
-    2. 진행 바를 통해 진행 상황을 모니터링할 수 있습니다.
-    3. 첫 번째 배포에는 일반적으로 약 10-15분 정도 소요되며, 이후 배포는 더 빠릅니다.
-
-    <Frame>
-      ![Deploy Progress](/images/enterprise/deploy-progress.png)
-    </Frame>
-
-    배포가 완료되면 다음을 확인할 수 있습니다:
-    - crew의 고유 URL
-    - crew API를 보호할 Bearer 토큰
-    - 배포를 삭제해야 하는 경우 "Delete" 버튼
-
-  </Step>
-
-</Steps>
-
-## ⚠️ 환경 변수 보안 요구사항
-
-<Warning>
-  **중요**: CrewAI AOP는 환경 변수 이름에 대한 보안 제한이 있으며, 이를 따르지
-  않을 경우 배포가 실패할 수 있습니다.
-</Warning>
-
-### 차단된 환경 변수 패턴
-
-보안상의 이유로, 다음과 같은 환경 변수 명명 패턴은 **자동으로 필터링**되며 배포에 문제가 발생할 수 있습니다:
-
-**차단된 패턴:**
-
-- `_TOKEN`으로 끝나는 변수 (예: `MY_API_TOKEN`)
-- `_PASSWORD`로 끝나는 변수 (예: `DB_PASSWORD`)
-- `_SECRET`로 끝나는 변수 (예: `API_SECRET`)
-- 특정 상황에서 `_KEY`로 끝나는 변수
-
-**특정 차단 변수:**
-
-- `GITHUB_USER`, `GITHUB_TOKEN`
-- `AWS_REGION`, `AWS_DEFAULT_REGION`
-- 다양한 내부 CrewAI 시스템 변수
-
-### 허용된 예외
-
-일부 변수는 차단된 패턴과 일치하더라도 명시적으로 허용됩니다:
-
-- `AZURE_AD_TOKEN`
-- `AZURE_OPENAI_AD_TOKEN`
-- `ENTERPRISE_ACTION_TOKEN`
-- `CREWAI_ENTEPRISE_TOOLS_TOKEN`
-
-### 네이밍 문제 해결 방법
-
-환경 변수 제한으로 인해 배포가 실패하는 경우:
-
-```bash
-# ❌ 이러한 이름은 배포 실패를 초래합니다
-OPENAI_TOKEN=sk-...
-DATABASE_PASSWORD=mypassword
-API_SECRET=secret123
-
-# ✅ 대신 다음과 같은 네이밍 패턴을 사용하세요
-OPENAI_API_KEY=sk-...
-DATABASE_CREDENTIALS=mypassword
-API_CONFIG=secret123
-```
-
-### 모범 사례
-
-1. **표준 명명 규칙 사용**: `PROVIDER_TOKEN` 대신 `PROVIDER_API_KEY` 사용
-2. **먼저 로컬에서 테스트**: crew가 이름이 변경된 변수로 제대로 동작하는지 확인
-3. **코드 업데이트**: 이전 변수 이름을 참조하는 부분을 모두 변경
-4. **변경 내용 문서화**: 팀을 위해 이름이 변경된 변수를 기록
-
-<Tip>
-  배포 실패 시, 환경 변수 에러 메시지가 난해하다면 먼저 변수 이름이 이 패턴을
-  따르는지 확인하세요.
-</Tip>
-
-### 배포된 Crew와 상호작용하기
-
-배포가 완료되면 다음을 통해 crew에 접근할 수 있습니다:
-
-1. **REST API**: 플랫폼에서 아래의 주요 경로가 포함된 고유한 HTTPS 엔드포인트를 생성합니다:
-
-   - `/inputs`: 필요한 입력 파라미터 목록
-   - `/kickoff`: 제공된 입력값으로 실행 시작
-   - `/status/{kickoff_id}`: 실행 상태 확인
-
-2. **웹 인터페이스**: [app.crewai.com](https://app.crewai.com)에 방문하여 다음을 확인할 수 있습니다:
-   - **Status 탭**: 배포 정보, API 엔드포인트 세부 정보 및 인증 토큰 확인
-   - **Run 탭**: crew 구조의 시각적 표현
-   - **Executions 탭**: 모든 실행 내역
-   - **Metrics 탭**: 성능 분석
-   - **Traces 탭**: 상세 실행 인사이트
-
-### 실행 트리거하기
-
-Enterprise 대시보드에서 다음 작업을 수행할 수 있습니다:
-
-1. crew 이름을 클릭하여 상세 정보를 엽니다
-2. 관리 인터페이스에서 "Trigger Crew"를 선택합니다
-3. 나타나는 모달에 필요한 입력값을 입력합니다
-4. 파이프라인을 따라 실행의 진행 상황을 모니터링합니다
-
-### 모니터링 및 분석
-
-Enterprise 플랫폼은 포괄적인 가시성 기능을 제공합니다:
-
-- **실행 관리**: 활성 및 완료된 실행 추적
-- **트레이스**: 각 실행의 상세 분해
-- **메트릭**: 토큰 사용량, 실행 시간, 비용
-- **타임라인 보기**: 작업 시퀀스의 시각적 표현
-
-### 고급 기능
-
-Enterprise 플랫폼은 또한 다음을 제공합니다:
-
-- **환경 변수 관리**: API 키를 안전하게 저장 및 관리
-- **LLM 연결**: 다양한 LLM 공급자와의 통합 구성
-- **Custom Tools Repository**: 도구 생성, 공유 및 설치
-- **Crew Studio**: 코드를 작성하지 않고 채팅 인터페이스를 통해 crew 빌드
-
-<Card
-  title="도움이 필요하신가요?"
-  icon="headset"
-  href="mailto:support@crewai.com"
->
-  Enterprise 플랫폼의 배포 문제 또는 문의 사항이 있으시면 지원팀에 연락해
-  주십시오.
-</Card>

docs/ko/enterprise/guides/deploy-to-amp.mdx

@@ -0,0 +1,438 @@
+---
+title: "AMP에 배포하기"
+description: "Crew 또는 Flow를 CrewAI AMP에 배포하기"
+icon: "rocket"
+mode: "wide"
+---
+
+<Note>
+  로컬에서 또는 Crew Studio를 통해 Crew나 Flow를 생성한 후, 다음 단계는 이를 CrewAI AMP
+  플랫폼에 배포하는 것입니다. 본 가이드에서는 다양한 배포 방법을 다루며,
+  여러분의 워크플로우에 가장 적합한 방식을 선택할 수 있도록 안내합니다.
+</Note>
+
+## 사전 준비 사항
+
+<CardGroup cols={2}>
+  <Card title="배포 준비가 완료된 프로젝트" icon="check-circle">
+    로컬에서 성공적으로 실행되는 Crew 또는 Flow가 있어야 합니다.
+    [배포 준비 가이드](/ko/enterprise/guides/prepare-for-deployment)를 따라 프로젝트 구조를 확인하세요.
+  </Card>
+  <Card title="GitHub 저장소" icon="github">
+    코드가 GitHub 저장소에 있어야 합니다(GitHub 연동 방식의 경우).
+  </Card>
+</CardGroup>
+
+<Info>
+  **Crews vs Flows**: 두 프로젝트 유형 모두 CrewAI AMP에서 "자동화"로 배포할 수 있습니다.
+  배포 과정은 동일하지만, 프로젝트 구조가 다릅니다.
+  자세한 내용은 [배포 준비하기](/ko/enterprise/guides/prepare-for-deployment)를 참조하세요.
+</Info>
+
+## 옵션 1: CrewAI CLI를 사용한 배포
+
+CLI는 로컬에서 개발된 Crew 또는 Flow를 AMP 플랫폼에 가장 빠르게 배포할 수 있는 방법을 제공합니다.
+CLI는 `pyproject.toml`에서 프로젝트 유형을 자동으로 감지하고 그에 맞게 빌드합니다.
+
+<Steps>
+  <Step title="CrewAI CLI 설치">
+    아직 설치하지 않았다면 CrewAI CLI를 설치하세요:
+
+    ```bash
+    pip install crewai[tools]
+    ```
+
+    <Tip>
+    CLI는 기본 CrewAI 패키지에 포함되어 있지만, `[tools]` 추가 옵션을 사용하면 모든 배포 종속성을 함께 설치할 수 있습니다.
+    </Tip>
+
+  </Step>
+
+  <Step title="Enterprise 플랫폼에 인증">
+    먼저, CrewAI AMP 플랫폼에 CLI를 인증해야 합니다:
+
+    ```bash
+    # 이미 CrewAI AMP 계정이 있거나 새로 생성하고 싶을 때:
+    crewai login
+    ```
+
+    위 명령어를 실행하면 CLI가 다음을 진행합니다:
+    1. URL과 고유 기기 코드를 표시합니다
+    2. 브라우저를 열어 인증 페이지로 이동합니다
+    3. 기기 확인을 요청합니다
+    4. 인증 과정을 완료합니다
+
+    인증이 성공적으로 완료되면 터미널에 확인 메시지가 표시됩니다!
+
+  </Step>
+
+  <Step title="배포 생성">
+
+    프로젝트 디렉터리에서 다음 명령어를 실행하세요:
+
+    ```bash
+    crewai deploy create
+    ```
+
+    이 명령어는 다음을 수행합니다:
+    1. GitHub 저장소 정보를 감지합니다
+    2. 로컬 `.env` 파일의 환경 변수를 식별합니다
+    3. 이러한 변수를 Enterprise 플랫폼으로 안전하게 전송합니다
+    4. 고유 식별자가 부여된 새 배포를 만듭니다
+
+    성공적으로 생성되면 다음과 같은 메시지가 표시됩니다:
+    ```shell
+    Deployment created successfully!
+    Name: your_project_name
+    Deployment ID: 01234567-89ab-cdef-0123-456789abcdef
+    Current Status: Deploy Enqueued
+    ```
+
+  </Step>
+
+  <Step title="배포 진행 상황 모니터링">
+
+    다음 명령어로 배포 상태를 추적할 수 있습니다:
+
+    ```bash
+    crewai deploy status
+    ```
+
+    빌드 과정의 상세 로그가 필요하다면:
+
+    ```bash
+    crewai deploy logs
+    ```
+
+    <Tip>
+    첫 배포는 컨테이너 이미지를 빌드하므로 일반적으로 10~15분 정도 소요됩니다. 이후 배포는 훨씬 빠릅니다.
+    </Tip>
+
+  </Step>
+</Steps>
+
+## 추가 CLI 명령어
+
+CrewAI CLI는 배포를 관리하기 위한 여러 명령어를 제공합니다:
+
+```bash
+# 모든 배포 목록 확인
+crewai deploy list
+
+# 배포 상태 확인
+crewai deploy status
+
+# 배포 로그 보기
+crewai deploy logs
+
+# 코드 변경 후 업데이트 푸시
+crewai deploy push
+
+# 배포 삭제
+crewai deploy remove <deployment_id>
+```
+
+## 옵션 2: 웹 인터페이스를 통한 직접 배포
+
+GitHub 계정을 연결하여 CrewAI AMP 웹 인터페이스를 통해 Crew 또는 Flow를 직접 배포할 수도 있습니다. 이 방법은 로컬 머신에서 CLI를 사용할 필요가 없습니다. 플랫폼은 자동으로 프로젝트 유형을 감지하고 적절하게 빌드를 처리합니다.
+
+<Steps>
+
+  <Step title="GitHub로 푸시하기">
+
+Crew를 GitHub 저장소에 푸시해야 합니다. 아직 Crew를 만들지 않았다면, [이 튜토리얼](/ko/quickstart)을 따라할 수 있습니다.
+
+  </Step>
+
+  <Step title="GitHub를 CrewAI AMP에 연결하기">
+
+    1. [CrewAI AMP](https://app.crewai.com)에 로그인합니다.
+    2. "Connect GitHub" 버튼을 클릭합니다.
+
+    <Frame>
+      ![Connect GitHub Button](/images/enterprise/connect-github.png)
+    </Frame>
+
+  </Step>
+
+  <Step title="저장소 선택하기">
+
+    GitHub 계정을 연결한 후 배포할 저장소를 선택할 수 있습니다:
+
+    <Frame>
+      ![Select Repository](/images/enterprise/select-repo.png)
+    </Frame>
+
+  </Step>
+
+  <Step title="환경 변수 설정하기">
+
+    배포 전에, LLM 제공업체 또는 기타 서비스에 연결할 환경 변수를 설정해야 합니다:
+
+    1. 변수를 개별적으로 또는 일괄적으로 추가할 수 있습니다.
+    2. 환경 변수는 `KEY=VALUE` 형식(한 줄에 하나씩)으로 입력합니다.
+
+    <Frame>
+      ![Set Environment Variables](/images/enterprise/set-env-variables.png)
+    </Frame>
+
+  </Step>
+
+  <Step title="Crew 배포하기">
+
+    1. "Deploy" 버튼을 클릭하여 배포 프로세스를 시작합니다.
+    2. 진행 바를 통해 진행 상황을 모니터링할 수 있습니다.
+    3. 첫 번째 배포에는 일반적으로 약 10-15분 정도 소요되며, 이후 배포는 더 빠릅니다.
+
+    <Frame>
+      ![Deploy Progress](/images/enterprise/deploy-progress.png)
+    </Frame>
+
+    배포가 완료되면 다음을 확인할 수 있습니다:
+    - Crew의 고유 URL
+    - Crew API를 보호할 Bearer 토큰
+    - 배포를 삭제해야 하는 경우 "Delete" 버튼
+
+  </Step>
+
+</Steps>
+
+## 옵션 3: API를 통한 재배포 (CI/CD 통합)
+
+CI/CD 파이프라인에서 자동화된 배포를 위해 CrewAI API를 사용하여 기존 crew의 재배포를 트리거할 수 있습니다. 이 방법은 GitHub Actions, Jenkins 또는 기타 자동화 워크플로우에 특히 유용합니다.
+
+<Steps>
+  <Step title="개인 액세스 토큰 발급">
+
+    CrewAI AMP 계정 설정에서 API 토큰을 생성합니다:
+
+    1. [app.crewai.com](https://app.crewai.com)으로 이동합니다
+    2. **Settings** → **Account** → **Personal Access Token**을 클릭합니다
+    3. 새 토큰을 생성하고 안전하게 복사합니다
+    4. 이 토큰을 CI/CD 시스템의 시크릿으로 저장합니다
+
+  </Step>
+
+  <Step title="Automation UUID 찾기">
+
+    배포된 crew의 고유 식별자를 찾습니다:
+
+    1. CrewAI AMP 대시보드에서 **Automations**로 이동합니다
+    2. 기존 automation/crew를 선택합니다
+    3. **Additional Details**를 클릭합니다
+    4. **UUID**를 복사합니다 - 이것이 특정 crew 배포를 식별합니다
+
+  </Step>
+
+  <Step title="API를 통한 재배포 트리거">
+
+    Deploy API 엔드포인트를 사용하여 재배포를 트리거합니다:
+
+    ```bash
+    curl -i -X POST \
+         -H "Authorization: Bearer YOUR_PERSONAL_ACCESS_TOKEN" \
+         https://app.crewai.com/crewai_plus/api/v1/crews/YOUR-AUTOMATION-UUID/deploy
+
+    # HTTP/2 200
+    # content-type: application/json
+    #
+    # {
+    #   "uuid": "your-automation-uuid",
+    #   "status": "Deploy Enqueued",
+    #   "public_url": "https://your-crew-deployment.crewai.com",
+    #   "token": "your-bearer-token"
+    # }
+    ```
+
+    <Info>
+    Git에 연결되어 처음 생성된 automation의 경우, API가 재배포 전에 자동으로 저장소에서 최신 변경 사항을 가져옵니다.
+    </Info>
+
+  </Step>
+
+  <Step title="GitHub Actions 통합 예시">
+
+    더 복잡한 배포 트리거가 있는 GitHub Actions 워크플로우 예시입니다:
+
+    ```yaml
+    name: Deploy CrewAI Automation
+
+    on:
+      push:
+        branches: [ main ]
+      pull_request:
+        types: [ labeled ]
+      release:
+        types: [ published ]
+
+    jobs:
+      deploy:
+        runs-on: ubuntu-latest
+        if: |
+          (github.event_name == 'push' && github.ref == 'refs/heads/main') ||
+          (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'deploy')) ||
+          (github.event_name == 'release')
+        steps:
+          - name: Trigger CrewAI Redeployment
+            run: |
+              curl -X POST \
+                   -H "Authorization: Bearer ${{ secrets.CREWAI_PAT }}" \
+                   https://app.crewai.com/crewai_plus/api/v1/crews/${{ secrets.CREWAI_AUTOMATION_UUID }}/deploy
+    ```
+
+    <Tip>
+    `CREWAI_PAT`와 `CREWAI_AUTOMATION_UUID`를 저장소 시크릿으로 추가하세요. PR 배포의 경우 "deploy" 라벨을 추가하여 워크플로우를 트리거합니다.
+    </Tip>
+
+    </Step>
+
+  </Steps>
+
+## 배포된 Automation과 상호작용하기
+
+배포가 완료되면 다음을 통해 crew에 접근할 수 있습니다:
+
+1. **REST API**: 플랫폼에서 아래의 주요 경로가 포함된 고유한 HTTPS 엔드포인트를 생성합니다:
+
+   - `/inputs`: 필요한 입력 파라미터 목록
+   - `/kickoff`: 제공된 입력값으로 실행 시작
+   - `/status/{kickoff_id}`: 실행 상태 확인
+
+2. **웹 인터페이스**: [app.crewai.com](https://app.crewai.com)에 방문하여 다음을 확인할 수 있습니다:
+   - **Status 탭**: 배포 정보, API 엔드포인트 세부 정보 및 인증 토큰 확인
+   - **Run 탭**: Crew 구조의 시각적 표현
+   - **Executions 탭**: 모든 실행 내역
+   - **Metrics 탭**: 성능 분석
+   - **Traces 탭**: 상세 실행 인사이트
+
+### 실행 트리거하기
+
+Enterprise 대시보드에서 다음 작업을 수행할 수 있습니다:
+
+1. Crew 이름을 클릭하여 상세 정보를 엽니다
+2. 관리 인터페이스에서 "Trigger Crew"를 선택합니다
+3. 나타나는 모달에 필요한 입력값을 입력합니다
+4. 파이프라인을 따라 실행의 진행 상황을 모니터링합니다
+
+### 모니터링 및 분석
+
+Enterprise 플랫폼은 포괄적인 가시성 기능을 제공합니다:
+
+- **실행 관리**: 활성 및 완료된 실행 추적
+- **트레이스**: 각 실행의 상세 분해
+- **메트릭**: 토큰 사용량, 실행 시간, 비용
+- **타임라인 보기**: 작업 시퀀스의 시각적 표현
+
+### 고급 기능
+
+Enterprise 플랫폼은 또한 다음을 제공합니다:
+
+- **환경 변수 관리**: API 키를 안전하게 저장 및 관리
+- **LLM 연결**: 다양한 LLM 공급자와의 통합 구성
+- **Custom Tools Repository**: 도구 생성, 공유 및 설치
+- **Crew Studio**: 코드를 작성하지 않고 채팅 인터페이스를 통해 crew 빌드
+
+## 배포 실패 문제 해결
+
+배포가 실패하면 다음과 같은 일반적인 문제를 확인하세요:
+
+### 빌드 실패
+
+#### uv.lock 파일 누락
+
+**증상**: 의존성 해결 오류와 함께 빌드 초기에 실패
+
+**해결책**: lock 파일을 생성하고 커밋합니다:
+
+```bash
+uv lock
+git add uv.lock
+git commit -m "Add uv.lock for deployment"
+git push
+```
+
+<Warning>
+  `uv.lock` 파일은 모든 배포에 필수입니다. 이 파일이 없으면 플랫폼에서
+  의존성을 안정적으로 설치할 수 없습니다.
+</Warning>
+
+#### 잘못된 프로젝트 구조
+
+**증상**: "Could not find entry point" 또는 "Module not found" 오류
+
+**해결책**: 프로젝트가 예상 구조와 일치하는지 확인합니다:
+
+- **Crews와 Flows 모두**: 진입점이 `src/project_name/main.py`에 있어야 합니다
+- **Crews**: 진입점으로 `run()` 함수 사용
+- **Flows**: 진입점으로 `kickoff()` 함수 사용
+
+자세한 구조 다이어그램은 [배포 준비하기](/ko/enterprise/guides/prepare-for-deployment)를 참조하세요.
+
+#### CrewBase 데코레이터 누락
+
+**증상**: "Crew not found", "Config not found" 또는 agent/task 구성 오류
+
+**해결책**: **모든** crew 클래스가 `@CrewBase` 데코레이터를 사용하는지 확인합니다:
+
+```python
+from crewai.project import CrewBase, agent, crew, task
+
+@CrewBase  # 이 데코레이터는 필수입니다
+class YourCrew():
+    """Crew 설명"""
+
+    @agent
+    def my_agent(self) -> Agent:
+        return Agent(
+            config=self.agents_config['my_agent'],  # type: ignore[index]
+            verbose=True
+        )
+
+    # ... 나머지 crew 정의
+```
+
+<Info>
+  이것은 독립 실행형 Crews와 Flow 프로젝트 내에 포함된 crews 모두에 적용됩니다.
+  모든 crew 클래스에 데코레이터가 필요합니다.
+</Info>
+
+#### 잘못된 pyproject.toml 타입
+
+**증상**: 빌드는 성공하지만 런타임에서 실패하거나 예상치 못한 동작
+
+**해결책**: `[tool.crewai]` 섹션이 프로젝트 유형과 일치하는지 확인합니다:
+
+```toml
+# Crew 프로젝트의 경우:
+[tool.crewai]
+type = "crew"
+
+# Flow 프로젝트의 경우:
+[tool.crewai]
+type = "flow"
+```
+
+### 런타임 실패
+
+#### LLM 연결 실패
+
+**증상**: API 키 오류, "model not found" 또는 인증 실패
+
+**해결책**:
+1. LLM 제공업체의 API 키가 환경 변수에 올바르게 설정되어 있는지 확인합니다
+2. 환경 변수 이름이 코드에서 예상하는 것과 일치하는지 확인합니다
+3. 배포 전에 동일한 환경 변수로 로컬에서 테스트합니다
+
+#### Crew 실행 오류
+
+**증상**: Crew가 시작되지만 실행 중에 실패
+
+**해결책**:
+1. AMP 대시보드에서 실행 로그를 확인합니다 (Traces 탭)
+2. 모든 도구에 필요한 API 키가 구성되어 있는지 확인합니다
+3. `agents.yaml`의 agent 구성이 유효한지 확인합니다
+4. `tasks.yaml`의 task 구성에 구문 오류가 없는지 확인합니다
+
+<Card title="도움이 필요하신가요?" icon="headset" href="mailto:support@crewai.com">
+  배포 문제 또는 AMP 플랫폼에 대한 문의 사항이 있으시면 지원팀에 연락해 주세요.
+</Card>

docs/ko/enterprise/guides/prepare-for-deployment.mdx

@@ -0,0 +1,305 @@
+---
+title: "배포 준비하기"
+description: "Crew 또는 Flow가 CrewAI AMP에 배포될 준비가 되었는지 확인하기"
+icon: "clipboard-check"
+mode: "wide"
+---
+
+<Note>
+  CrewAI AMP에 배포하기 전에, 프로젝트가 올바르게 구성되어 있는지 확인하는 것이 중요합니다.
+  Crews와 Flows 모두 "자동화"로 배포할 수 있지만, 성공적인 배포를 위해 충족해야 하는
+  서로 다른 프로젝트 구조와 요구 사항이 있습니다.
+</Note>
+
+## 자동화 이해하기
+
+CrewAI AMP에서 **자동화(automations)**는 배포 가능한 Agentic AI 프로젝트의 총칭입니다. 자동화는 다음 중 하나일 수 있습니다:
+
+- **Crew**: 작업을 함께 수행하는 AI 에이전트들의 독립 실행형 팀
+- **Flow**: 여러 crew, 직접 LLM 호출 및 절차적 로직을 결합할 수 있는 오케스트레이션된 워크플로우
+
+배포하는 유형을 이해하는 것은 프로젝트 구조와 진입점이 다르기 때문에 필수적입니다.
+
+## Crews vs Flows: 주요 차이점
+
+<CardGroup cols={2}>
+  <Card title="Crew 프로젝트" icon="users">
+    에이전트와 작업을 정의하는 `crew.py`가 있는 독립 실행형 AI 에이전트 팀. 집중적이고 협업적인 작업에 적합합니다.
+  </Card>
+  <Card title="Flow 프로젝트" icon="diagram-project">
+    `crews/` 폴더에 포함된 crew가 있는 오케스트레이션된 워크플로우. 복잡한 다단계 프로세스에 적합합니다.
+  </Card>
+</CardGroup>
+
+| 측면 | Crew | Flow |
+|------|------|------|
+| **프로젝트 구조** | `crew.py`가 있는 `src/project_name/` | `crews/` 폴더가 있는 `src/project_name/` |
+| **메인 로직 위치** | `src/project_name/crew.py` | `src/project_name/main.py` (Flow 클래스) |
+| **진입점 함수** | `main.py`의 `run()` | `main.py`의 `kickoff()` |
+| **pyproject.toml 타입** | `type = "crew"` | `type = "flow"` |
+| **CLI 생성 명령어** | `crewai create crew name` | `crewai create flow name` |
+| **설정 위치** | `src/project_name/config/` | `src/project_name/crews/crew_name/config/` |
+| **다른 crew 포함 가능** | 아니오 | 예 (`crews/` 폴더 내) |
+
+## 프로젝트 구조 참조
+
+### Crew 프로젝트 구조
+
+`crewai create crew my_crew`를 실행하면 다음 구조를 얻습니다:
+
+```
+my_crew/
+├── .gitignore
+├── pyproject.toml          # type = "crew"여야 함
+├── README.md
+├── .env
+├── uv.lock                  # 배포에 필수
+└── src/
+    └── my_crew/
+        ├── __init__.py
+        ├── main.py          # run() 함수가 있는 진입점
+        ├── crew.py          # @CrewBase 데코레이터가 있는 Crew 클래스
+        ├── tools/
+        │   ├── custom_tool.py
+        │   └── __init__.py
+        └── config/
+            ├── agents.yaml  # 에이전트 정의
+            └── tasks.yaml   # 작업 정의
+```
+
+<Warning>
+  중첩된 `src/project_name/` 구조는 Crews에 매우 중요합니다.
+  잘못된 레벨에 파일을 배치하면 배포 실패의 원인이 됩니다.
+</Warning>
+
+### Flow 프로젝트 구조
+
+`crewai create flow my_flow`를 실행하면 다음 구조를 얻습니다:
+
+```
+my_flow/
+├── .gitignore
+├── pyproject.toml          # type = "flow"여야 함
+├── README.md
+├── .env
+├── uv.lock                  # 배포에 필수
+└── src/
+    └── my_flow/
+        ├── __init__.py
+        ├── main.py          # kickoff() 함수 + Flow 클래스가 있는 진입점
+        ├── crews/           # 포함된 crews 폴더
+        │   └── poem_crew/
+        │       ├── __init__.py
+        │       ├── poem_crew.py  # @CrewBase 데코레이터가 있는 Crew
+        │       └── config/
+        │           ├── agents.yaml
+        │           └── tasks.yaml
+        └── tools/
+            ├── __init__.py
+            └── custom_tool.py
+```
+
+<Info>
+  Crews와 Flows 모두 `src/project_name/` 구조를 사용합니다.
+  핵심 차이점은 Flows는 포함된 crews를 위한 `crews/` 폴더가 있고,
+  Crews는 프로젝트 폴더에 직접 `crew.py`가 있다는 것입니다.
+</Info>
+
+## 배포 전 체크리스트
+
+이 체크리스트를 사용하여 프로젝트가 배포 준비가 되었는지 확인하세요.
+
+### 1. pyproject.toml 설정 확인
+
+`pyproject.toml`에 올바른 `[tool.crewai]` 섹션이 포함되어야 합니다:
+
+<Tabs>
+  <Tab title="Crews의 경우">
+    ```toml
+    [tool.crewai]
+    type = "crew"
+    ```
+  </Tab>
+  <Tab title="Flows의 경우">
+    ```toml
+    [tool.crewai]
+    type = "flow"
+    ```
+  </Tab>
+</Tabs>
+
+<Warning>
+  `type`이 프로젝트 구조와 일치하지 않으면 빌드가 실패하거나
+  자동화가 올바르게 실행되지 않습니다.
+</Warning>
+
+### 2. uv.lock 파일 존재 확인
+
+CrewAI는 의존성 관리를 위해 `uv`를 사용합니다. `uv.lock` 파일은 재현 가능한 빌드를 보장하며 배포에 **필수**입니다.
+
+```bash
+# lock 파일 생성 또는 업데이트
+uv lock
+
+# 존재 여부 확인
+ls -la uv.lock
+```
+
+파일이 존재하지 않으면 `uv lock`을 실행하고 저장소에 커밋하세요:
+
+```bash
+uv lock
+git add uv.lock
+git commit -m "Add uv.lock for deployment"
+git push
+```
+
+### 3. CrewBase 데코레이터 사용 확인
+
+**모든 crew 클래스는 `@CrewBase` 데코레이터를 사용해야 합니다.** 이것은 다음에 적용됩니다:
+
+- 독립 실행형 crew 프로젝트
+- Flow 프로젝트 내에 포함된 crews
+
+```python
+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
+
+@CrewBase  # 이 데코레이터는 필수입니다
+class MyCrew():
+    """내 crew 설명"""
+
+    agents: List[BaseAgent]
+    tasks: List[Task]
+
+    @agent
+    def my_agent(self) -> Agent:
+        return Agent(
+            config=self.agents_config['my_agent'],  # type: ignore[index]
+            verbose=True
+        )
+
+    @task
+    def my_task(self) -> Task:
+        return Task(
+            config=self.tasks_config['my_task']  # type: ignore[index]
+        )
+
+    @crew
+    def crew(self) -> Crew:
+        return Crew(
+            agents=self.agents,
+            tasks=self.tasks,
+            process=Process.sequential,
+            verbose=True,
+        )
+```
+
+<Warning>
+  `@CrewBase` 데코레이터를 잊으면 에이전트나 작업 구성이 누락되었다는
+  오류와 함께 배포가 실패합니다.
+</Warning>
+
+### 4. 프로젝트 진입점 확인
+
+Crews와 Flows 모두 `src/project_name/main.py`에 진입점이 있습니다:
+
+<Tabs>
+  <Tab title="Crews의 경우">
+    진입점은 `run()` 함수를 사용합니다:
+
+    ```python
+    # src/my_crew/main.py
+    from my_crew.crew import MyCrew
+
+    def run():
+        """crew를 실행합니다."""
+        inputs = {'topic': 'AI in Healthcare'}
+        result = MyCrew().crew().kickoff(inputs=inputs)
+        return result
+
+    if __name__ == "__main__":
+        run()
+    ```
+  </Tab>
+  <Tab title="Flows의 경우">
+    진입점은 Flow 클래스와 함께 `kickoff()` 함수를 사용합니다:
+
+    ```python
+    # src/my_flow/main.py
+    from crewai.flow import Flow, listen, start
+    from my_flow.crews.poem_crew.poem_crew import PoemCrew
+
+    class MyFlow(Flow):
+        @start()
+        def begin(self):
+            # Flow 로직
+            result = PoemCrew().crew().kickoff(inputs={...})
+            return result
+
+    def kickoff():
+        """flow를 실행합니다."""
+        MyFlow().kickoff()
+
+    if __name__ == "__main__":
+        kickoff()
+    ```
+  </Tab>
+</Tabs>
+
+### 5. 환경 변수 준비
+
+배포 전에 다음을 준비해야 합니다:
+
+1. **LLM API 키** (OpenAI, Anthropic, Google 등)
+2. **도구 API 키** - 외부 도구를 사용하는 경우 (Serper 등)
+
+<Tip>
+  구성 문제를 조기에 발견하기 위해 배포 전에 동일한 환경 변수로
+  로컬에서 프로젝트를 테스트하세요.
+</Tip>
+
+## 빠른 검증 명령어
+
+프로젝트 루트에서 다음 명령어를 실행하여 설정을 빠르게 확인하세요:
+
+```bash
+# 1. pyproject.toml에서 프로젝트 타입 확인
+grep -A2 "\[tool.crewai\]" pyproject.toml
+
+# 2. uv.lock 존재 확인
+ls -la uv.lock || echo "오류: uv.lock이 없습니다! 'uv lock'을 실행하세요"
+
+# 3. src/ 구조 존재 확인
+ls -la src/*/main.py 2>/dev/null || echo "src/에서 main.py를 찾을 수 없습니다"
+
+# 4. Crews의 경우 - crew.py 존재 확인
+ls -la src/*/crew.py 2>/dev/null || echo "crew.py가 없습니다 (Crews에서 예상됨)"
+
+# 5. Flows의 경우 - crews/ 폴더 존재 확인
+ls -la src/*/crews/ 2>/dev/null || echo "crews/ 폴더가 없습니다 (Flows에서 예상됨)"
+
+# 6. CrewBase 사용 확인
+grep -r "@CrewBase" . --include="*.py"
+```
+
+## 일반적인 설정 실수
+
+| 실수 | 증상 | 해결 방법 |
+|------|------|----------|
+| `uv.lock` 누락 | 의존성 해결 중 빌드 실패 | `uv lock` 실행 후 커밋 |
+| pyproject.toml의 잘못된 `type` | 빌드 성공하지만 런타임 실패 | 올바른 타입으로 변경 |
+| `@CrewBase` 데코레이터 누락 | "Config not found" 오류 | 모든 crew 클래스에 데코레이터 추가 |
+| `src/` 대신 루트에 파일 배치 | 진입점을 찾을 수 없음 | `src/project_name/`으로 이동 |
+| `run()` 또는 `kickoff()` 누락 | 자동화를 시작할 수 없음 | 올바른 진입 함수 추가 |
+
+## 다음 단계
+
+프로젝트가 모든 체크리스트 항목을 통과하면 배포할 준비가 된 것입니다:
+
+<Card title="AMP에 배포하기" icon="rocket" href="/ko/enterprise/guides/deploy-to-amp">
+  CLI, 웹 인터페이스 또는 CI/CD 통합을 사용하여 Crew 또는 Flow를 CrewAI AMP에
+  배포하려면 배포 가이드를 따르세요.
+</Card>

docs/ko/enterprise/introduction.mdx

@@ -79,7 +79,7 @@ CrewAI AOP는 오픈 소스 프레임워크의 강력함에 프로덕션 배포,
     <Card
       title="Crew 배포"
       icon="rocket"
-      href="/ko/enterprise/guides/deploy-crew"
+      href="/ko/enterprise/guides/deploy-to-amp"
     >
       Crew 배포
     </Card>
@@ -96,4 +96,4 @@ CrewAI AOP는 오픈 소스 프레임워크의 강력함에 프로덕션 배포,
   </Step>
 </Steps>
 
-자세한 안내를 원하시면 [배포 가이드](/ko/enterprise/guides/deploy-crew)를 확인하거나 아래 버튼을 클릭해 시작하세요.
+자세한 안내를 원하시면 [배포 가이드](/ko/enterprise/guides/deploy-to-amp)를 확인하거나 아래 버튼을 클릭해 시작하세요.

docs/ko/observability/galileo.mdx

@@ -0,0 +1,115 @@
+---
+title: Galileo 갈릴레오
+description: CrewAI 추적 및 평가를 위한 Galileo 통합
+icon: telescope
+mode: "wide"
+---
+
+## 개요
+
+이 가이드는 **Galileo**를 **CrewAI**와 통합하는 방법을 보여줍니다.
+포괄적인 추적 및 평가 엔지니어링을 위한 것입니다.
+이 가이드가 끝나면 CrewAI 에이전트를 추적할 수 있게 됩니다.
+성과를 모니터링하고 행동을 평가합니다.
+Galileo의 강력한 관측 플랫폼.
+
+> **갈릴레오(Galileo)란 무엇인가요?**[Galileo](https://galileo.ai/)는 AI 평가 및 관찰 가능성입니다.
+엔드투엔드 추적, 평가,
+AI 애플리케이션 모니터링. 이를 통해 팀은 실제 사실을 포착할 수 있습니다.
+견고한 가드레일을 만들고 체계적인 실험을 실행하세요.
+내장된 실험 추적 및 성능 분석으로 신뢰성 보장
+AI 수명주기 전반에 걸쳐 투명성과 지속적인 개선을 제공합니다.
+
+## 시작하기
+
+이 튜토리얼은 [CrewAI 빠른 시작](/ko/quickstart.mdx)을 따르며 추가하는 방법을 보여줍니다.
+갈릴레오의 [CrewAIEventListener](https://v2docs.galileo.ai/sdk-api/python/reference/handlers/crewai/handler),
+이벤트 핸들러.
+자세한 내용은 갈릴레오 문서를 참고하세요.
+[CrewAI 애플리케이션에 Galileo 추가](https://v2docs.galileo.ai/how-to-guides/third-party-integrations/add-galileo-to-crewai/add-galileo-to-crewai)
+방법 안내.
+
+> **참고**이 튜토리얼에서는 [CrewAI 빠른 시작](/ko/quickstart.mdx)을 완료했다고 가정합니다.
+완전한 포괄적인 예제를 원한다면 Galileo
+[CrewAI SDK 예제 저장소](https://github.com/rungalileo/sdk-examples/tree/main/python/agent/crew-ai).
+
+### 1단계: 종속성 설치
+
+앱에 필요한 종속성을 설치합니다.
+원하는 방법으로 가상 환경을 생성하고,
+그런 다음 다음을 사용하여 해당 환경 내에 종속성을 설치하십시오.
+선호하는 도구:
+
+```bash
+uv add galileo 
+```
+
+### 2단계: [CrewAI 빠른 시작](/ko/quickstart.mdx)에서 .env 파일에 추가
+
+```bash
+# Your Galileo API key
+GALILEO_API_KEY="your-galileo-api-key"
+
+# Your Galileo project name
+GALILEO_PROJECT="your-galileo-project-name"
+
+# The name of the Log stream you want to use for logging
+GALILEO_LOG_STREAM="your-galileo-log-stream "
+```
+
+### 3단계: Galileo 이벤트 리스너 추가
+
+Galileo로 로깅을 활성화하려면 `CrewAIEventListener`의 인스턴스를 생성해야 합니다.
+다음을 통해 Galileo CrewAI 핸들러 패키지를 가져옵니다.
+main.py 파일 상단에 다음 코드를 추가하세요.
+
+```python
+from galileo.handlers.crewai.handler import CrewAIEventListener
+```
+
+실행 함수 시작 시 이벤트 리스너를 생성합니다.
+
+```python
+def run():
+    # Create the event listener
+    CrewAIEventListener()
+    # The rest of your existing code goes here
+```
+
+리스너 인스턴스를 생성하면 자동으로
+CrewAI에 등록되었습니다.
+
+### 4단계: Crew Agent 실행
+
+CrewAI CLI를 사용하여 Crew Agent를 실행하세요.
+
+```bash
+crewai run
+```
+
+### 5단계: Galileo에서 추적 보기
+
+승무원 에이전트가 완료되면 흔적이 플러시되어 Galileo에 나타납니다.
+
+![Galileo trace view](/images/galileo-trace-veiw.png)
+  
+## 갈릴레오 통합 이해
+
+Galileo는 이벤트 리스너를 등록하여 CrewAI와 통합됩니다.
+승무원 실행 이벤트(예: 에이전트 작업, 도구 호출, 모델 응답)를 캡처합니다.
+관찰 가능성과 평가를 위해 이를 갈릴레오에 전달합니다.
+
+### 이벤트 리스너 이해
+
+`CrewAIEventListener()` 인스턴스를 생성하는 것이 전부입니다.
+CrewAI 실행을 위해 Galileo를 활성화하는 데 필요합니다. 인스턴스화되면 리스너는 다음을 수행합니다.
+
+-CrewAI에 자동으로 등록됩니다.
+-환경 변수에서 Galileo 구성을 읽습니다.
+-모든 실행 데이터를 Galileo 프로젝트 및 다음에서 지정한 로그 스트림에 기록합니다.
+  `GALILEO_PROJECT` 및 `GALILEO_LOG_STREAM`
+
+추가 구성이나 코드 변경이 필요하지 않습니다.
+이 실행의 모든 데이터는 Galileo 프로젝트에 기록되며
+환경 구성에 따라 지정된 로그 스트림
+(예: GALILEO_PROJECT 및 GALILEO_LOG_STREAM)

docs/pt-BR/concepts/llms.mdx

@@ -79,7 +79,7 @@ Existem diferentes locais no código do CrewAI onde você pode especificar o mod
 
     # Configuração avançada com parâmetros detalhados
     llm = LLM(
-        model="openai/gpt-4", 
+        model="openai/gpt-4",
         temperature=0.8,
         max_tokens=150,
         top_p=0.9,
@@ -207,11 +207,20 @@ Nesta seção, você encontrará exemplos detalhados que ajudam a selecionar, co
     Defina sua chave de API no seu arquivo `.env`. Se precisar de uma chave, ou encontrar uma existente, verifique o [AI Studio](https://aistudio.google.com/apikey).
 
     ```toml .env
-    # https://ai.google.dev/gemini-api/docs/api-key
+    # Para API Gemini (uma das seguintes)
+    GOOGLE_API_KEY=<your-api-key>
     GEMINI_API_KEY=<your-api-key>
+
+    # Para Vertex AI Express mode (autenticação por chave de API)
+    GOOGLE_GENAI_USE_VERTEXAI=true
+    GOOGLE_API_KEY=<your-api-key>
+
+    # Para Vertex AI com conta de serviço
+    GOOGLE_CLOUD_PROJECT=<your-project-id>
+    GOOGLE_CLOUD_LOCATION=<location>  # Padrão: us-central1
     ```
 
-    Exemplo de uso em seu projeto CrewAI:
+    **Uso Básico:**
     ```python Code
     from crewai import LLM
 
@@ -221,6 +230,34 @@ Nesta seção, você encontrará exemplos detalhados que ajudam a selecionar, co
     )
     ```
 
+    **Vertex AI Express Mode (Autenticação por Chave de API):**
+
+    O Vertex AI Express mode permite usar o Vertex AI com autenticação simples por chave de API, em vez de credenciais de conta de serviço. Esta é a maneira mais rápida de começar com o Vertex AI.
+
+    Para habilitar o Express mode, defina ambas as variáveis de ambiente no seu arquivo `.env`:
+    ```toml .env
+    GOOGLE_GENAI_USE_VERTEXAI=true
+    GOOGLE_API_KEY=<your-api-key>
+    ```
+
+    Em seguida, use o LLM normalmente:
+    ```python Code
+    from crewai import LLM
+
+    llm = LLM(
+        model="gemini/gemini-2.0-flash",
+        temperature=0.7
+    )
+    ```
+
+    <Info>
+      Para obter uma chave de API do Express mode:
+      - Novos usuários do Google Cloud: Obtenha uma [chave de API do Express mode](https://cloud.google.com/vertex-ai/generative-ai/docs/start/quickstart?usertype=apikey)
+      - Usuários existentes do Google Cloud: Obtenha uma [chave de API do Google Cloud vinculada a uma conta de serviço](https://cloud.google.com/docs/authentication/api-keys)
+
+      Para mais detalhes, consulte a [documentação do Vertex AI Express mode](https://docs.cloud.google.com/vertex-ai/generative-ai/docs/start/quickstart?usertype=apikey).
+    </Info>
+
     ### Modelos Gemini
 
     O Google oferece uma variedade de modelos poderosos otimizados para diferentes casos de uso.
@@ -823,7 +860,7 @@ Saiba como obter o máximo da configuração do seu LLM:
       Lembre-se de monitorar regularmente o uso de tokens e ajustar suas configurações para otimizar custos e desempenho.
     </Info>
   </Accordion>
-  
+
   <Accordion title="Descartar Parâmetros Adicionais">
     O CrewAI usa Litellm internamente para chamadas LLM, permitindo descartar parâmetros adicionais desnecessários para seu caso de uso. Isso pode simplificar seu código e reduzir a complexidade da configuração do LLM.
     Por exemplo, se não precisar enviar o parâmetro <code>stop</code>, basta omiti-lo na chamada do LLM:
@@ -882,4 +919,4 @@ Saiba como obter o máximo da configuração do seu LLM:
     llm = LLM(model="openai/gpt-4o")  # 128K tokens
     ```
   </Tab>
-</Tabs>
+</Tabs>

docs/pt-BR/concepts/production-architecture.mdx

@@ -128,7 +128,7 @@ Ao implantar seu Flow, considere o seguinte:
 ### CrewAI Enterprise
 A maneira mais fácil de implantar seu Flow é usando o CrewAI Enterprise. Ele lida com a infraestrutura, autenticação e monitoramento para você.
 
-Confira o [Guia de Implantação](/pt-BR/enterprise/guides/deploy-crew) para começar.
+Confira o [Guia de Implantação](/pt-BR/enterprise/guides/deploy-to-amp) para começar.
 
 ```bash
 crewai deploy create

docs/pt-BR/enterprise/features/automations.mdx

@@ -91,7 +91,7 @@ Após implantar, você pode ver os detalhes da automação e usar o menu **Optio
 ## Relacionados
 
 <CardGroup cols={3}>
-  <Card title="Implantar um Crew" href="/pt-BR/enterprise/guides/deploy-crew" icon="rocket">
+  <Card title="Implantar um Crew" href="/pt-BR/enterprise/guides/deploy-to-amp" icon="rocket">
     Implante um Crew via GitHub ou arquivo ZIP.
   </Card>
   <Card title="Gatilhos de Automação" href="/pt-BR/enterprise/guides/automation-triggers" icon="trigger">

docs/pt-BR/enterprise/features/crew-studio.mdx

@@ -79,7 +79,7 @@ Após publicar, você pode visualizar os detalhes da automação e usar o menu *
   <Card title="Criar um Crew" href="/pt-BR/enterprise/guides/build-crew" icon="paintbrush">
     Crie um Crew.
   </Card>
-  <Card title="Implantar um Crew" href="/pt-BR/enterprise/guides/deploy-crew" icon="rocket">
+  <Card title="Implantar um Crew" href="/pt-BR/enterprise/guides/deploy-to-amp" icon="rocket">
     Implante um Crew via GitHub ou ZIP.
   </Card>
   <Card title="Exportar um Componente React" href="/pt-BR/enterprise/guides/react-component-export" icon="download">

docs/pt-BR/enterprise/guides/deploy-crew.mdx

@@ -1,304 +0,0 @@
----
-title: "Deploy Crew"
-description: "Implantando um Crew na CrewAI AMP"
-icon: "rocket"
-mode: "wide"
----
-
-<Note>
-  Depois de criar um crew localmente ou pelo Crew Studio, o próximo passo é
-  implantá-lo na plataforma CrewAI AMP. Este guia cobre múltiplos métodos de
-  implantação para ajudá-lo a escolher a melhor abordagem para o seu fluxo de
-  trabalho.
-</Note>
-
-## Pré-requisitos
-
-<CardGroup cols={2}>
-  <Card title="Crew Pronto para Implantação" icon="users">
-    Você deve ter um crew funcional, criado localmente ou pelo Crew Studio
-  </Card>
-  <Card title="Repositório GitHub" icon="github">
-    O código do seu crew deve estar em um repositório do GitHub (para o método
-    de integração com GitHub)
-  </Card>
-</CardGroup>
-
-## Opção 1: Implantar Usando o CrewAI CLI
-
-A CLI fornece a maneira mais rápida de implantar crews desenvolvidos localmente na plataforma Enterprise.
-
-<Steps>
-  <Step title="Instale o CrewAI CLI">
-    Se ainda não tiver, instale o CrewAI CLI:
-
-    ```bash
-    pip install crewai[tools]
-    ```
-
-    <Tip>
-    A CLI vem com o pacote principal CrewAI, mas o extra `[tools]` garante todas as dependências de implantação.
-    </Tip>
-
-  </Step>
-
-  <Step title="Autentique-se na Plataforma Enterprise">
-    Primeiro, você precisa autenticar sua CLI com a plataforma CrewAI AMP:
-
-    ```bash
-    # Se já possui uma conta CrewAI AMP, ou deseja criar uma:
-    crewai login
-    ```
-
-    Ao executar qualquer um dos comandos, a CLI irá:
-    1. Exibir uma URL e um código de dispositivo único
-    2. Abrir seu navegador para a página de autenticação
-    3. Solicitar a confirmação do dispositivo
-    4. Completar o processo de autenticação
-
-    Após a autenticação bem-sucedida, você verá uma mensagem de confirmação no terminal!
-
-  </Step>
-
-  <Step title="Criar uma Implantação">
-
-    No diretório do seu projeto, execute:
-
-    ```bash
-    crewai deploy create
-    ```
-
-    Este comando irá:
-    1. Detectar informações do seu repositório GitHub
-    2. Identificar variáveis de ambiente no seu arquivo `.env` local
-    3. Transferir essas variáveis com segurança para a plataforma Enterprise
-    4. Criar uma nova implantação com um identificador único
-
-    Com a criação bem-sucedida, você verá uma mensagem como:
-    ```shell
-    Deployment created successfully!
-    Name: your_project_name
-    Deployment ID: 01234567-89ab-cdef-0123-456789abcdef
-    Current Status: Deploy Enqueued
-    ```
-
-  </Step>
-
-  <Step title="Acompanhe o Progresso da Implantação">
-
-    Acompanhe o status da implantação com:
-
-    ```bash
-    crewai deploy status
-    ```
-
-    Para ver logs detalhados do processo de build:
-
-    ```bash
-    crewai deploy logs
-    ```
-
-    <Tip>
-    A primeira implantação normalmente leva de 10 a 15 minutos, pois as imagens dos containers são construídas. As próximas implantações são bem mais rápidas.
-    </Tip>
-
-  </Step>
-</Steps>
-
-## Comandos Adicionais da CLI
-
-O CrewAI CLI oferece vários comandos para gerenciar suas implantações:
-
-```bash
-# Liste todas as suas implantações
-crewai deploy list
-
-# Consulte o status de uma implantação
-crewai deploy status
-
-# Veja os logs da implantação
-crewai deploy logs
-
-# Envie atualizações após alterações no código
-crewai deploy push
-
-# Remova uma implantação
-crewai deploy remove <deployment_id>
-```
-
-## Opção 2: Implantar Diretamente pela Interface Web
-
-Você também pode implantar seus crews diretamente pela interface web da CrewAI AMP conectando sua conta do GitHub. Esta abordagem não requer utilizar a CLI na sua máquina local.
-
-<Steps>
-
-  <Step title="Enviar no GitHub">
-
-Você precisa subir seu crew para um repositório do GitHub. Caso ainda não tenha criado um crew, você pode [seguir este tutorial](/pt-BR/quickstart).
-
-  </Step>
-
-  <Step title="Conectando o GitHub ao CrewAI AMP">
-
-    1. Faça login em [CrewAI AMP](https://app.crewai.com)
-    2. Clique no botão "Connect GitHub"
-
-    <Frame>
-      ![Botão Connect GitHub](/images/enterprise/connect-github.png)
-    </Frame>
-
-  </Step>
-
-  <Step title="Selecionar o Repositório">
-
-    Após conectar sua conta GitHub, você poderá selecionar qual repositório deseja implantar:
-
-    <Frame>
-      ![Selecionar Repositório](/images/enterprise/select-repo.png)
-    </Frame>
-
-  </Step>
-
-  <Step title="Definir as Variáveis de Ambiente">
-
-    Antes de implantar, você precisará configurar as variáveis de ambiente para conectar ao seu provedor de LLM ou outros serviços:
-
-    1. Você pode adicionar variáveis individualmente ou em lote
-    2. Digite suas variáveis no formato `KEY=VALUE` (uma por linha)
-
-    <Frame>
-      ![Definir Variáveis de Ambiente](/images/enterprise/set-env-variables.png)
-    </Frame>
-
-  </Step>
-
-  <Step title="Implante Seu Crew">
-
-    1. Clique no botão "Deploy" para iniciar o processo de implantação
-    2. Você pode monitorar o progresso pela barra de progresso
-    3. A primeira implantação geralmente demora de 10 a 15 minutos; as próximas serão mais rápidas
-
-    <Frame>
-      ![Progresso da Implantação](/images/enterprise/deploy-progress.png)
-    </Frame>
-
-    Após a conclusão, você verá:
-    - A URL exclusiva do seu crew
-    - Um Bearer token para proteger sua API crew
-    - Um botão "Delete" caso precise remover a implantação
-
-  </Step>
-
-</Steps>
-
-## ⚠️ Requisitos de Segurança para Variáveis de Ambiente
-
-<Warning>
-  **Importante**: A CrewAI AMP possui restrições de segurança sobre os nomes de
-  variáveis de ambiente que podem causar falha na implantação caso não sejam
-  seguidas.
-</Warning>
-
-### Padrões de Variáveis de Ambiente Bloqueados
-
-Por motivos de segurança, os seguintes padrões de nome de variável de ambiente são **automaticamente filtrados** e causarão problemas de implantação:
-
-**Padrões Bloqueados:**
-
-- Variáveis terminando em `_TOKEN` (ex: `MY_API_TOKEN`)
-- Variáveis terminando em `_PASSWORD` (ex: `DB_PASSWORD`)
-- Variáveis terminando em `_SECRET` (ex: `API_SECRET`)
-- Variáveis terminando em `_KEY` em certos contextos
-
-**Variáveis Bloqueadas Específicas:**
-
-- `GITHUB_USER`, `GITHUB_TOKEN`
-- `AWS_REGION`, `AWS_DEFAULT_REGION`
-- Diversas variáveis internas do sistema CrewAI
-
-### Exceções Permitidas
-
-Algumas variáveis são explicitamente permitidas mesmo coincidindo com os padrões bloqueados:
-
-- `AZURE_AD_TOKEN`
-- `AZURE_OPENAI_AD_TOKEN`
-- `ENTERPRISE_ACTION_TOKEN`
-- `CREWAI_ENTEPRISE_TOOLS_TOKEN`
-
-### Como Corrigir Problemas de Nomeação
-
-Se sua implantação falhar devido a restrições de variáveis de ambiente:
-
-```bash
-# ❌ Estas irão causar falhas na implantação
-OPENAI_TOKEN=sk-...
-DATABASE_PASSWORD=mysenha
-API_SECRET=segredo123
-
-# ✅ Utilize estes padrões de nomeação
-OPENAI_API_KEY=sk-...
-DATABASE_CREDENTIALS=mysenha
-API_CONFIG=segredo123
-```
-
-### Melhores Práticas
-
-1. **Use convenções padrão de nomenclatura**: `PROVIDER_API_KEY` em vez de `PROVIDER_TOKEN`
-2. **Teste localmente primeiro**: Certifique-se de que seu crew funciona com as variáveis renomeadas
-3. **Atualize seu código**: Altere todas as referências aos nomes antigos das variáveis
-4. **Documente as mudanças**: Mantenha registro das variáveis renomeadas para seu time
-
-<Tip>
-  Se você se deparar com falhas de implantação com erros enigmáticos de
-  variáveis de ambiente, confira primeiro os nomes das variáveis em relação a
-  esses padrões.
-</Tip>
-
-### Interaja com Seu Crew Implantado
-
-Após a implantação, você pode acessar seu crew por meio de:
-
-1. **REST API**: A plataforma gera um endpoint HTTPS exclusivo com estas rotas principais:
-
-   - `/inputs`: Lista os parâmetros de entrada requeridos
-   - `/kickoff`: Inicia uma execução com os inputs fornecidos
-   - `/status/{kickoff_id}`: Consulta o status da execução
-
-2. **Interface Web**: Acesse [app.crewai.com](https://app.crewai.com) para visualizar:
-   - **Aba Status**: Informações da implantação, detalhes do endpoint da API e token de autenticação
-   - **Aba Run**: Visualização da estrutura do seu crew
-   - **Aba Executions**: Histórico de todas as execuções
-   - **Aba Metrics**: Análises de desempenho
-   - **Aba Traces**: Insights detalhados das execuções
-
-### Dispare uma Execução
-
-No dashboard Enterprise, você pode:
-
-1. Clicar no nome do seu crew para abrir seus detalhes
-2. Selecionar "Trigger Crew" na interface de gerenciamento
-3. Inserir os inputs necessários no modal exibido
-4. Monitorar o progresso à medida que a execução avança pelo pipeline
-
-### Monitoramento e Análises
-
-A plataforma Enterprise oferece recursos abrangentes de observabilidade:
-
-- **Gestão das Execuções**: Acompanhe execuções ativas e concluídas
-- **Traces**: Quebra detalhada de cada execução
-- **Métricas**: Uso de tokens, tempos de execução e custos
-- **Visualização em Linha do Tempo**: Representação visual das sequências de tarefas
-
-### Funcionalidades Avançadas
-
-A plataforma Enterprise também oferece:
-
-- **Gerenciamento de Variáveis de Ambiente**: Armazene e gerencie com segurança as chaves de API
-- **Conexões com LLM**: Configure integrações com diversos provedores de LLM
-- **Repositório Custom Tools**: Crie, compartilhe e instale ferramentas
-- **Crew Studio**: Monte crews via interface de chat sem escrever código
-
-<Card title="Precisa de Ajuda?" icon="headset" href="mailto:support@crewai.com">
-  Entre em contato com nossa equipe de suporte para ajuda com questões de
-  implantação ou dúvidas sobre a plataforma Enterprise.
-</Card>

docs/pt-BR/enterprise/guides/deploy-to-amp.mdx

@@ -0,0 +1,439 @@
+---
+title: "Deploy para AMP"
+description: "Implante seu Crew ou Flow no CrewAI AMP"
+icon: "rocket"
+mode: "wide"
+---
+
+<Note>
+  Depois de criar um Crew ou Flow localmente (ou pelo Crew Studio), o próximo passo é
+  implantá-lo na plataforma CrewAI AMP. Este guia cobre múltiplos métodos de
+  implantação para ajudá-lo a escolher a melhor abordagem para o seu fluxo de trabalho.
+</Note>
+
+## Pré-requisitos
+
+<CardGroup cols={2}>
+  <Card title="Projeto Pronto para Implantação" icon="check-circle">
+    Você deve ter um Crew ou Flow funcionando localmente com sucesso.
+    Siga nosso [guia de preparação](/pt-BR/enterprise/guides/prepare-for-deployment) para verificar a estrutura do seu projeto.
+  </Card>
+  <Card title="Repositório GitHub" icon="github">
+    Seu código deve estar em um repositório do GitHub (para o método de integração com GitHub).
+  </Card>
+</CardGroup>
+
+<Info>
+  **Crews vs Flows**: Ambos os tipos de projeto podem ser implantados como "automações" no CrewAI AMP.
+  O processo de implantação é o mesmo, mas eles têm estruturas de projeto diferentes.
+  Veja [Preparar para Implantação](/pt-BR/enterprise/guides/prepare-for-deployment) para detalhes.
+</Info>
+
+## Opção 1: Implantar Usando o CrewAI CLI
+
+A CLI fornece a maneira mais rápida de implantar Crews ou Flows desenvolvidos localmente na plataforma AMP.
+A CLI detecta automaticamente o tipo do seu projeto a partir do `pyproject.toml` e faz o build adequadamente.
+
+<Steps>
+  <Step title="Instale o CrewAI CLI">
+    Se ainda não tiver, instale o CrewAI CLI:
+
+    ```bash
+    pip install crewai[tools]
+    ```
+
+    <Tip>
+    A CLI vem com o pacote principal CrewAI, mas o extra `[tools]` garante todas as dependências de implantação.
+    </Tip>
+
+  </Step>
+
+  <Step title="Autentique-se na Plataforma Enterprise">
+    Primeiro, você precisa autenticar sua CLI com a plataforma CrewAI AMP:
+
+    ```bash
+    # Se já possui uma conta CrewAI AMP, ou deseja criar uma:
+    crewai login
+    ```
+
+    Ao executar qualquer um dos comandos, a CLI irá:
+    1. Exibir uma URL e um código de dispositivo único
+    2. Abrir seu navegador para a página de autenticação
+    3. Solicitar a confirmação do dispositivo
+    4. Completar o processo de autenticação
+
+    Após a autenticação bem-sucedida, você verá uma mensagem de confirmação no terminal!
+
+  </Step>
+
+  <Step title="Criar uma Implantação">
+
+    No diretório do seu projeto, execute:
+
+    ```bash
+    crewai deploy create
+    ```
+
+    Este comando irá:
+    1. Detectar informações do seu repositório GitHub
+    2. Identificar variáveis de ambiente no seu arquivo `.env` local
+    3. Transferir essas variáveis com segurança para a plataforma Enterprise
+    4. Criar uma nova implantação com um identificador único
+
+    Com a criação bem-sucedida, você verá uma mensagem como:
+    ```shell
+    Deployment created successfully!
+    Name: your_project_name
+    Deployment ID: 01234567-89ab-cdef-0123-456789abcdef
+    Current Status: Deploy Enqueued
+    ```
+
+  </Step>
+
+  <Step title="Acompanhe o Progresso da Implantação">
+
+    Acompanhe o status da implantação com:
+
+    ```bash
+    crewai deploy status
+    ```
+
+    Para ver logs detalhados do processo de build:
+
+    ```bash
+    crewai deploy logs
+    ```
+
+    <Tip>
+    A primeira implantação normalmente leva de 10 a 15 minutos, pois as imagens dos containers são construídas. As próximas implantações são bem mais rápidas.
+    </Tip>
+
+  </Step>
+</Steps>
+
+## Comandos Adicionais da CLI
+
+O CrewAI CLI oferece vários comandos para gerenciar suas implantações:
+
+```bash
+# Liste todas as suas implantações
+crewai deploy list
+
+# Consulte o status de uma implantação
+crewai deploy status
+
+# Veja os logs da implantação
+crewai deploy logs
+
+# Envie atualizações após alterações no código
+crewai deploy push
+
+# Remova uma implantação
+crewai deploy remove <deployment_id>
+```
+
+## Opção 2: Implantar Diretamente pela Interface Web
+
+Você também pode implantar seus Crews ou Flows diretamente pela interface web do CrewAI AMP conectando sua conta do GitHub. Esta abordagem não requer utilizar a CLI na sua máquina local. A plataforma detecta automaticamente o tipo do seu projeto e trata o build adequadamente.
+
+<Steps>
+
+  <Step title="Enviar para o GitHub">
+
+Você precisa enviar seu crew para um repositório do GitHub. Caso ainda não tenha criado um crew, você pode [seguir este tutorial](/pt-BR/quickstart).
+
+  </Step>
+
+  <Step title="Conectando o GitHub ao CrewAI AMP">
+
+    1. Faça login em [CrewAI AMP](https://app.crewai.com)
+    2. Clique no botão "Connect GitHub"
+
+    <Frame>
+      ![Botão Connect GitHub](/images/enterprise/connect-github.png)
+    </Frame>
+
+  </Step>
+
+  <Step title="Selecionar o Repositório">
+
+    Após conectar sua conta GitHub, você poderá selecionar qual repositório deseja implantar:
+
+    <Frame>
+      ![Selecionar Repositório](/images/enterprise/select-repo.png)
+    </Frame>
+
+  </Step>
+
+  <Step title="Definir as Variáveis de Ambiente">
+
+    Antes de implantar, você precisará configurar as variáveis de ambiente para conectar ao seu provedor de LLM ou outros serviços:
+
+    1. Você pode adicionar variáveis individualmente ou em lote
+    2. Digite suas variáveis no formato `KEY=VALUE` (uma por linha)
+
+    <Frame>
+      ![Definir Variáveis de Ambiente](/images/enterprise/set-env-variables.png)
+    </Frame>
+
+  </Step>
+
+  <Step title="Implante Seu Crew">
+
+    1. Clique no botão "Deploy" para iniciar o processo de implantação
+    2. Você pode monitorar o progresso pela barra de progresso
+    3. A primeira implantação geralmente demora de 10 a 15 minutos; as próximas serão mais rápidas
+
+    <Frame>
+      ![Progresso da Implantação](/images/enterprise/deploy-progress.png)
+    </Frame>
+
+    Após a conclusão, você verá:
+    - A URL exclusiva do seu crew
+    - Um Bearer token para proteger sua API crew
+    - Um botão "Delete" caso precise remover a implantação
+
+  </Step>
+
+</Steps>
+
+## Opção 3: Reimplantar Usando API (Integração CI/CD)
+
+Para implantações automatizadas em pipelines CI/CD, você pode usar a API do CrewAI para acionar reimplantações de crews existentes. Isso é particularmente útil para GitHub Actions, Jenkins ou outros workflows de automação.
+
+<Steps>
+  <Step title="Obtenha Seu Token de Acesso Pessoal">
+
+    Navegue até as configurações da sua conta CrewAI AMP para gerar um token de API:
+
+    1. Acesse [app.crewai.com](https://app.crewai.com)
+    2. Clique em **Settings** → **Account** → **Personal Access Token**
+    3. Gere um novo token e copie-o com segurança
+    4. Armazene este token como um secret no seu sistema CI/CD
+
+  </Step>
+
+  <Step title="Encontre o UUID da Sua Automação">
+
+    Localize o identificador único do seu crew implantado:
+
+    1. Acesse **Automations** no seu dashboard CrewAI AMP
+    2. Selecione sua automação/crew existente
+    3. Clique em **Additional Details**
+    4. Copie o **UUID** - este identifica sua implantação específica do crew
+
+  </Step>
+
+  <Step title="Acione a Reimplantação via API">
+
+    Use o endpoint da API de Deploy para acionar uma reimplantação:
+
+    ```bash
+    curl -i -X POST \
+         -H "Authorization: Bearer YOUR_PERSONAL_ACCESS_TOKEN" \
+         https://app.crewai.com/crewai_plus/api/v1/crews/YOUR-AUTOMATION-UUID/deploy
+
+    # HTTP/2 200
+    # content-type: application/json
+    #
+    # {
+    #   "uuid": "your-automation-uuid",
+    #   "status": "Deploy Enqueued",
+    #   "public_url": "https://your-crew-deployment.crewai.com",
+    #   "token": "your-bearer-token"
+    # }
+    ```
+
+    <Info>
+    Se sua automação foi criada originalmente conectada ao Git, a API automaticamente puxará as últimas alterações do seu repositório antes de reimplantar.
+    </Info>
+
+  </Step>
+
+  <Step title="Exemplo de Integração com GitHub Actions">
+
+    Aqui está um workflow do GitHub Actions com gatilhos de implantação mais complexos:
+
+    ```yaml
+    name: Deploy CrewAI Automation
+
+    on:
+      push:
+        branches: [ main ]
+      pull_request:
+        types: [ labeled ]
+      release:
+        types: [ published ]
+
+    jobs:
+      deploy:
+        runs-on: ubuntu-latest
+        if: |
+          (github.event_name == 'push' && github.ref == 'refs/heads/main') ||
+          (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'deploy')) ||
+          (github.event_name == 'release')
+        steps:
+          - name: Trigger CrewAI Redeployment
+            run: |
+              curl -X POST \
+                   -H "Authorization: Bearer ${{ secrets.CREWAI_PAT }}" \
+                   https://app.crewai.com/crewai_plus/api/v1/crews/${{ secrets.CREWAI_AUTOMATION_UUID }}/deploy
+    ```
+
+    <Tip>
+    Adicione `CREWAI_PAT` e `CREWAI_AUTOMATION_UUID` como secrets do repositório. Para implantações de PR, adicione um label "deploy" para acionar o workflow.
+    </Tip>
+
+    </Step>
+
+  </Steps>
+
+## Interaja com Sua Automação Implantada
+
+Após a implantação, você pode acessar seu crew através de:
+
+1. **REST API**: A plataforma gera um endpoint HTTPS exclusivo com estas rotas principais:
+
+   - `/inputs`: Lista os parâmetros de entrada requeridos
+   - `/kickoff`: Inicia uma execução com os inputs fornecidos
+   - `/status/{kickoff_id}`: Consulta o status da execução
+
+2. **Interface Web**: Acesse [app.crewai.com](https://app.crewai.com) para visualizar:
+   - **Aba Status**: Informações da implantação, detalhes do endpoint da API e token de autenticação
+   - **Aba Run**: Visualização da estrutura do seu crew
+   - **Aba Executions**: Histórico de todas as execuções
+   - **Aba Metrics**: Análises de desempenho
+   - **Aba Traces**: Insights detalhados das execuções
+
+### Dispare uma Execução
+
+No dashboard Enterprise, você pode:
+
+1. Clicar no nome do seu crew para abrir seus detalhes
+2. Selecionar "Trigger Crew" na interface de gerenciamento
+3. Inserir os inputs necessários no modal exibido
+4. Monitorar o progresso à medida que a execução avança pelo pipeline
+
+### Monitoramento e Análises
+
+A plataforma Enterprise oferece recursos abrangentes de observabilidade:
+
+- **Gestão das Execuções**: Acompanhe execuções ativas e concluídas
+- **Traces**: Quebra detalhada de cada execução
+- **Métricas**: Uso de tokens, tempos de execução e custos
+- **Visualização em Linha do Tempo**: Representação visual das sequências de tarefas
+
+### Funcionalidades Avançadas
+
+A plataforma Enterprise também oferece:
+
+- **Gerenciamento de Variáveis de Ambiente**: Armazene e gerencie com segurança as chaves de API
+- **Conexões com LLM**: Configure integrações com diversos provedores de LLM
+- **Repositório Custom Tools**: Crie, compartilhe e instale ferramentas
+- **Crew Studio**: Monte crews via interface de chat sem escrever código
+
+## Solução de Problemas em Falhas de Implantação
+
+Se sua implantação falhar, verifique estes problemas comuns:
+
+### Falhas de Build
+
+#### Arquivo uv.lock Ausente
+
+**Sintoma**: Build falha no início com erros de resolução de dependências
+
+**Solução**: Gere e faça commit do arquivo lock:
+
+```bash
+uv lock
+git add uv.lock
+git commit -m "Add uv.lock for deployment"
+git push
+```
+
+<Warning>
+  O arquivo `uv.lock` é obrigatório para todas as implantações. Sem ele, a plataforma
+  não consegue instalar suas dependências de forma confiável.
+</Warning>
+
+#### Estrutura de Projeto Incorreta
+
+**Sintoma**: Erros "Could not find entry point" ou "Module not found"
+
+**Solução**: Verifique se seu projeto corresponde à estrutura esperada:
+
+- **Tanto Crews quanto Flows**: Devem ter ponto de entrada em `src/project_name/main.py`
+- **Crews**: Usam uma função `run()` como ponto de entrada
+- **Flows**: Usam uma função `kickoff()` como ponto de entrada
+
+Veja [Preparar para Implantação](/pt-BR/enterprise/guides/prepare-for-deployment) para diagramas de estrutura detalhados.
+
+#### Decorador CrewBase Ausente
+
+**Sintoma**: Erros "Crew not found", "Config not found" ou erros de configuração de agent/task
+
+**Solução**: Certifique-se de que **todas** as classes crew usam o decorador `@CrewBase`:
+
+```python
+from crewai.project import CrewBase, agent, crew, task
+
+@CrewBase  # Este decorador é OBRIGATÓRIO
+class YourCrew():
+    """Descrição do seu crew"""
+
+    @agent
+    def my_agent(self) -> Agent:
+        return Agent(
+            config=self.agents_config['my_agent'],  # type: ignore[index]
+            verbose=True
+        )
+
+    # ... resto da definição do crew
+```
+
+<Info>
+  Isso se aplica a Crews independentes E crews embutidos dentro de projetos Flow.
+  Toda classe crew precisa do decorador.
+</Info>
+
+#### Tipo Incorreto no pyproject.toml
+
+**Sintoma**: Build tem sucesso mas falha em runtime, ou comportamento inesperado
+
+**Solução**: Verifique se a seção `[tool.crewai]` corresponde ao tipo do seu projeto:
+
+```toml
+# Para projetos Crew:
+[tool.crewai]
+type = "crew"
+
+# Para projetos Flow:
+[tool.crewai]
+type = "flow"
+```
+
+### Falhas de Runtime
+
+#### Falhas de Conexão com LLM
+
+**Sintoma**: Erros de chave API, "model not found" ou falhas de autenticação
+
+**Solução**:
+1. Verifique se a chave API do seu provedor LLM está corretamente definida nas variáveis de ambiente
+2. Certifique-se de que os nomes das variáveis de ambiente correspondem ao que seu código espera
+3. Teste localmente com exatamente as mesmas variáveis de ambiente antes de implantar
+
+#### Erros de Execução do Crew
+
+**Sintoma**: Crew inicia mas falha durante a execução
+
+**Solução**:
+1. Verifique os logs de execução no dashboard AMP (aba Traces)
+2. Verifique se todas as ferramentas têm as chaves API necessárias configuradas
+3. Certifique-se de que as configurações de agents em `agents.yaml` são válidas
+4. Verifique se há erros de sintaxe nas configurações de tasks em `tasks.yaml`
+
+<Card title="Precisa de Ajuda?" icon="headset" href="mailto:support@crewai.com">
+  Entre em contato com nossa equipe de suporte para ajuda com questões de
+  implantação ou dúvidas sobre a plataforma AMP.
+</Card>

docs/pt-BR/enterprise/guides/prepare-for-deployment.mdx

@@ -0,0 +1,305 @@
+---
+title: "Preparar para Implantação"
+description: "Certifique-se de que seu Crew ou Flow está pronto para implantação no CrewAI AMP"
+icon: "clipboard-check"
+mode: "wide"
+---
+
+<Note>
+  Antes de implantar no CrewAI AMP, é crucial verificar se seu projeto está estruturado corretamente.
+  Tanto Crews quanto Flows podem ser implantados como "automações", mas eles têm estruturas de projeto
+  e requisitos diferentes que devem ser atendidos para uma implantação bem-sucedida.
+</Note>
+
+## Entendendo Automações
+
+No CrewAI AMP, **automações** é o termo geral para projetos de IA Agêntica implantáveis. Uma automação pode ser:
+
+- **Um Crew**: Uma equipe independente de agentes de IA trabalhando juntos em tarefas
+- **Um Flow**: Um workflow orquestrado que pode combinar múltiplos crews, chamadas diretas de LLM e lógica procedural
+
+Entender qual tipo você está implantando é essencial porque eles têm estruturas de projeto e pontos de entrada diferentes.
+
+## Crews vs Flows: Principais Diferenças
+
+<CardGroup cols={2}>
+  <Card title="Projetos Crew" icon="users">
+    Equipes de agentes de IA independentes com `crew.py` definindo agentes e tarefas. Ideal para tarefas focadas e colaborativas.
+  </Card>
+  <Card title="Projetos Flow" icon="diagram-project">
+    Workflows orquestrados com crews embutidos em uma pasta `crews/`. Ideal para processos complexos de múltiplas etapas.
+  </Card>
+</CardGroup>
+
+| Aspecto | Crew | Flow |
+|---------|------|------|
+| **Estrutura do projeto** | `src/project_name/` com `crew.py` | `src/project_name/` com pasta `crews/` |
+| **Localização da lógica principal** | `src/project_name/crew.py` | `src/project_name/main.py` (classe Flow) |
+| **Função de ponto de entrada** | `run()` em `main.py` | `kickoff()` em `main.py` |
+| **Tipo no pyproject.toml** | `type = "crew"` | `type = "flow"` |
+| **Comando CLI de criação** | `crewai create crew name` | `crewai create flow name` |
+| **Localização da configuração** | `src/project_name/config/` | `src/project_name/crews/crew_name/config/` |
+| **Pode conter outros crews** | Não | Sim (na pasta `crews/`) |
+
+## Referência de Estrutura de Projeto
+
+### Estrutura de Projeto Crew
+
+Quando você executa `crewai create crew my_crew`, você obtém esta estrutura:
+
+```
+my_crew/
+├── .gitignore
+├── pyproject.toml          # Deve ter type = "crew"
+├── README.md
+├── .env
+├── uv.lock                  # OBRIGATÓRIO para implantação
+└── src/
+    └── my_crew/
+        ├── __init__.py
+        ├── main.py          # Ponto de entrada com função run()
+        ├── crew.py          # Classe Crew com decorador @CrewBase
+        ├── tools/
+        │   ├── custom_tool.py
+        │   └── __init__.py
+        └── config/
+            ├── agents.yaml  # Definições de agentes
+            └── tasks.yaml   # Definições de tarefas
+```
+
+<Warning>
+  A estrutura aninhada `src/project_name/` é crítica para Crews.
+  Colocar arquivos no nível errado causará falhas na implantação.
+</Warning>
+
+### Estrutura de Projeto Flow
+
+Quando você executa `crewai create flow my_flow`, você obtém esta estrutura:
+
+```
+my_flow/
+├── .gitignore
+├── pyproject.toml          # Deve ter type = "flow"
+├── README.md
+├── .env
+├── uv.lock                  # OBRIGATÓRIO para implantação
+└── src/
+    └── my_flow/
+        ├── __init__.py
+        ├── main.py          # Ponto de entrada com função kickoff() + classe Flow
+        ├── crews/           # Pasta de crews embutidos
+        │   └── poem_crew/
+        │       ├── __init__.py
+        │       ├── poem_crew.py  # Crew com decorador @CrewBase
+        │       └── config/
+        │           ├── agents.yaml
+        │           └── tasks.yaml
+        └── tools/
+            ├── __init__.py
+            └── custom_tool.py
+```
+
+<Info>
+  Tanto Crews quanto Flows usam a estrutura `src/project_name/`.
+  A diferença chave é que Flows têm uma pasta `crews/` para crews embutidos,
+  enquanto Crews têm `crew.py` diretamente na pasta do projeto.
+</Info>
+
+## Checklist Pré-Implantação
+
+Use este checklist para verificar se seu projeto está pronto para implantação.
+
+### 1. Verificar Configuração do pyproject.toml
+
+Seu `pyproject.toml` deve incluir a seção `[tool.crewai]` correta:
+
+<Tabs>
+  <Tab title="Para Crews">
+    ```toml
+    [tool.crewai]
+    type = "crew"
+    ```
+  </Tab>
+  <Tab title="Para Flows">
+    ```toml
+    [tool.crewai]
+    type = "flow"
+    ```
+  </Tab>
+</Tabs>
+
+<Warning>
+  Se o `type` não corresponder à estrutura do seu projeto, o build falhará ou
+  a automação não funcionará corretamente.
+</Warning>
+
+### 2. Garantir que o Arquivo uv.lock Existe
+
+CrewAI usa `uv` para gerenciamento de dependências. O arquivo `uv.lock` garante builds reproduzíveis e é **obrigatório** para implantação.
+
+```bash
+# Gerar ou atualizar o arquivo lock
+uv lock
+
+# Verificar se existe
+ls -la uv.lock
+```
+
+Se o arquivo não existir, execute `uv lock` e faça commit no seu repositório:
+
+```bash
+uv lock
+git add uv.lock
+git commit -m "Add uv.lock for deployment"
+git push
+```
+
+### 3. Validar Uso do Decorador CrewBase
+
+**Toda classe crew deve usar o decorador `@CrewBase`.** Isso se aplica a:
+
+- Projetos crew independentes
+- Crews embutidos dentro de projetos Flow
+
+```python
+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
+
+@CrewBase  # Este decorador é OBRIGATÓRIO
+class MyCrew():
+    """Descrição do meu crew"""
+
+    agents: List[BaseAgent]
+    tasks: List[Task]
+
+    @agent
+    def my_agent(self) -> Agent:
+        return Agent(
+            config=self.agents_config['my_agent'],  # type: ignore[index]
+            verbose=True
+        )
+
+    @task
+    def my_task(self) -> Task:
+        return Task(
+            config=self.tasks_config['my_task']  # type: ignore[index]
+        )
+
+    @crew
+    def crew(self) -> Crew:
+        return Crew(
+            agents=self.agents,
+            tasks=self.tasks,
+            process=Process.sequential,
+            verbose=True,
+        )
+```
+
+<Warning>
+  Se você esquecer o decorador `@CrewBase`, sua implantação falhará com
+  erros sobre configurações de agents ou tasks ausentes.
+</Warning>
+
+### 4. Verificar Pontos de Entrada do Projeto
+
+Tanto Crews quanto Flows têm seu ponto de entrada em `src/project_name/main.py`:
+
+<Tabs>
+  <Tab title="Para Crews">
+    O ponto de entrada usa uma função `run()`:
+
+    ```python
+    # src/my_crew/main.py
+    from my_crew.crew import MyCrew
+
+    def run():
+        """Executa o crew."""
+        inputs = {'topic': 'AI in Healthcare'}
+        result = MyCrew().crew().kickoff(inputs=inputs)
+        return result
+
+    if __name__ == "__main__":
+        run()
+    ```
+  </Tab>
+  <Tab title="Para Flows">
+    O ponto de entrada usa uma função `kickoff()` com uma classe Flow:
+
+    ```python
+    # src/my_flow/main.py
+    from crewai.flow import Flow, listen, start
+    from my_flow.crews.poem_crew.poem_crew import PoemCrew
+
+    class MyFlow(Flow):
+        @start()
+        def begin(self):
+            # Lógica do Flow aqui
+            result = PoemCrew().crew().kickoff(inputs={...})
+            return result
+
+    def kickoff():
+        """Executa o flow."""
+        MyFlow().kickoff()
+
+    if __name__ == "__main__":
+        kickoff()
+    ```
+  </Tab>
+</Tabs>
+
+### 5. Preparar Variáveis de Ambiente
+
+Antes da implantação, certifique-se de ter:
+
+1. **Chaves de API de LLM** prontas (OpenAI, Anthropic, Google, etc.)
+2. **Chaves de API de ferramentas** se estiver usando ferramentas externas (Serper, etc.)
+
+<Tip>
+  Teste seu projeto localmente com as mesmas variáveis de ambiente antes de implantar
+  para detectar problemas de configuração antecipadamente.
+</Tip>
+
+## Comandos de Validação Rápida
+
+Execute estes comandos a partir da raiz do seu projeto para verificar rapidamente sua configuração:
+
+```bash
+# 1. Verificar tipo do projeto no pyproject.toml
+grep -A2 "\[tool.crewai\]" pyproject.toml
+
+# 2. Verificar se uv.lock existe
+ls -la uv.lock || echo "ERRO: uv.lock ausente! Execute 'uv lock'"
+
+# 3. Verificar se estrutura src/ existe
+ls -la src/*/main.py 2>/dev/null || echo "Nenhum main.py encontrado em src/"
+
+# 4. Para Crews - verificar se crew.py existe
+ls -la src/*/crew.py 2>/dev/null || echo "Nenhum crew.py (esperado para Crews)"
+
+# 5. Para Flows - verificar se pasta crews/ existe
+ls -la src/*/crews/ 2>/dev/null || echo "Nenhuma pasta crews/ (esperado para Flows)"
+
+# 6. Verificar uso do CrewBase
+grep -r "@CrewBase" . --include="*.py"
+```
+
+## Erros Comuns de Configuração
+
+| Erro | Sintoma | Correção |
+|------|---------|----------|
+| `uv.lock` ausente | Build falha durante resolução de dependências | Execute `uv lock` e faça commit |
+| `type` errado no pyproject.toml | Build bem-sucedido mas falha em runtime | Altere para o tipo correto |
+| Decorador `@CrewBase` ausente | Erros "Config not found" | Adicione decorador a todas as classes crew |
+| Arquivos na raiz ao invés de `src/` | Ponto de entrada não encontrado | Mova para `src/project_name/` |
+| `run()` ou `kickoff()` ausente | Não é possível iniciar automação | Adicione a função de entrada correta |
+
+## Próximos Passos
+
+Uma vez que seu projeto passar por todos os itens do checklist, você está pronto para implantar:
+
+<Card title="Deploy para AMP" icon="rocket" href="/pt-BR/enterprise/guides/deploy-to-amp">
+  Siga o guia de implantação para implantar seu Crew ou Flow no CrewAI AMP usando
+  a CLI, interface web ou integração CI/CD.
+</Card>

docs/pt-BR/enterprise/introduction.mdx

@@ -82,7 +82,7 @@ CrewAI AMP expande o poder do framework open-source com funcionalidades projetad
     <Card
       title="Implantar Crew"
       icon="rocket"
-      href="/pt-BR/enterprise/guides/deploy-crew"
+      href="/pt-BR/enterprise/guides/deploy-to-amp"
     >
       Implantar Crew
     </Card>
@@ -92,11 +92,11 @@ CrewAI AMP expande o poder do framework open-source com funcionalidades projetad
     <Card
       title="Acesso via API"
       icon="code"
-      href="/pt-BR/enterprise/guides/deploy-crew"
+      href="/pt-BR/enterprise/guides/kickoff-crew"
     >
       Usar a API do Crew
     </Card>
   </Step>
 </Steps>
 
-Para instruções detalhadas, consulte nosso [guia de implantação](/pt-BR/enterprise/guides/deploy-crew) ou clique no botão abaixo para começar.
+Para instruções detalhadas, consulte nosso [guia de implantação](/pt-BR/enterprise/guides/deploy-to-amp) ou clique no botão abaixo para começar.

docs/pt-BR/observability/galileo.mdx

@@ -0,0 +1,115 @@
+---
+title: Galileo Galileu
+description: Integração Galileo para rastreamento e avaliação CrewAI
+icon: telescope
+mode: "wide"
+---
+
+## Visão geral
+
+Este guia demonstra como integrar o **Galileo**com o **CrewAI**
+para rastreamento abrangente e engenharia de avaliação.
+Ao final deste guia, você será capaz de rastrear seus agentes CrewAI,
+monitorar seu desempenho e avaliar seu comportamento com
+A poderosa plataforma de observabilidade do Galileo.
+
+> **O que é Galileo?**[Galileo](https://galileo.ai/) é avaliação e observabilidade de IA
+plataforma que oferece rastreamento, avaliação e
+e monitoramento de aplicações de IA. Ele permite que as equipes capturem a verdade,
+criar grades de proteção robustas e realizar experimentos sistemáticos com
+rastreamento de experimentos integrado e análise de desempenho -garantindo confiabilidade,
+transparência e melhoria contínua em todo o ciclo de vida da IA.
+
+## Primeiros passos
+
+Este tutorial segue o [CrewAI Quickstart](pt-BR/quickstart) e mostra como adicionar
+[CrewAIEventListener] do Galileo(https://v2docs.galileo.ai/sdk-api/python/reference/handlers/crewai/handler),
+um manipulador de eventos.
+Para mais informações, consulte Galileu
+[Adicionar Galileo a um aplicativo CrewAI](https://v2docs.galileo.ai/how-to-guides/third-party-integrations/add-galileo-to-crewai/add-galileo-to-crewai)
+guia prático.
+
+> **Observação**Este tutorial pressupõe que você concluiu o [CrewAI Quickstart](pt-BR/quickstart).
+Se você quiser um exemplo completo e abrangente, consulte o Galileo
+[Repositório de exemplo SDK da CrewAI](https://github.com/rungalileo/sdk-examples/tree/main/python/agent/crew-ai).
+
+### Etapa 1: instalar dependências
+
+Instale as dependências necessárias para seu aplicativo.
+Crie um ambiente virtual usando seu método preferido,
+em seguida, instale dependências dentro desse ambiente usando seu
+ferramenta preferida:
+
+```bash
+uv add galileo 
+```
+
+### Etapa 2: adicione ao arquivo .env do [CrewAI Quickstart](/pt-BR/quickstart)
+
+```bash
+# Your Galileo API key
+GALILEO_API_KEY="your-galileo-api-key"
+
+# Your Galileo project name
+GALILEO_PROJECT="your-galileo-project-name"
+
+# The name of the Log stream you want to use for logging
+GALILEO_LOG_STREAM="your-galileo-log-stream "
+```
+
+### Etapa 3: adicionar o ouvinte de eventos Galileo
+
+Para habilitar o registro com Galileo, você precisa criar uma instância do `CrewAIEventListener`.
+Importe o pacote manipulador Galileo CrewAI por
+adicionando o seguinte código no topo do seu arquivo main.py:
+
+```python
+from galileo.handlers.crewai.handler import CrewAIEventListener
+```
+
+No início da sua função run, crie o ouvinte de evento:
+
+```python
+def run():
+    # Create the event listener
+    CrewAIEventListener()
+    # The rest of your existing code goes here
+```
+
+Quando você cria a instância do listener, ela é automaticamente
+registrado na CrewAI.
+
+### Etapa 4: administre sua Crew
+
+Administre sua Crew com o CrewAI CLI:
+
+```bash
+crewai run
+```
+
+### Passo 5: Visualize os traços no Galileo
+
+Assim que sua tripulação terminar, os rastros serão eliminados e aparecerão no Galileo.
+
+![Galileo trace view](/images/galileo-trace-veiw.png)
+  
+## Compreendendo a integração do Galileo
+
+Galileo se integra ao CrewAI registrando um ouvinte de evento
+que captura eventos de execução da tripulação (por exemplo, ações do agente, chamadas de ferramentas, respostas do modelo)
+e os encaminha ao Galileo para observabilidade e avaliação.
+
+### Compreendendo o ouvinte de eventos
+
+Criar uma instância `CrewAIEventListener()` é tudo o que você precisa
+necessário para habilitar o Galileo para uma execução do CrewAI. Quando instanciado, o ouvinte:
+
+-Registra-se automaticamente no CrewAI
+-Lê a configuração do Galileo a partir de variáveis de ambiente
+-Registra todos os dados de execução no projeto Galileo e fluxo de log especificado por
+  `GALILEO_PROJECT` e `GALILEO_LOG_STREAM`
+
+Nenhuma configuração adicional ou alterações de código são necessárias.
+Todos os dados desta execução são registados no projecto Galileo e
+fluxo de log especificado pela configuração do seu ambiente
+(por exemplo, GALILEO_PROJECT e GALILEO_LOG_STREAM).

lib/crewai-tools/pyproject.toml

@@ -12,7 +12,7 @@ dependencies = [
     "pytube~=15.0.0",
     "requests~=2.32.5",
     "docker~=7.1.0",
-    "crewai==1.8.0",
+    "crewai==1.8.1",
     "lancedb~=0.5.4",
     "tiktoken~=0.8.0",
     "beautifulsoup4~=4.13.4",

lib/crewai-tools/src/crewai_tools/__init__.py

@@ -291,4 +291,4 @@ __all__ = [
     "ZapierActionTools",
 ]
 
-__version__ = "1.8.0"
+__version__ = "1.8.1"

lib/crewai/pyproject.toml

@@ -49,7 +49,7 @@ Repository = "https://github.com/crewAIInc/crewAI"
 
 [project.optional-dependencies]
 tools = [
-    "crewai-tools==1.8.0",
+    "crewai-tools==1.8.1",
 ]
 embeddings = [
     "tiktoken~=0.8.0"

lib/crewai/src/crewai/__init__.py

@@ -40,7 +40,7 @@ def _suppress_pydantic_deprecation_warnings() -> None:
 
 _suppress_pydantic_deprecation_warnings()
 
-__version__ = "1.8.0"
+__version__ = "1.8.1"
 _telemetry_submitted = False
 
 

lib/crewai/src/crewai/a2a/__init__.py

@@ -1,8 +1,10 @@
 """Agent-to-Agent (A2A) protocol communication module for CrewAI."""
 
-from crewai.a2a.config import A2AConfig
+from crewai.a2a.config import A2AClientConfig, A2AConfig, A2AServerConfig
 
 
 __all__ = [
+    "A2AClientConfig",
     "A2AConfig",
+    "A2AServerConfig",
 ]

lib/crewai/src/crewai/a2a/config.py

@@ -5,45 +5,57 @@ This module is separate from experimental.a2a to avoid circular imports.
 
 from __future__ import annotations
 
-from typing import Annotated, Any, ClassVar
+from importlib.metadata import version
+from typing import Any, ClassVar, Literal
 
-from pydantic import (
-    BaseModel,
-    BeforeValidator,
-    ConfigDict,
-    Field,
-    HttpUrl,
-    TypeAdapter,
-)
+from pydantic import BaseModel, ConfigDict, Field
+from typing_extensions import deprecated
 
 from crewai.a2a.auth.schemas import AuthScheme
+from crewai.a2a.types import TransportType, Url
 
 
 try:
+    from a2a.types import (
+        AgentCapabilities,
+        AgentCardSignature,
+        AgentInterface,
+        AgentProvider,
+        AgentSkill,
+        SecurityScheme,
+    )
+
     from crewai.a2a.updates import UpdateConfig
 except ImportError:
+    UpdateConfig = Any
+    AgentCapabilities = Any
+    AgentCardSignature = Any
+    AgentInterface = Any
+    AgentProvider = Any
+    SecurityScheme = Any
+    AgentSkill = Any
     UpdateConfig = Any  # type: ignore[misc,assignment]
 
 
-http_url_adapter = TypeAdapter(HttpUrl)
-
-Url = Annotated[
-    str,
-    BeforeValidator(
-        lambda value: str(http_url_adapter.validate_python(value, strict=True))
-    ),
-]
-
-
 def _get_default_update_config() -> UpdateConfig:
     from crewai.a2a.updates import StreamingConfig
 
     return StreamingConfig()
 
 
+@deprecated(
+    """
+    `crewai.a2a.config.A2AConfig` is deprecated and will be removed in v2.0.0,
+    use `crewai.a2a.config.A2AClientConfig` or `crewai.a2a.config.A2AServerConfig` instead.
+    """,
+    category=FutureWarning,
+)
 class A2AConfig(BaseModel):
     """Configuration for A2A protocol integration.
 
+    Deprecated:
+        Use A2AClientConfig instead. This class will be removed in a future version.
+
     Attributes:
         endpoint: A2A agent endpoint URL.
         auth: Authentication scheme.
@@ -53,6 +65,7 @@ class A2AConfig(BaseModel):
         fail_fast: If True, raise error when agent unreachable; if False, skip and continue.
         trust_remote_completion_status: If True, return A2A agent's result directly when completed.
         updates: Update mechanism config.
+        transport_protocol: A2A transport protocol (grpc, jsonrpc, http+json).
     """
 
     model_config: ClassVar[ConfigDict] = ConfigDict(extra="forbid")
@@ -82,3 +95,180 @@ class A2AConfig(BaseModel):
         default_factory=_get_default_update_config,
         description="Update mechanism config",
     )
+    transport_protocol: Literal["JSONRPC", "GRPC", "HTTP+JSON"] = Field(
+        default="JSONRPC",
+        description="Specified mode of A2A transport protocol",
+    )
+
+
+class A2AClientConfig(BaseModel):
+    """Configuration for connecting to remote A2A agents.
+
+    Attributes:
+        endpoint: A2A agent endpoint URL.
+        auth: Authentication scheme.
+        timeout: Request timeout in seconds.
+        max_turns: Maximum conversation turns with A2A agent.
+        response_model: Optional Pydantic model for structured A2A agent responses.
+        fail_fast: If True, raise error when agent unreachable; if False, skip and continue.
+        trust_remote_completion_status: If True, return A2A agent's result directly when completed.
+        updates: Update mechanism config.
+        accepted_output_modes: Media types the client can accept in responses.
+        supported_transports: Ordered list of transport protocols the client supports.
+        use_client_preference: Whether to prioritize client transport preferences over server.
+        extensions: Extension URIs the client supports.
+    """
+
+    model_config: ClassVar[ConfigDict] = ConfigDict(extra="forbid")
+
+    endpoint: Url = Field(description="A2A agent endpoint URL")
+    auth: AuthScheme | None = Field(
+        default=None,
+        description="Authentication scheme",
+    )
+    timeout: int = Field(default=120, description="Request timeout in seconds")
+    max_turns: int = Field(
+        default=10, description="Maximum conversation turns with A2A agent"
+    )
+    response_model: type[BaseModel] | None = Field(
+        default=None,
+        description="Optional Pydantic model for structured A2A agent responses",
+    )
+    fail_fast: bool = Field(
+        default=True,
+        description="If True, raise error when agent unreachable; if False, skip",
+    )
+    trust_remote_completion_status: bool = Field(
+        default=False,
+        description="If True, return A2A result directly when completed",
+    )
+    updates: UpdateConfig = Field(
+        default_factory=_get_default_update_config,
+        description="Update mechanism config",
+    )
+    accepted_output_modes: list[str] = Field(
+        default_factory=lambda: ["application/json"],
+        description="Media types the client can accept in responses",
+    )
+    supported_transports: list[str] = Field(
+        default_factory=lambda: ["JSONRPC"],
+        description="Ordered list of transport protocols the client supports",
+    )
+    use_client_preference: bool = Field(
+        default=False,
+        description="Whether to prioritize client transport preferences over server",
+    )
+    extensions: list[str] = Field(
+        default_factory=list,
+        description="Extension URIs the client supports",
+    )
+    transport_protocol: Literal["JSONRPC", "GRPC", "HTTP+JSON"] = Field(
+        default="JSONRPC",
+        description="Specified mode of A2A transport protocol",
+    )
+
+
+class A2AServerConfig(BaseModel):
+    """Configuration for exposing a Crew or Agent as an A2A server.
+
+    All fields correspond to A2A AgentCard fields. Fields like name, description,
+    and skills can be auto-derived from the Crew/Agent if not provided.
+
+    Attributes:
+        name: Human-readable name for the agent.
+        description: Human-readable description of the agent.
+        version: Version string for the agent card.
+        skills: List of agent skills/capabilities.
+        default_input_modes: Default supported input MIME types.
+        default_output_modes: Default supported output MIME types.
+        capabilities: Declaration of optional capabilities.
+        preferred_transport: Transport protocol for the preferred endpoint.
+        protocol_version: A2A protocol version this agent supports.
+        provider: Information about the agent's service provider.
+        documentation_url: URL to the agent's documentation.
+        icon_url: URL to an icon for the agent.
+        additional_interfaces: Additional supported interfaces.
+        security: Security requirement objects for all interactions.
+        security_schemes: Security schemes available to authorize requests.
+        supports_authenticated_extended_card: Whether agent provides extended card to authenticated users.
+        url: Preferred endpoint URL for the agent.
+        signatures: JSON Web Signatures for the AgentCard.
+    """
+
+    model_config: ClassVar[ConfigDict] = ConfigDict(extra="forbid")
+
+    name: str | None = Field(
+        default=None,
+        description="Human-readable name for the agent. Auto-derived from Crew/Agent if not provided.",
+    )
+    description: str | None = Field(
+        default=None,
+        description="Human-readable description of the agent. Auto-derived from Crew/Agent if not provided.",
+    )
+    version: str = Field(
+        default="1.0.0",
+        description="Version string for the agent card",
+    )
+    skills: list[AgentSkill] = Field(
+        default_factory=list,
+        description="List of agent skills. Auto-derived from tasks/tools if not provided.",
+    )
+    default_input_modes: list[str] = Field(
+        default_factory=lambda: ["text/plain", "application/json"],
+        description="Default supported input MIME types",
+    )
+    default_output_modes: list[str] = Field(
+        default_factory=lambda: ["text/plain", "application/json"],
+        description="Default supported output MIME types",
+    )
+    capabilities: AgentCapabilities = Field(
+        default_factory=lambda: AgentCapabilities(
+            streaming=True,
+            push_notifications=False,
+        ),
+        description="Declaration of optional capabilities supported by the agent",
+    )
+    preferred_transport: TransportType = Field(
+        default="JSONRPC",
+        description="Transport protocol for the preferred endpoint",
+    )
+    protocol_version: str = Field(
+        default_factory=lambda: version("a2a-sdk"),
+        description="A2A protocol version this agent supports",
+    )
+    provider: AgentProvider | None = Field(
+        default=None,
+        description="Information about the agent's service provider",
+    )
+    documentation_url: Url | None = Field(
+        default=None,
+        description="URL to the agent's documentation",
+    )
+    icon_url: Url | None = Field(
+        default=None,
+        description="URL to an icon for the agent",
+    )
+    additional_interfaces: list[AgentInterface] = Field(
+        default_factory=list,
+        description="Additional supported interfaces (transport and URL combinations)",
+    )
+    security: list[dict[str, list[str]]] = Field(
+        default_factory=list,
+        description="Security requirement objects for all agent interactions",
+    )
+    security_schemes: dict[str, SecurityScheme] = Field(
+        default_factory=dict,
+        description="Security schemes available to authorize requests",
+    )
+    supports_authenticated_extended_card: bool = Field(
+        default=False,
+        description="Whether agent provides extended card to authenticated users",
+    )
+    url: Url | None = Field(
+        default=None,
+        description="Preferred endpoint URL for the agent. Set at runtime if not provided.",
+    )
+    signatures: list[AgentCardSignature] = Field(
+        default_factory=list,
+        description="JSON Web Signatures for the AgentCard",
+    )

lib/crewai/src/crewai/a2a/types.py

@@ -1,7 +1,17 @@
 """Type definitions for A2A protocol message parts."""
 
-from typing import Any, Literal, Protocol, TypedDict, runtime_checkable
+from __future__ import annotations
 
+from typing import (
+    Annotated,
+    Any,
+    Literal,
+    Protocol,
+    TypedDict,
+    runtime_checkable,
+)
+
+from pydantic import BeforeValidator, HttpUrl, TypeAdapter
 from typing_extensions import NotRequired
 
 from crewai.a2a.updates import (
@@ -15,6 +25,18 @@ from crewai.a2a.updates import (
 )
 
 
+TransportType = Literal["JSONRPC", "GRPC", "HTTP+JSON"]
+
+http_url_adapter: TypeAdapter[HttpUrl] = TypeAdapter(HttpUrl)
+
+Url = Annotated[
+    str,
+    BeforeValidator(
+        lambda value: str(http_url_adapter.validate_python(value, strict=True))
+    ),
+]
+
+
 @runtime_checkable
 class AgentResponseProtocol(Protocol):
     """Protocol for the dynamically created AgentResponse model."""

lib/crewai/src/crewai/a2a/utils/__init__.py

@@ -0,0 +1 @@
+"""A2A utility modules for client operations."""

lib/crewai/src/crewai/a2a/utils/agent_card.py

@@ -0,0 +1,399 @@
+"""AgentCard utilities for A2A client and server operations."""
+
+from __future__ import annotations
+
+import asyncio
+from collections.abc import MutableMapping
+from functools import lru_cache
+import time
+from types import MethodType
+from typing import TYPE_CHECKING
+
+from a2a.client.errors import A2AClientHTTPError
+from a2a.types import AgentCapabilities, AgentCard, AgentSkill
+from aiocache import cached  # type: ignore[import-untyped]
+from aiocache.serializers import PickleSerializer  # type: ignore[import-untyped]
+import httpx
+
+from crewai.a2a.auth.schemas import APIKeyAuth, HTTPDigestAuth
+from crewai.a2a.auth.utils import (
+    _auth_store,
+    configure_auth_client,
+    retry_on_401,
+)
+from crewai.a2a.config import A2AServerConfig
+from crewai.crew import Crew
+
+
+if TYPE_CHECKING:
+    from crewai.a2a.auth.schemas import AuthScheme
+    from crewai.agent import Agent
+    from crewai.task import Task
+
+
+def _get_server_config(agent: Agent) -> A2AServerConfig | None:
+    """Get A2AServerConfig from an agent's a2a configuration.
+
+    Args:
+        agent: The Agent instance to check.
+
+    Returns:
+        A2AServerConfig if present, None otherwise.
+    """
+    if agent.a2a is None:
+        return None
+    if isinstance(agent.a2a, A2AServerConfig):
+        return agent.a2a
+    if isinstance(agent.a2a, list):
+        for config in agent.a2a:
+            if isinstance(config, A2AServerConfig):
+                return config
+    return None
+
+
+def fetch_agent_card(
+    endpoint: str,
+    auth: AuthScheme | None = None,
+    timeout: int = 30,
+    use_cache: bool = True,
+    cache_ttl: int = 300,
+) -> AgentCard:
+    """Fetch AgentCard from an A2A endpoint with optional caching.
+
+    Args:
+        endpoint: A2A agent endpoint URL (AgentCard URL).
+        auth: Optional AuthScheme for authentication.
+        timeout: Request timeout in seconds.
+        use_cache: Whether to use caching (default True).
+        cache_ttl: Cache TTL in seconds (default 300 = 5 minutes).
+
+    Returns:
+        AgentCard object with agent capabilities and skills.
+
+    Raises:
+        httpx.HTTPStatusError: If the request fails.
+        A2AClientHTTPError: If authentication fails.
+    """
+    if use_cache:
+        if auth:
+            auth_data = auth.model_dump_json(
+                exclude={
+                    "_access_token",
+                    "_token_expires_at",
+                    "_refresh_token",
+                    "_authorization_callback",
+                }
+            )
+            auth_hash = hash((type(auth).__name__, auth_data))
+        else:
+            auth_hash = 0
+        _auth_store[auth_hash] = auth
+        ttl_hash = int(time.time() // cache_ttl)
+        return _fetch_agent_card_cached(endpoint, auth_hash, timeout, ttl_hash)
+
+    loop = asyncio.new_event_loop()
+    asyncio.set_event_loop(loop)
+    try:
+        return loop.run_until_complete(
+            afetch_agent_card(endpoint=endpoint, auth=auth, timeout=timeout)
+        )
+    finally:
+        loop.close()
+
+
+async def afetch_agent_card(
+    endpoint: str,
+    auth: AuthScheme | None = None,
+    timeout: int = 30,
+    use_cache: bool = True,
+) -> AgentCard:
+    """Fetch AgentCard from an A2A endpoint asynchronously.
+
+    Native async implementation. Use this when running in an async context.
+
+    Args:
+        endpoint: A2A agent endpoint URL (AgentCard URL).
+        auth: Optional AuthScheme for authentication.
+        timeout: Request timeout in seconds.
+        use_cache: Whether to use caching (default True).
+
+    Returns:
+        AgentCard object with agent capabilities and skills.
+
+    Raises:
+        httpx.HTTPStatusError: If the request fails.
+        A2AClientHTTPError: If authentication fails.
+    """
+    if use_cache:
+        if auth:
+            auth_data = auth.model_dump_json(
+                exclude={
+                    "_access_token",
+                    "_token_expires_at",
+                    "_refresh_token",
+                    "_authorization_callback",
+                }
+            )
+            auth_hash = hash((type(auth).__name__, auth_data))
+        else:
+            auth_hash = 0
+        _auth_store[auth_hash] = auth
+        agent_card: AgentCard = await _afetch_agent_card_cached(
+            endpoint, auth_hash, timeout
+        )
+        return agent_card
+
+    return await _afetch_agent_card_impl(endpoint=endpoint, auth=auth, timeout=timeout)
+
+
+@lru_cache()
+def _fetch_agent_card_cached(
+    endpoint: str,
+    auth_hash: int,
+    timeout: int,
+    _ttl_hash: int,
+) -> AgentCard:
+    """Cached sync version of fetch_agent_card."""
+    auth = _auth_store.get(auth_hash)
+
+    loop = asyncio.new_event_loop()
+    asyncio.set_event_loop(loop)
+    try:
+        return loop.run_until_complete(
+            _afetch_agent_card_impl(endpoint=endpoint, auth=auth, timeout=timeout)
+        )
+    finally:
+        loop.close()
+
+
+@cached(ttl=300, serializer=PickleSerializer())  # type: ignore[untyped-decorator]
+async def _afetch_agent_card_cached(
+    endpoint: str,
+    auth_hash: int,
+    timeout: int,
+) -> AgentCard:
+    """Cached async implementation of AgentCard fetching."""
+    auth = _auth_store.get(auth_hash)
+    return await _afetch_agent_card_impl(endpoint=endpoint, auth=auth, timeout=timeout)
+
+
+async def _afetch_agent_card_impl(
+    endpoint: str,
+    auth: AuthScheme | None,
+    timeout: int,
+) -> AgentCard:
+    """Internal async implementation of AgentCard fetching."""
+    if "/.well-known/agent-card.json" in endpoint:
+        base_url = endpoint.replace("/.well-known/agent-card.json", "")
+        agent_card_path = "/.well-known/agent-card.json"
+    else:
+        url_parts = endpoint.split("/", 3)
+        base_url = f"{url_parts[0]}//{url_parts[2]}"
+        agent_card_path = f"/{url_parts[3]}" if len(url_parts) > 3 else "/"
+
+    headers: MutableMapping[str, str] = {}
+    if auth:
+        async with httpx.AsyncClient(timeout=timeout) as temp_auth_client:
+            if isinstance(auth, (HTTPDigestAuth, APIKeyAuth)):
+                configure_auth_client(auth, temp_auth_client)
+            headers = await auth.apply_auth(temp_auth_client, {})
+
+    async with httpx.AsyncClient(timeout=timeout, headers=headers) as temp_client:
+        if auth and isinstance(auth, (HTTPDigestAuth, APIKeyAuth)):
+            configure_auth_client(auth, temp_client)
+
+        agent_card_url = f"{base_url}{agent_card_path}"
+
+        async def _fetch_agent_card_request() -> httpx.Response:
+            return await temp_client.get(agent_card_url)
+
+        try:
+            response = await retry_on_401(
+                request_func=_fetch_agent_card_request,
+                auth_scheme=auth,
+                client=temp_client,
+                headers=temp_client.headers,
+                max_retries=2,
+            )
+            response.raise_for_status()
+
+            return AgentCard.model_validate(response.json())
+
+        except httpx.HTTPStatusError as e:
+            if e.response.status_code == 401:
+                error_details = ["Authentication failed"]
+                www_auth = e.response.headers.get("WWW-Authenticate")
+                if www_auth:
+                    error_details.append(f"WWW-Authenticate: {www_auth}")
+                if not auth:
+                    error_details.append("No auth scheme provided")
+                msg = " | ".join(error_details)
+                raise A2AClientHTTPError(401, msg) from e
+            raise
+
+
+def _task_to_skill(task: Task) -> AgentSkill:
+    """Convert a CrewAI Task to an A2A AgentSkill.
+
+    Args:
+        task: The CrewAI Task to convert.
+
+    Returns:
+        AgentSkill representing the task's capability.
+    """
+    task_name = task.name or task.description[:50]
+    task_id = task_name.lower().replace(" ", "_")
+
+    tags: list[str] = []
+    if task.agent:
+        tags.append(task.agent.role.lower().replace(" ", "-"))
+
+    return AgentSkill(
+        id=task_id,
+        name=task_name,
+        description=task.description,
+        tags=tags,
+        examples=[task.expected_output] if task.expected_output else None,
+    )
+
+
+def _tool_to_skill(tool_name: str, tool_description: str) -> AgentSkill:
+    """Convert an Agent's tool to an A2A AgentSkill.
+
+    Args:
+        tool_name: Name of the tool.
+        tool_description: Description of what the tool does.
+
+    Returns:
+        AgentSkill representing the tool's capability.
+    """
+    tool_id = tool_name.lower().replace(" ", "_")
+
+    return AgentSkill(
+        id=tool_id,
+        name=tool_name,
+        description=tool_description,
+        tags=[tool_name.lower().replace(" ", "-")],
+    )
+
+
+def _crew_to_agent_card(crew: Crew, url: str) -> AgentCard:
+    """Generate an A2A AgentCard from a Crew instance.
+
+    Args:
+        crew: The Crew instance to generate a card for.
+        url: The base URL where this crew will be exposed.
+
+    Returns:
+        AgentCard describing the crew's capabilities.
+    """
+    crew_name = getattr(crew, "name", None) or crew.__class__.__name__
+
+    description_parts: list[str] = []
+    crew_description = getattr(crew, "description", None)
+    if crew_description:
+        description_parts.append(crew_description)
+    else:
+        agent_roles = [agent.role for agent in crew.agents]
+        description_parts.append(
+            f"A crew of {len(crew.agents)} agents: {', '.join(agent_roles)}"
+        )
+
+    skills = [_task_to_skill(task) for task in crew.tasks]
+
+    return AgentCard(
+        name=crew_name,
+        description=" ".join(description_parts),
+        url=url,
+        version="1.0.0",
+        capabilities=AgentCapabilities(
+            streaming=True,
+            push_notifications=True,
+        ),
+        default_input_modes=["text/plain", "application/json"],
+        default_output_modes=["text/plain", "application/json"],
+        skills=skills,
+    )
+
+
+def _agent_to_agent_card(agent: Agent, url: str) -> AgentCard:
+    """Generate an A2A AgentCard from an Agent instance.
+
+    Uses A2AServerConfig values when available, falling back to agent properties.
+
+    Args:
+        agent: The Agent instance to generate a card for.
+        url: The base URL where this agent will be exposed.
+
+    Returns:
+        AgentCard describing the agent's capabilities.
+    """
+    server_config = _get_server_config(agent) or A2AServerConfig()
+
+    name = server_config.name or agent.role
+
+    description_parts = [agent.goal]
+    if agent.backstory:
+        description_parts.append(agent.backstory)
+    description = server_config.description or " ".join(description_parts)
+
+    skills: list[AgentSkill] = (
+        server_config.skills.copy() if server_config.skills else []
+    )
+
+    if not skills:
+        if agent.tools:
+            for tool in agent.tools:
+                tool_name = getattr(tool, "name", None) or tool.__class__.__name__
+                tool_desc = getattr(tool, "description", None) or f"Tool: {tool_name}"
+                skills.append(_tool_to_skill(tool_name, tool_desc))
+
+        if not skills:
+            skills.append(
+                AgentSkill(
+                    id=agent.role.lower().replace(" ", "_"),
+                    name=agent.role,
+                    description=agent.goal,
+                    tags=[agent.role.lower().replace(" ", "-")],
+                )
+            )
+
+    return AgentCard(
+        name=name,
+        description=description,
+        url=server_config.url or url,
+        version=server_config.version,
+        capabilities=server_config.capabilities,
+        default_input_modes=server_config.default_input_modes,
+        default_output_modes=server_config.default_output_modes,
+        skills=skills,
+        protocol_version=server_config.protocol_version,
+        provider=server_config.provider,
+        documentation_url=server_config.documentation_url,
+        icon_url=server_config.icon_url,
+        additional_interfaces=server_config.additional_interfaces,
+        security=server_config.security,
+        security_schemes=server_config.security_schemes,
+        supports_authenticated_extended_card=server_config.supports_authenticated_extended_card,
+        signatures=server_config.signatures,
+    )
+
+
+def inject_a2a_server_methods(agent: Agent) -> None:
+    """Inject A2A server methods onto an Agent instance.
+
+    Adds a `to_agent_card(url: str) -> AgentCard` method to the agent
+    that generates an A2A-compliant AgentCard.
+
+    Only injects if the agent has an A2AServerConfig.
+
+    Args:
+        agent: The Agent instance to inject methods onto.
+    """
+    if _get_server_config(agent) is None:
+        return
+
+    def _to_agent_card(self: Agent, url: str) -> AgentCard:
+        return _agent_to_agent_card(self, url)
+
+    object.__setattr__(agent, "to_agent_card", MethodType(_to_agent_card, agent))

lib/crewai/src/crewai/a2a/utils/delegation.py

@@ -1,16 +1,14 @@
-"""Utility functions for A2A (Agent-to-Agent) protocol delegation."""
+"""A2A delegation utilities for executing tasks on remote agents."""
 
 from __future__ import annotations
 
 import asyncio
 from collections.abc import AsyncIterator, MutableMapping
 from contextlib import asynccontextmanager
-from functools import lru_cache
-import time
-from typing import TYPE_CHECKING, Any
+from typing import TYPE_CHECKING, Any, Literal
 import uuid
 
-from a2a.client import A2AClientHTTPError, Client, ClientConfig, ClientFactory
+from a2a.client import Client, ClientConfig, ClientFactory
 from a2a.types import (
     AgentCard,
     Message,
@@ -18,21 +16,16 @@ from a2a.types import (
     PushNotificationConfig as A2APushNotificationConfig,
     Role,
     TextPart,
-    TransportProtocol,
 )
-from aiocache import cached  # type: ignore[import-untyped]
-from aiocache.serializers import PickleSerializer  # type: ignore[import-untyped]
 import httpx
-from pydantic import BaseModel, Field, create_model
+from pydantic import BaseModel
 
 from crewai.a2a.auth.schemas import APIKeyAuth, HTTPDigestAuth
 from crewai.a2a.auth.utils import (
     _auth_store,
     configure_auth_client,
-    retry_on_401,
     validate_auth_against_agent_card,
 )
-from crewai.a2a.config import A2AConfig
 from crewai.a2a.task_helpers import TaskStateResult
 from crewai.a2a.types import (
     HANDLER_REGISTRY,
@@ -46,6 +39,7 @@ from crewai.a2a.updates import (
     StreamingHandler,
     UpdateConfig,
 )
+from crewai.a2a.utils.agent_card import _afetch_agent_card_cached
 from crewai.events.event_bus import crewai_event_bus
 from crewai.events.types.a2a_events import (
     A2AConversationStartedEvent,
@@ -53,7 +47,6 @@ from crewai.events.types.a2a_events import (
     A2ADelegationStartedEvent,
     A2AMessageSentEvent,
 )
-from crewai.types.utils import create_literals_from_strings
 
 
 if TYPE_CHECKING:
@@ -76,189 +69,9 @@ def get_handler(config: UpdateConfig | None) -> HandlerType:
     return HANDLER_REGISTRY.get(type(config), StreamingHandler)
 
 
-@lru_cache()
-def _fetch_agent_card_cached(
-    endpoint: str,
-    auth_hash: int,
-    timeout: int,
-    _ttl_hash: int,
-) -> AgentCard:
-    """Cached sync version of fetch_agent_card."""
-    auth = _auth_store.get(auth_hash)
-
-    loop = asyncio.new_event_loop()
-    asyncio.set_event_loop(loop)
-    try:
-        return loop.run_until_complete(
-            _afetch_agent_card_impl(endpoint=endpoint, auth=auth, timeout=timeout)
-        )
-    finally:
-        loop.close()
-
-
-def fetch_agent_card(
-    endpoint: str,
-    auth: AuthScheme | None = None,
-    timeout: int = 30,
-    use_cache: bool = True,
-    cache_ttl: int = 300,
-) -> AgentCard:
-    """Fetch AgentCard from an A2A endpoint with optional caching.
-
-    Args:
-        endpoint: A2A agent endpoint URL (AgentCard URL)
-        auth: Optional AuthScheme for authentication
-        timeout: Request timeout in seconds
-        use_cache: Whether to use caching (default True)
-        cache_ttl: Cache TTL in seconds (default 300 = 5 minutes)
-
-    Returns:
-        AgentCard object with agent capabilities and skills
-
-    Raises:
-        httpx.HTTPStatusError: If the request fails
-        A2AClientHTTPError: If authentication fails
-    """
-    if use_cache:
-        if auth:
-            auth_data = auth.model_dump_json(
-                exclude={
-                    "_access_token",
-                    "_token_expires_at",
-                    "_refresh_token",
-                    "_authorization_callback",
-                }
-            )
-            auth_hash = hash((type(auth).__name__, auth_data))
-        else:
-            auth_hash = 0
-        _auth_store[auth_hash] = auth
-        ttl_hash = int(time.time() // cache_ttl)
-        return _fetch_agent_card_cached(endpoint, auth_hash, timeout, ttl_hash)
-
-    loop = asyncio.new_event_loop()
-    asyncio.set_event_loop(loop)
-    try:
-        return loop.run_until_complete(
-            afetch_agent_card(endpoint=endpoint, auth=auth, timeout=timeout)
-        )
-    finally:
-        loop.close()
-
-
-async def afetch_agent_card(
-    endpoint: str,
-    auth: AuthScheme | None = None,
-    timeout: int = 30,
-    use_cache: bool = True,
-) -> AgentCard:
-    """Fetch AgentCard from an A2A endpoint asynchronously.
-
-    Native async implementation. Use this when running in an async context.
-
-    Args:
-        endpoint: A2A agent endpoint URL (AgentCard URL).
-        auth: Optional AuthScheme for authentication.
-        timeout: Request timeout in seconds.
-        use_cache: Whether to use caching (default True).
-
-    Returns:
-        AgentCard object with agent capabilities and skills.
-
-    Raises:
-        httpx.HTTPStatusError: If the request fails.
-        A2AClientHTTPError: If authentication fails.
-    """
-    if use_cache:
-        if auth:
-            auth_data = auth.model_dump_json(
-                exclude={
-                    "_access_token",
-                    "_token_expires_at",
-                    "_refresh_token",
-                    "_authorization_callback",
-                }
-            )
-            auth_hash = hash((type(auth).__name__, auth_data))
-        else:
-            auth_hash = 0
-        _auth_store[auth_hash] = auth
-        agent_card: AgentCard = await _afetch_agent_card_cached(
-            endpoint, auth_hash, timeout
-        )
-        return agent_card
-
-    return await _afetch_agent_card_impl(endpoint=endpoint, auth=auth, timeout=timeout)
-
-
-@cached(ttl=300, serializer=PickleSerializer())  # type: ignore[untyped-decorator]
-async def _afetch_agent_card_cached(
-    endpoint: str,
-    auth_hash: int,
-    timeout: int,
-) -> AgentCard:
-    """Cached async implementation of AgentCard fetching."""
-    auth = _auth_store.get(auth_hash)
-    return await _afetch_agent_card_impl(endpoint=endpoint, auth=auth, timeout=timeout)
-
-
-async def _afetch_agent_card_impl(
-    endpoint: str,
-    auth: AuthScheme | None,
-    timeout: int,
-) -> AgentCard:
-    """Internal async implementation of AgentCard fetching."""
-    if "/.well-known/agent-card.json" in endpoint:
-        base_url = endpoint.replace("/.well-known/agent-card.json", "")
-        agent_card_path = "/.well-known/agent-card.json"
-    else:
-        url_parts = endpoint.split("/", 3)
-        base_url = f"{url_parts[0]}//{url_parts[2]}"
-        agent_card_path = f"/{url_parts[3]}" if len(url_parts) > 3 else "/"
-
-    headers: MutableMapping[str, str] = {}
-    if auth:
-        async with httpx.AsyncClient(timeout=timeout) as temp_auth_client:
-            if isinstance(auth, (HTTPDigestAuth, APIKeyAuth)):
-                configure_auth_client(auth, temp_auth_client)
-            headers = await auth.apply_auth(temp_auth_client, {})
-
-    async with httpx.AsyncClient(timeout=timeout, headers=headers) as temp_client:
-        if auth and isinstance(auth, (HTTPDigestAuth, APIKeyAuth)):
-            configure_auth_client(auth, temp_client)
-
-        agent_card_url = f"{base_url}{agent_card_path}"
-
-        async def _fetch_agent_card_request() -> httpx.Response:
-            return await temp_client.get(agent_card_url)
-
-        try:
-            response = await retry_on_401(
-                request_func=_fetch_agent_card_request,
-                auth_scheme=auth,
-                client=temp_client,
-                headers=temp_client.headers,
-                max_retries=2,
-            )
-            response.raise_for_status()
-
-            return AgentCard.model_validate(response.json())
-
-        except httpx.HTTPStatusError as e:
-            if e.response.status_code == 401:
-                error_details = ["Authentication failed"]
-                www_auth = e.response.headers.get("WWW-Authenticate")
-                if www_auth:
-                    error_details.append(f"WWW-Authenticate: {www_auth}")
-                if not auth:
-                    error_details.append("No auth scheme provided")
-                msg = " | ".join(error_details)
-                raise A2AClientHTTPError(401, msg) from e
-            raise
-
-
 def execute_a2a_delegation(
     endpoint: str,
+    transport_protocol: Literal["JSONRPC", "GRPC", "HTTP+JSON"],
     auth: AuthScheme | None,
     timeout: int,
     task_description: str,
@@ -282,6 +95,23 @@ def execute_a2a_delegation(
     use aexecute_a2a_delegation directly.
 
     Args:
+        endpoint: A2A agent endpoint URL (AgentCard URL)
+        transport_protocol: Optional A2A transport protocol (grpc, jsonrpc, http+json)
+        auth: Optional AuthScheme for authentication (Bearer, OAuth2, API Key, HTTP Basic/Digest)
+        timeout: Request timeout in seconds
+        task_description: The task to delegate
+        context: Optional context information
+        context_id: Context ID for correlating messages/tasks
+        task_id: Specific task identifier
+        reference_task_ids: List of related task IDs
+        metadata: Additional metadata (external_id, request_id, etc.)
+        extensions: Protocol extensions for custom fields
+        conversation_history: Previous Message objects from conversation
+        agent_id: Agent identifier for logging
+        agent_role: Role of the CrewAI agent delegating the task
+        agent_branch: Optional agent tree branch for logging
+        response_model: Optional Pydantic model for structured outputs
+        turn_number: Optional turn number for multi-turn conversations
         endpoint: A2A agent endpoint URL.
         auth: Optional AuthScheme for authentication.
         timeout: Request timeout in seconds.
@@ -323,6 +153,7 @@ def execute_a2a_delegation(
                 agent_role=agent_role,
                 agent_branch=agent_branch,
                 response_model=response_model,
+                transport_protocol=transport_protocol,
                 turn_number=turn_number,
                 updates=updates,
             )
@@ -333,6 +164,7 @@ def execute_a2a_delegation(
 
 async def aexecute_a2a_delegation(
     endpoint: str,
+    transport_protocol: Literal["JSONRPC", "GRPC", "HTTP+JSON"],
     auth: AuthScheme | None,
     timeout: int,
     task_description: str,
@@ -356,6 +188,23 @@ async def aexecute_a2a_delegation(
     in an async context (e.g., with Crew.akickoff() or agent.aexecute_task()).
 
     Args:
+        endpoint: A2A agent endpoint URL
+        transport_protocol: Optional A2A transport protocol (grpc, jsonrpc, http+json)
+        auth: Optional AuthScheme for authentication
+        timeout: Request timeout in seconds
+        task_description: Task to delegate
+        context: Optional context
+        context_id: Context ID for correlation
+        task_id: Specific task identifier
+        reference_task_ids: Related task IDs
+        metadata: Additional metadata
+        extensions: Protocol extensions
+        conversation_history: Previous Message objects
+        turn_number: Current turn number
+        agent_branch: Agent tree branch for logging
+        agent_id: Agent identifier for logging
+        agent_role: Agent role for logging
+        response_model: Optional Pydantic model for structured outputs
         endpoint: A2A agent endpoint URL.
         auth: Optional AuthScheme for authentication.
         timeout: Request timeout in seconds.
@@ -414,6 +263,7 @@ async def aexecute_a2a_delegation(
         agent_role=agent_role,
         response_model=response_model,
         updates=updates,
+        transport_protocol=transport_protocol,
     )
 
     crewai_event_bus.emit(
@@ -431,6 +281,7 @@ async def aexecute_a2a_delegation(
 
 async def _aexecute_a2a_delegation_impl(
     endpoint: str,
+    transport_protocol: Literal["JSONRPC", "GRPC", "HTTP+JSON"],
     auth: AuthScheme | None,
     timeout: int,
     task_description: str,
@@ -524,7 +375,6 @@ async def _aexecute_a2a_delegation_impl(
         extensions=extensions,
     )
 
-    transport_protocol = TransportProtocol("JSONRPC")
     new_messages: list[Message] = [*conversation_history, message]
     crewai_event_bus.emit(
         None,
@@ -596,7 +446,7 @@ async def _aexecute_a2a_delegation_impl(
 @asynccontextmanager
 async def _create_a2a_client(
     agent_card: AgentCard,
-    transport_protocol: TransportProtocol,
+    transport_protocol: Literal["JSONRPC", "GRPC", "HTTP+JSON"],
     timeout: int,
     headers: MutableMapping[str, str],
     streaming: bool,
@@ -607,19 +457,18 @@ async def _create_a2a_client(
     """Create and configure an A2A client.
 
     Args:
-        agent_card: The A2A agent card
-        transport_protocol: Transport protocol to use
-        timeout: Request timeout in seconds
-        headers: HTTP headers (already with auth applied)
-        streaming: Enable streaming responses
-        auth: Optional AuthScheme for client configuration
-        use_polling: Enable polling mode
-        push_notification_config: Optional push notification config to include in requests
+        agent_card: The A2A agent card.
+        transport_protocol: Transport protocol to use.
+        timeout: Request timeout in seconds.
+        headers: HTTP headers (already with auth applied).
+        streaming: Enable streaming responses.
+        auth: Optional AuthScheme for client configuration.
+        use_polling: Enable polling mode.
+        push_notification_config: Optional push notification config.
 
     Yields:
-        Configured A2A client instance
+        Configured A2A client instance.
     """
-
     async with httpx.AsyncClient(
         timeout=timeout,
         headers=headers,
@@ -640,7 +489,7 @@ async def _create_a2a_client(
 
         config = ClientConfig(
             httpx_client=httpx_client,
-            supported_transports=[str(transport_protocol.value)],
+            supported_transports=[transport_protocol],
             streaming=streaming and not use_polling,
             polling=use_polling,
             accepted_output_modes=["application/json"],
@@ -650,78 +499,3 @@ async def _create_a2a_client(
         factory = ClientFactory(config)
         client = factory.create(agent_card)
         yield client
-
-
-def create_agent_response_model(agent_ids: tuple[str, ...]) -> type[BaseModel]:
-    """Create a dynamic AgentResponse model with Literal types for agent IDs.
-
-    Args:
-        agent_ids: List of available A2A agent IDs
-
-    Returns:
-        Dynamically created Pydantic model with Literal-constrained a2a_ids field
-    """
-
-    DynamicLiteral = create_literals_from_strings(agent_ids)  # noqa: N806
-
-    return create_model(
-        "AgentResponse",
-        a2a_ids=(
-            tuple[DynamicLiteral, ...],  # type: ignore[valid-type]
-            Field(
-                default_factory=tuple,
-                max_length=len(agent_ids),
-                description="A2A agent IDs to delegate to.",
-            ),
-        ),
-        message=(
-            str,
-            Field(
-                description="The message content. If is_a2a=true, this is sent to the A2A agent. If is_a2a=false, this is your final answer ending the conversation."
-            ),
-        ),
-        is_a2a=(
-            bool,
-            Field(
-                description="Set to false when the remote agent has answered your question - extract their answer and return it as your final message. Set to true ONLY if you need to ask a NEW, DIFFERENT question. NEVER repeat the same request - if the conversation history shows the agent already answered, set is_a2a=false immediately."
-            ),
-        ),
-        __base__=BaseModel,
-    )
-
-
-def extract_a2a_agent_ids_from_config(
-    a2a_config: list[A2AConfig] | A2AConfig | None,
-) -> tuple[list[A2AConfig], tuple[str, ...]]:
-    """Extract A2A agent IDs from A2A configuration.
-
-    Args:
-        a2a_config: A2A configuration
-
-    Returns:
-        List of A2A agent IDs
-    """
-    if a2a_config is None:
-        return [], ()
-
-    if isinstance(a2a_config, A2AConfig):
-        a2a_agents = [a2a_config]
-    else:
-        a2a_agents = a2a_config
-    return a2a_agents, tuple(config.endpoint for config in a2a_agents)
-
-
-def get_a2a_agents_and_response_model(
-    a2a_config: list[A2AConfig] | A2AConfig | None,
-) -> tuple[list[A2AConfig], type[BaseModel]]:
-    """Get A2A agent IDs and response model.
-
-    Args:
-        a2a_config: A2A configuration
-
-    Returns:
-        Tuple of A2A agent IDs and response model
-    """
-    a2a_agents, agent_ids = extract_a2a_agent_ids_from_config(a2a_config=a2a_config)
-
-    return a2a_agents, create_agent_response_model(agent_ids)

lib/crewai/src/crewai/a2a/utils/response_model.py

@@ -0,0 +1,101 @@
+"""Response model utilities for A2A agent interactions."""
+
+from __future__ import annotations
+
+from typing import TypeAlias
+
+from pydantic import BaseModel, Field, create_model
+
+from crewai.a2a.config import A2AClientConfig, A2AConfig, A2AServerConfig
+from crewai.types.utils import create_literals_from_strings
+
+
+A2AConfigTypes: TypeAlias = A2AConfig | A2AServerConfig | A2AClientConfig
+A2AClientConfigTypes: TypeAlias = A2AConfig | A2AClientConfig
+
+
+def create_agent_response_model(agent_ids: tuple[str, ...]) -> type[BaseModel] | None:
+    """Create a dynamic AgentResponse model with Literal types for agent IDs.
+
+    Args:
+        agent_ids: List of available A2A agent IDs.
+
+    Returns:
+        Dynamically created Pydantic model with Literal-constrained a2a_ids field,
+        or None if agent_ids is empty.
+    """
+    if not agent_ids:
+        return None
+
+    DynamicLiteral = create_literals_from_strings(agent_ids)  # noqa: N806
+
+    return create_model(
+        "AgentResponse",
+        a2a_ids=(
+            tuple[DynamicLiteral, ...],  # type: ignore[valid-type]
+            Field(
+                default_factory=tuple,
+                max_length=len(agent_ids),
+                description="A2A agent IDs to delegate to.",
+            ),
+        ),
+        message=(
+            str,
+            Field(
+                description="The message content. If is_a2a=true, this is sent to the A2A agent. If is_a2a=false, this is your final answer ending the conversation."
+            ),
+        ),
+        is_a2a=(
+            bool,
+            Field(
+                description="Set to false when the remote agent has answered your question - extract their answer and return it as your final message. Set to true ONLY if you need to ask a NEW, DIFFERENT question. NEVER repeat the same request - if the conversation history shows the agent already answered, set is_a2a=false immediately."
+            ),
+        ),
+        __base__=BaseModel,
+    )
+
+
+def extract_a2a_agent_ids_from_config(
+    a2a_config: list[A2AConfigTypes] | A2AConfigTypes | None,
+) -> tuple[list[A2AClientConfigTypes], tuple[str, ...]]:
+    """Extract A2A agent IDs from A2A configuration.
+
+    Filters out A2AServerConfig since it doesn't have an endpoint for delegation.
+
+    Args:
+        a2a_config: A2A configuration (any type).
+
+    Returns:
+        Tuple of client A2A configs list and agent endpoint IDs.
+    """
+    if a2a_config is None:
+        return [], ()
+
+    configs: list[A2AConfigTypes]
+    if isinstance(a2a_config, (A2AConfig, A2AClientConfig, A2AServerConfig)):
+        configs = [a2a_config]
+    else:
+        configs = a2a_config
+
+    # Filter to only client configs (those with endpoint)
+    client_configs: list[A2AClientConfigTypes] = [
+        config for config in configs if isinstance(config, (A2AConfig, A2AClientConfig))
+    ]
+
+    return client_configs, tuple(config.endpoint for config in client_configs)
+
+
+def get_a2a_agents_and_response_model(
+    a2a_config: list[A2AConfigTypes] | A2AConfigTypes | None,
+) -> tuple[list[A2AClientConfigTypes], type[BaseModel] | None]:
+    """Get A2A agent configs and response model.
+
+    Args:
+        a2a_config: A2A configuration (any type).
+
+    Returns:
+        Tuple of client A2A configs and response model.
+    """
+    a2a_agents, agent_ids = extract_a2a_agent_ids_from_config(a2a_config=a2a_config)
+
+    return a2a_agents, create_agent_response_model(agent_ids)

lib/crewai/src/crewai/a2a/utils/task.py

@@ -0,0 +1,284 @@
+"""A2A task utilities for server-side task management."""
+
+from __future__ import annotations
+
+import asyncio
+from collections.abc import Callable, Coroutine
+from functools import wraps
+import logging
+import os
+from typing import TYPE_CHECKING, Any, ParamSpec, TypeVar, cast
+
+from a2a.server.agent_execution import RequestContext
+from a2a.server.events import EventQueue
+from a2a.types import (
+    InternalError,
+    InvalidParamsError,
+    Message,
+    Task as A2ATask,
+    TaskState,
+    TaskStatus,
+    TaskStatusUpdateEvent,
+)
+from a2a.utils import new_agent_text_message, new_text_artifact
+from a2a.utils.errors import ServerError
+from aiocache import SimpleMemoryCache, caches  # type: ignore[import-untyped]
+
+from crewai.events.event_bus import crewai_event_bus
+from crewai.events.types.a2a_events import (
+    A2AServerTaskCanceledEvent,
+    A2AServerTaskCompletedEvent,
+    A2AServerTaskFailedEvent,
+    A2AServerTaskStartedEvent,
+)
+from crewai.task import Task
+
+
+if TYPE_CHECKING:
+    from crewai.agent import Agent
+
+
+logger = logging.getLogger(__name__)
+
+P = ParamSpec("P")
+T = TypeVar("T")
+
+
+def _parse_redis_url(url: str) -> dict[str, Any]:
+    from urllib.parse import urlparse
+
+    parsed = urlparse(url)
+    config: dict[str, Any] = {
+        "cache": "aiocache.RedisCache",
+        "endpoint": parsed.hostname or "localhost",
+        "port": parsed.port or 6379,
+    }
+    if parsed.path and parsed.path != "/":
+        try:
+            config["db"] = int(parsed.path.lstrip("/"))
+        except ValueError:
+            pass
+    if parsed.password:
+        config["password"] = parsed.password
+    return config
+
+
+_redis_url = os.environ.get("REDIS_URL")
+
+caches.set_config(
+    {
+        "default": _parse_redis_url(_redis_url)
+        if _redis_url
+        else {
+            "cache": "aiocache.SimpleMemoryCache",
+        }
+    }
+)
+
+
+def cancellable(
+    fn: Callable[P, Coroutine[Any, Any, T]],
+) -> Callable[P, Coroutine[Any, Any, T]]:
+    """Decorator that enables cancellation for A2A task execution.
+
+    Runs a cancellation watcher concurrently with the wrapped function.
+    When a cancel event is published, the execution is cancelled.
+
+    Args:
+        fn: The async function to wrap.
+
+    Returns:
+        Wrapped function with cancellation support.
+    """
+
+    @wraps(fn)
+    async def wrapper(*args: P.args, **kwargs: P.kwargs) -> T:
+        """Wrap function with cancellation monitoring."""
+        context: RequestContext | None = None
+        for arg in args:
+            if isinstance(arg, RequestContext):
+                context = arg
+                break
+        if context is None:
+            context = cast(RequestContext | None, kwargs.get("context"))
+
+        if context is None:
+            return await fn(*args, **kwargs)
+
+        task_id = context.task_id
+        cache = caches.get("default")
+
+        async def poll_for_cancel() -> bool:
+            """Poll cache for cancellation flag."""
+            while True:
+                if await cache.get(f"cancel:{task_id}"):
+                    return True
+                await asyncio.sleep(0.1)
+
+        async def watch_for_cancel() -> bool:
+            """Watch for cancellation events via pub/sub or polling."""
+            if isinstance(cache, SimpleMemoryCache):
+                return await poll_for_cancel()
+
+            try:
+                client = cache.client
+                pubsub = client.pubsub()
+                await pubsub.subscribe(f"cancel:{task_id}")
+                async for message in pubsub.listen():
+                    if message["type"] == "message":
+                        return True
+            except Exception as e:
+                logger.warning("Cancel watcher error for task_id=%s: %s", task_id, e)
+                return await poll_for_cancel()
+            return False
+
+        execute_task = asyncio.create_task(fn(*args, **kwargs))
+        cancel_watch = asyncio.create_task(watch_for_cancel())
+
+        try:
+            done, _ = await asyncio.wait(
+                [execute_task, cancel_watch],
+                return_when=asyncio.FIRST_COMPLETED,
+            )
+
+            if cancel_watch in done:
+                execute_task.cancel()
+                try:
+                    await execute_task
+                except asyncio.CancelledError:
+                    pass
+                raise asyncio.CancelledError(f"Task {task_id} was cancelled")
+            cancel_watch.cancel()
+            return execute_task.result()
+        finally:
+            await cache.delete(f"cancel:{task_id}")
+
+    return wrapper
+
+
+@cancellable
+async def execute(
+    agent: Agent,
+    context: RequestContext,
+    event_queue: EventQueue,
+) -> None:
+    """Execute an A2A task using a CrewAI agent.
+
+    Args:
+        agent: The CrewAI agent to execute the task.
+        context: The A2A request context containing the user's message.
+        event_queue: The event queue for sending responses back.
+
+    TODOs:
+        * need to impl both of structured output and file inputs, depends on `file_inputs` for
+          `crewai.task.Task`, pass the below two to Task. both utils in `a2a.utils.parts`
+        * structured outputs ingestion, `structured_inputs = get_data_parts(parts=context.message.parts)`
+        * file inputs ingestion, `file_inputs = get_file_parts(parts=context.message.parts)`
+    """
+
+    user_message = context.get_user_input()
+    task_id = context.task_id
+    context_id = context.context_id
+    if task_id is None or context_id is None:
+        msg = "task_id and context_id are required"
+        crewai_event_bus.emit(
+            agent,
+            A2AServerTaskFailedEvent(a2a_task_id="", a2a_context_id="", error=msg),
+        )
+        raise ServerError(InvalidParamsError(message=msg)) from None
+
+    task = Task(
+        description=user_message,
+        expected_output="Response to the user's request",
+        agent=agent,
+    )
+
+    crewai_event_bus.emit(
+        agent,
+        A2AServerTaskStartedEvent(a2a_task_id=task_id, a2a_context_id=context_id),
+    )
+
+    try:
+        result = await agent.aexecute_task(task=task, tools=agent.tools)
+        result_str = str(result)
+        history: list[Message] = [context.message] if context.message else []
+        history.append(new_agent_text_message(result_str, context_id, task_id))
+        await event_queue.enqueue_event(
+            A2ATask(
+                id=task_id,
+                context_id=context_id,
+                status=TaskStatus(state=TaskState.input_required),
+                artifacts=[new_text_artifact(result_str, f"result_{task_id}")],
+                history=history,
+            )
+        )
+        crewai_event_bus.emit(
+            agent,
+            A2AServerTaskCompletedEvent(
+                a2a_task_id=task_id, a2a_context_id=context_id, result=str(result)
+            ),
+        )
+    except asyncio.CancelledError:
+        crewai_event_bus.emit(
+            agent,
+            A2AServerTaskCanceledEvent(a2a_task_id=task_id, a2a_context_id=context_id),
+        )
+        raise
+    except Exception as e:
+        crewai_event_bus.emit(
+            agent,
+            A2AServerTaskFailedEvent(
+                a2a_task_id=task_id, a2a_context_id=context_id, error=str(e)
+            ),
+        )
+        raise ServerError(
+            error=InternalError(message=f"Task execution failed: {e}")
+        ) from e
+
+
+async def cancel(
+    context: RequestContext,
+    event_queue: EventQueue,
+) -> A2ATask | None:
+    """Cancel an A2A task.
+
+    Publishes a cancel event that the cancellable decorator listens for.
+
+    Args:
+        context: The A2A request context containing task information.
+        event_queue: The event queue for sending the cancellation status.
+
+    Returns:
+        The canceled task with updated status.
+    """
+    task_id = context.task_id
+    context_id = context.context_id
+    if task_id is None or context_id is None:
+        raise ServerError(InvalidParamsError(message="task_id and context_id required"))
+
+    if context.current_task and context.current_task.status.state in (
+        TaskState.completed,
+        TaskState.failed,
+        TaskState.canceled,
+    ):
+        return context.current_task
+
+    cache = caches.get("default")
+
+    await cache.set(f"cancel:{task_id}", True, ttl=3600)
+    if not isinstance(cache, SimpleMemoryCache):
+        await cache.client.publish(f"cancel:{task_id}", "cancel")
+
+    await event_queue.enqueue_event(
+        TaskStatusUpdateEvent(
+            task_id=task_id,
+            context_id=context_id,
+            status=TaskStatus(state=TaskState.canceled),
+            final=True,
+        )
+    )
+
+    if context.current_task:
+        context.current_task.status = TaskStatus(state=TaskState.canceled)
+        return context.current_task
+    return None

lib/crewai/src/crewai/a2a/wrapper.py

@@ -15,7 +15,7 @@ from typing import TYPE_CHECKING, Any
 from a2a.types import Role, TaskState
 from pydantic import BaseModel, ValidationError
 
-from crewai.a2a.config import A2AConfig
+from crewai.a2a.config import A2AClientConfig, A2AConfig
 from crewai.a2a.extensions.base import ExtensionRegistry
 from crewai.a2a.task_helpers import TaskStateResult
 from crewai.a2a.templates import (
@@ -26,13 +26,16 @@ from crewai.a2a.templates import (
     UNAVAILABLE_AGENTS_NOTICE_TEMPLATE,
 )
 from crewai.a2a.types import AgentResponseProtocol
-from crewai.a2a.utils import (
-    aexecute_a2a_delegation,
+from crewai.a2a.utils.agent_card import (
     afetch_agent_card,
-    execute_a2a_delegation,
     fetch_agent_card,
-    get_a2a_agents_and_response_model,
+    inject_a2a_server_methods,
 )
+from crewai.a2a.utils.delegation import (
+    aexecute_a2a_delegation,
+    execute_a2a_delegation,
+)
+from crewai.a2a.utils.response_model import get_a2a_agents_and_response_model
 from crewai.events.event_bus import crewai_event_bus
 from crewai.events.types.a2a_events import (
     A2AConversationCompletedEvent,
@@ -122,10 +125,12 @@ def wrap_agent_with_a2a_instance(
         agent, "aexecute_task", MethodType(aexecute_task_with_a2a, agent)
     )
 
+    inject_a2a_server_methods(agent)
+
 
 def _fetch_card_from_config(
-    config: A2AConfig,
-) -> tuple[A2AConfig, AgentCard | Exception]:
+    config: A2AConfig | A2AClientConfig,
+) -> tuple[A2AConfig | A2AClientConfig, AgentCard | Exception]:
     """Fetch agent card from A2A config.
 
     Args:
@@ -146,7 +151,7 @@ def _fetch_card_from_config(
 
 
 def _fetch_agent_cards_concurrently(
-    a2a_agents: list[A2AConfig],
+    a2a_agents: list[A2AConfig | A2AClientConfig],
 ) -> tuple[dict[str, AgentCard], dict[str, str]]:
     """Fetch agent cards concurrently for multiple A2A agents.
 
@@ -181,7 +186,7 @@ def _fetch_agent_cards_concurrently(
 
 def _execute_task_with_a2a(
     self: Agent,
-    a2a_agents: list[A2AConfig],
+    a2a_agents: list[A2AConfig | A2AClientConfig],
     original_fn: Callable[..., str],
     task: Task,
     agent_response_model: type[BaseModel],
@@ -270,7 +275,7 @@ def _execute_task_with_a2a(
 
 
 def _augment_prompt_with_a2a(
-    a2a_agents: list[A2AConfig],
+    a2a_agents: list[A2AConfig | A2AClientConfig],
     task_description: str,
     agent_cards: dict[str, AgentCard],
     conversation_history: list[Message] | None = None,
@@ -523,11 +528,11 @@ def _prepare_delegation_context(
     task: Task,
     original_task_description: str | None,
 ) -> tuple[
-    list[A2AConfig],
+    list[A2AConfig | A2AClientConfig],
     type[BaseModel],
     str,
     str,
-    A2AConfig,
+    A2AConfig | A2AClientConfig,
     str | None,
     str | None,
     dict[str, Any] | None,
@@ -591,7 +596,7 @@ def _handle_task_completion(
     task: Task,
     task_id_config: str | None,
     reference_task_ids: list[str],
-    agent_config: A2AConfig,
+    agent_config: A2AConfig | A2AClientConfig,
     turn_num: int,
 ) -> tuple[str | None, str | None, list[str]]:
     """Handle task completion state including reference task updates.
@@ -631,7 +636,7 @@ def _handle_agent_response_and_continue(
     a2a_result: TaskStateResult,
     agent_id: str,
     agent_cards: dict[str, AgentCard] | None,
-    a2a_agents: list[A2AConfig],
+    a2a_agents: list[A2AConfig | A2AClientConfig],
     original_task_description: str,
     conversation_history: list[Message],
     turn_num: int,
@@ -771,6 +776,7 @@ def _delegate_to_a2a(
                 response_model=agent_config.response_model,
                 turn_number=turn_num + 1,
                 updates=agent_config.updates,
+                transport_protocol=agent_config.transport_protocol,
             )
 
             conversation_history = a2a_result.get("history", [])
@@ -867,8 +873,8 @@ def _delegate_to_a2a(
 
 
 async def _afetch_card_from_config(
-    config: A2AConfig,
-) -> tuple[A2AConfig, AgentCard | Exception]:
+    config: A2AConfig | A2AClientConfig,
+) -> tuple[A2AConfig | A2AClientConfig, AgentCard | Exception]:
     """Fetch agent card from A2A config asynchronously."""
     try:
         card = await afetch_agent_card(
@@ -882,7 +888,7 @@ async def _afetch_card_from_config(
 
 
 async def _afetch_agent_cards_concurrently(
-    a2a_agents: list[A2AConfig],
+    a2a_agents: list[A2AConfig | A2AClientConfig],
 ) -> tuple[dict[str, AgentCard], dict[str, str]]:
     """Fetch agent cards concurrently for multiple A2A agents using asyncio."""
     agent_cards: dict[str, AgentCard] = {}
@@ -907,7 +913,7 @@ async def _afetch_agent_cards_concurrently(
 
 async def _aexecute_task_with_a2a(
     self: Agent,
-    a2a_agents: list[A2AConfig],
+    a2a_agents: list[A2AConfig | A2AClientConfig],
     original_fn: Callable[..., Coroutine[Any, Any, str]],
     task: Task,
     agent_response_model: type[BaseModel],
@@ -986,7 +992,7 @@ async def _ahandle_agent_response_and_continue(
     a2a_result: TaskStateResult,
     agent_id: str,
     agent_cards: dict[str, AgentCard] | None,
-    a2a_agents: list[A2AConfig],
+    a2a_agents: list[A2AConfig | A2AClientConfig],
     original_task_description: str,
     conversation_history: list[Message],
     turn_num: int,
@@ -1085,6 +1091,7 @@ async def _adelegate_to_a2a(
                 agent_branch=agent_branch,
                 response_model=agent_config.response_model,
                 turn_number=turn_num + 1,
+                transport_protocol=agent_config.transport_protocol,
                 updates=agent_config.updates,
             )
 

lib/crewai/src/crewai/agent/core.py

@@ -17,7 +17,6 @@ from urllib.parse import urlparse
 from pydantic import BaseModel, Field, InstanceOf, PrivateAttr, model_validator
 from typing_extensions import Self
 
-from crewai.a2a.config import A2AConfig
 from crewai.agent.utils import (
     ahandle_knowledge_retrieval,
     apply_training_data,
@@ -73,11 +72,19 @@ from crewai.utilities.constants import TRAINED_AGENTS_DATA_FILE, TRAINING_DATA_F
 from crewai.utilities.converter import Converter
 from crewai.utilities.guardrail_types import GuardrailType
 from crewai.utilities.llm_utils import create_llm
-from crewai.utilities.prompts import Prompts
+from crewai.utilities.prompts import Prompts, StandardPromptResult, SystemPromptResult
 from crewai.utilities.token_counter_callback import TokenCalcHandler
 from crewai.utilities.training_handler import CrewTrainingHandler
 
 
+try:
+    from crewai.a2a.config import A2AClientConfig, A2AConfig, A2AServerConfig
+except ImportError:
+    A2AClientConfig = Any
+    A2AConfig = Any
+    A2AServerConfig = Any
+
+
 if TYPE_CHECKING:
     from crewai_tools import CodeInterpreterTool
 
@@ -218,9 +225,18 @@ class Agent(BaseAgent):
     guardrail_max_retries: int = Field(
         default=3, description="Maximum number of retries when guardrail fails"
     )
-    a2a: list[A2AConfig] | A2AConfig | None = Field(
+    a2a: (
+        list[A2AConfig | A2AServerConfig | A2AClientConfig]
+        | A2AConfig
+        | A2AServerConfig
+        | A2AClientConfig
+        | None
+    ) = Field(
         default=None,
-        description="A2A (Agent-to-Agent) configuration for delegating tasks to remote agents. Can be a single A2AConfig or a dict mapping agent IDs to configs.",
+        description="""
+        A2A (Agent-to-Agent) configuration for delegating tasks to remote agents.
+        Can be a single A2AConfig/A2AClientConfig/A2AServerConfig, or a list of any number of A2AConfig/A2AClientConfig with a single A2AServerConfig.
+        """,
     )
     executor_class: type[CrewAgentExecutor] | type[CrewAgentExecutorFlow] = Field(
         default=CrewAgentExecutor,
@@ -733,7 +749,7 @@ class Agent(BaseAgent):
         if self.agent_executor is not None:
             self._update_executor_parameters(
                 task=task,
-                tools=parsed_tools,
+                tools=parsed_tools,  # type: ignore[arg-type]
                 raw_tools=raw_tools,
                 prompt=prompt,
                 stop_words=stop_words,
@@ -742,7 +758,7 @@ class Agent(BaseAgent):
         else:
             self.agent_executor = self.executor_class(
                 llm=cast(BaseLLM, self.llm),
-                task=task,
+                task=task,  # type: ignore[arg-type]
                 i18n=self.i18n,
                 agent=self,
                 crew=self.crew,
@@ -765,11 +781,11 @@ class Agent(BaseAgent):
     def _update_executor_parameters(
         self,
         task: Task | None,
-        tools: list,
+        tools: list[BaseTool],
         raw_tools: list[BaseTool],
-        prompt: dict,
+        prompt: SystemPromptResult | StandardPromptResult,
         stop_words: list[str],
-        rpm_limit_fn: Callable | None,
+        rpm_limit_fn: Callable | None,  # type: ignore[type-arg]
     ) -> None:
         """Update executor parameters without recreating instance.
 

lib/crewai/src/crewai/cli/authentication/providers/keycloak.py

@@ -0,0 +1,32 @@
+from crewai.cli.authentication.providers.base_provider import BaseProvider
+
+
+class KeycloakProvider(BaseProvider):
+    def get_authorize_url(self) -> str:
+        return f"{self._oauth2_base_url()}/realms/{self.settings.extra.get('realm')}/protocol/openid-connect/auth/device"
+
+    def get_token_url(self) -> str:
+        return f"{self._oauth2_base_url()}/realms/{self.settings.extra.get('realm')}/protocol/openid-connect/token"
+
+    def get_jwks_url(self) -> str:
+        return f"{self._oauth2_base_url()}/realms/{self.settings.extra.get('realm')}/protocol/openid-connect/certs"
+
+    def get_issuer(self) -> str:
+        return f"{self._oauth2_base_url()}/realms/{self.settings.extra.get('realm')}"
+
+    def get_audience(self) -> str:
+        return self.settings.audience or "no-audience-provided"
+
+    def get_client_id(self) -> str:
+        if self.settings.client_id is None:
+            raise ValueError(
+                "Client ID is required. Please set it in the configuration."
+            )
+        return self.settings.client_id
+
+    def get_required_fields(self) -> list[str]:
+        return ["realm"]
+
+    def _oauth2_base_url(self) -> str:
+        domain = self.settings.domain.removeprefix("https://").removeprefix("http://")
+        return f"https://{domain}"

lib/crewai/src/crewai/cli/templates/crew/pyproject.toml

@@ -5,7 +5,7 @@ description = "{{name}} using crewAI"
 authors = [{ name = "Your Name", email = "you@example.com" }]
 requires-python = ">=3.10,<3.14"
 dependencies = [
-    "crewai[tools]==1.8.0"
+    "crewai[tools]==1.8.1"
 ]
 
 [project.scripts]

lib/crewai/src/crewai/cli/templates/flow/pyproject.toml

@@ -5,7 +5,7 @@ description = "{{name}} using crewAI"
 authors = [{ name = "Your Name", email = "you@example.com" }]
 requires-python = ">=3.10,<3.14"
 dependencies = [
-    "crewai[tools]==1.8.0"
+    "crewai[tools]==1.8.1"
 ]
 
 [project.scripts]

lib/crewai/src/crewai/events/event_types.py

@@ -1,3 +1,20 @@
+from crewai.events.types.a2a_events import (
+    A2AConversationCompletedEvent,
+    A2AConversationStartedEvent,
+    A2ADelegationCompletedEvent,
+    A2ADelegationStartedEvent,
+    A2AMessageSentEvent,
+    A2APollingStartedEvent,
+    A2APollingStatusEvent,
+    A2APushNotificationReceivedEvent,
+    A2APushNotificationRegisteredEvent,
+    A2APushNotificationTimeoutEvent,
+    A2AResponseReceivedEvent,
+    A2AServerTaskCanceledEvent,
+    A2AServerTaskCompletedEvent,
+    A2AServerTaskFailedEvent,
+    A2AServerTaskStartedEvent,
+)
 from crewai.events.types.agent_events import (
     AgentExecutionCompletedEvent,
     AgentExecutionErrorEvent,
@@ -76,7 +93,22 @@ from crewai.events.types.tool_usage_events import (
 
 
 EventTypes = (
-    CrewKickoffStartedEvent
+    A2AConversationCompletedEvent
+    | A2AConversationStartedEvent
+    | A2ADelegationCompletedEvent
+    | A2ADelegationStartedEvent
+    | A2AMessageSentEvent
+    | A2APollingStartedEvent
+    | A2APollingStatusEvent
+    | A2APushNotificationReceivedEvent
+    | A2APushNotificationRegisteredEvent
+    | A2APushNotificationTimeoutEvent
+    | A2AResponseReceivedEvent
+    | A2AServerTaskCanceledEvent
+    | A2AServerTaskCompletedEvent
+    | A2AServerTaskFailedEvent
+    | A2AServerTaskStartedEvent
+    | CrewKickoffStartedEvent
     | CrewKickoffCompletedEvent
     | CrewKickoffFailedEvent
     | CrewTestStartedEvent

lib/crewai/src/crewai/events/types/a2a_events.py

@@ -210,3 +210,37 @@ class A2APushNotificationTimeoutEvent(A2AEventBase):
     type: str = "a2a_push_notification_timeout"
     task_id: str
     timeout_seconds: float
+
+
+class A2AServerTaskStartedEvent(A2AEventBase):
+    """Event emitted when an A2A server task execution starts."""
+
+    type: str = "a2a_server_task_started"
+    a2a_task_id: str
+    a2a_context_id: str
+
+
+class A2AServerTaskCompletedEvent(A2AEventBase):
+    """Event emitted when an A2A server task execution completes."""
+
+    type: str = "a2a_server_task_completed"
+    a2a_task_id: str
+    a2a_context_id: str
+    result: str
+
+
+class A2AServerTaskCanceledEvent(A2AEventBase):
+    """Event emitted when an A2A server task execution is canceled."""
+
+    type: str = "a2a_server_task_canceled"
+    a2a_task_id: str
+    a2a_context_id: str
+
+
+class A2AServerTaskFailedEvent(A2AEventBase):
+    """Event emitted when an A2A server task execution fails."""
+
+    type: str = "a2a_server_task_failed"
+    a2a_task_id: str
+    a2a_context_id: str
+    error: str

lib/crewai/src/crewai/flow/flow_trackable.py

@@ -1,4 +1,5 @@
 import inspect
+from typing import Any
 
 from pydantic import BaseModel, Field, InstanceOf, model_validator
 from typing_extensions import Self
@@ -14,14 +15,14 @@ class FlowTrackable(BaseModel):
     inspecting the call stack.
     """
 
-    parent_flow: InstanceOf[Flow] | None = Field(
+    parent_flow: InstanceOf[Flow[Any]] | None = Field(
         default=None,
         description="The parent flow of the instance, if it was created inside a flow.",
     )
 
     @model_validator(mode="after")
     def _set_parent_flow(self) -> Self:
-        max_depth = 5
+        max_depth = 8
         frame = inspect.currentframe()
 
         try:

lib/crewai/src/crewai/llms/providers/azure/completion.py

@@ -443,7 +443,7 @@ class AzureCompletion(BaseLLM):
             params["presence_penalty"] = self.presence_penalty
         if self.max_tokens is not None:
             params["max_tokens"] = self.max_tokens
-        if self.stop:
+        if self.stop and self.supports_stop_words():
             params["stop"] = self.stop
 
         # Handle tools/functions for Azure OpenAI models
@@ -931,8 +931,28 @@ class AzureCompletion(BaseLLM):
         return self.is_openai_model
 
     def supports_stop_words(self) -> bool:
-        """Check if the model supports stop words."""
-        return True  # Most Azure models support stop sequences
+        """Check if the model supports stop words.
+
+        Models using the Responses API (GPT-5 family, o-series reasoning models,
+        computer-use-preview) do not support stop sequences.
+        See: https://learn.microsoft.com/en-us/azure/ai-foundry/foundry-models/concepts/models-sold-directly-by-azure
+        """
+        model_lower = self.model.lower() if self.model else ""
+
+        if "gpt-5" in model_lower:
+            return False
+
+        o_series_models = ["o1", "o3", "o4", "o1-mini", "o3-mini", "o4-mini"]
+
+        responses_api_models = ["computer-use-preview"]
+
+        unsupported_stop_models = o_series_models + responses_api_models
+
+        for unsupported in unsupported_stop_models:
+            if unsupported in model_lower:
+                return False
+
+        return True
 
     def get_context_window_size(self) -> int:
         """Get the context window size for the model."""

lib/crewai/src/crewai/llms/providers/gemini/completion.py

@@ -54,15 +54,21 @@ class GeminiCompletion(BaseLLM):
         safety_settings: dict[str, Any] | None = None,
         client_params: dict[str, Any] | None = None,
         interceptor: BaseInterceptor[Any, Any] | None = None,
+        use_vertexai: bool | None = None,
         **kwargs: Any,
     ):
         """Initialize Google Gemini chat completion client.
 
         Args:
             model: Gemini model name (e.g., 'gemini-2.0-flash-001', 'gemini-1.5-pro')
-            api_key: Google API key (defaults to GOOGLE_API_KEY or GEMINI_API_KEY env var)
-            project: Google Cloud project ID (for Vertex AI)
-            location: Google Cloud location (for Vertex AI, defaults to 'us-central1')
+            api_key: Google API key for Gemini API authentication.
+                    Defaults to GOOGLE_API_KEY or GEMINI_API_KEY env var.
+                    NOTE: Cannot be used with Vertex AI (project parameter). Use Gemini API instead.
+            project: Google Cloud project ID for Vertex AI with ADC authentication.
+                    Requires Application Default Credentials (gcloud auth application-default login).
+                    NOTE: Vertex AI does NOT support API keys, only OAuth2/ADC.
+                    If both api_key and project are set, api_key takes precedence.
+            location: Google Cloud location (for Vertex AI with ADC, defaults to 'us-central1')
             temperature: Sampling temperature (0-2)
             top_p: Nucleus sampling parameter
             top_k: Top-k sampling parameter
@@ -73,6 +79,12 @@ class GeminiCompletion(BaseLLM):
             client_params: Additional parameters to pass to the Google Gen AI Client constructor.
                           Supports parameters like http_options, credentials, debug_config, etc.
             interceptor: HTTP interceptor (not yet supported for Gemini).
+            use_vertexai: Whether to use Vertex AI instead of Gemini API.
+                         - True: Use Vertex AI (with ADC or Express mode with API key)
+                         - False: Use Gemini API (explicitly override env var)
+                         - None (default): Check GOOGLE_GENAI_USE_VERTEXAI env var
+                         When using Vertex AI with API key (Express mode), http_options with
+                         api_version="v1" is automatically configured.
             **kwargs: Additional parameters
         """
         if interceptor is not None:
@@ -95,7 +107,8 @@ class GeminiCompletion(BaseLLM):
         self.project = project or os.getenv("GOOGLE_CLOUD_PROJECT")
         self.location = location or os.getenv("GOOGLE_CLOUD_LOCATION") or "us-central1"
 
-        use_vertexai = os.getenv("GOOGLE_GENAI_USE_VERTEXAI", "").lower() == "true"
+        if use_vertexai is None:
+            use_vertexai = os.getenv("GOOGLE_GENAI_USE_VERTEXAI", "").lower() == "true"
 
         self.client = self._initialize_client(use_vertexai)
 
@@ -146,13 +159,34 @@ class GeminiCompletion(BaseLLM):
 
         Returns:
             Initialized Google Gen AI Client
+
+        Note:
+            Google Gen AI SDK has two distinct endpoints with different auth requirements:
+            - Gemini API (generativelanguage.googleapis.com): Supports API key authentication
+            - Vertex AI (aiplatform.googleapis.com): Only supports OAuth2/ADC, NO API keys
+
+            When vertexai=True is set, it routes to aiplatform.googleapis.com which rejects
+            API keys. Use Gemini API endpoint for API key authentication instead.
         """
         client_params = {}
 
         if self.client_params:
             client_params.update(self.client_params)
 
-        if use_vertexai or self.project:
+        # Determine authentication mode based on available credentials
+        has_api_key = bool(self.api_key)
+        has_project = bool(self.project)
+
+        if has_api_key and has_project:
+            logging.warning(
+                "Both API key and project provided. Using API key authentication. "
+                "Project/location parameters are ignored when using API keys. "
+                "To use Vertex AI with ADC, remove the api_key parameter."
+            )
+            has_project = False
+
+        # Vertex AI with ADC (project without API key)
+        if (use_vertexai or has_project) and not has_api_key:
             client_params.update(
                 {
                     "vertexai": True,
@@ -161,12 +195,20 @@ class GeminiCompletion(BaseLLM):
                 }
             )
 
-            client_params.pop("api_key", None)
-
-        elif self.api_key:
+        # API key authentication (works with both Gemini API and Vertex AI Express)
+        elif has_api_key:
             client_params["api_key"] = self.api_key
 
-            client_params.pop("vertexai", None)
+            # Vertex AI Express mode: API key + vertexai=True + http_options with api_version="v1"
+            # See: https://cloud.google.com/vertex-ai/generative-ai/docs/start/quickstart?usertype=apikey
+            if use_vertexai:
+                client_params["vertexai"] = True
+                client_params["http_options"] = types.HttpOptions(api_version="v1")
+            else:
+                # This ensures we use the Gemini API (generativelanguage.googleapis.com)
+                client_params["vertexai"] = False
+
+            # Clean up project/location (not allowed with API key)
             client_params.pop("project", None)
             client_params.pop("location", None)
 
@@ -175,10 +217,13 @@ class GeminiCompletion(BaseLLM):
                 return genai.Client(**client_params)
             except Exception as e:
                 raise ValueError(
-                    "Either GOOGLE_API_KEY/GEMINI_API_KEY (for Gemini API) or "
-                    "GOOGLE_CLOUD_PROJECT (for Vertex AI) must be set"
+                    "Authentication required. Provide one of:\n"
+                    "  1. API key via GOOGLE_API_KEY or GEMINI_API_KEY environment variable\n"
+                    "     (use_vertexai=True is optional for Vertex AI with API key)\n"
+                    "  2. For Vertex AI with ADC: Set GOOGLE_CLOUD_PROJECT and run:\n"
+                    "     gcloud auth application-default login\n"
+                    "  3. Pass api_key parameter directly to LLM constructor\n"
                 ) from e
-
         return genai.Client(**client_params)
 
     def _get_client_params(self) -> dict[str, Any]:
@@ -202,6 +247,8 @@ class GeminiCompletion(BaseLLM):
                     "location": self.location,
                 }
             )
+            if self.api_key:
+                params["api_key"] = self.api_key
         elif self.api_key:
             params["api_key"] = self.api_key
 

lib/crewai/src/crewai/tools/__init__.py

@@ -1,12 +1,9 @@
 from crewai.tools.base_tool import BaseTool, EnvVar, tool
-from crewai.tools.tool_search_tool import SearchStrategy, ToolSearchTool
 
 
 
 __all__ = [
     "BaseTool",
     "EnvVar",
-    "SearchStrategy",
-    "ToolSearchTool",
     "tool",
 ]

lib/crewai/src/crewai/tools/tool_search_tool.py

@@ -1,333 +0,0 @@
-"""Tool Search Tool for on-demand tool discovery.
-
-This module implements a Tool Search Tool that allows agents to dynamically
-discover and load tools on-demand, reducing token consumption when working
-with large tool libraries.
-
-Inspired by Anthropic's Tool Search Tool approach for on-demand tool loading.
-"""
-
-from __future__ import annotations
-
-from collections.abc import Callable, Sequence
-from enum import Enum
-import json
-import re
-from typing import Any
-
-from pydantic import BaseModel, Field
-
-from crewai.tools.base_tool import BaseTool
-from crewai.tools.structured_tool import CrewStructuredTool
-from crewai.utilities.pydantic_schema_utils import generate_model_description
-
-
-class SearchStrategy(str, Enum):
-    """Search strategy for tool discovery."""
-
-    KEYWORD = "keyword"
-    REGEX = "regex"
-
-
-class ToolSearchResult(BaseModel):
-    """Result from a tool search operation."""
-
-    name: str = Field(description="The name of the tool")
-    description: str = Field(description="The description of the tool")
-    args_schema: dict[str, Any] = Field(
-        description="The JSON schema for the tool's arguments"
-    )
-
-
-class ToolSearchToolSchema(BaseModel):
-    """Schema for the Tool Search Tool arguments."""
-
-    query: str = Field(
-        description="The search query to find relevant tools. Use keywords that describe the capability you need."
-    )
-    max_results: int = Field(
-        default=5,
-        description="Maximum number of tools to return. Default is 5.",
-        ge=1,
-        le=20,
-    )
-
-
-class ToolSearchTool(BaseTool):
-    """A tool that searches through a catalog of tools to find relevant ones.
-
-    This tool enables on-demand tool discovery, allowing agents to work with
-    large tool libraries without loading all tool definitions upfront. Instead
-    of consuming tokens with all tool definitions, the agent can search for
-    relevant tools when needed.
-
-    Example:
-        ```python
-        from crewai.tools import BaseTool, ToolSearchTool
-
-        # Create your tools
-        search_tool = MySearchTool()
-        scrape_tool = MyScrapeWebsiteTool()
-        database_tool = MyDatabaseTool()
-
-        # Create a tool search tool with your tool catalog
-        tool_search = ToolSearchTool(
-            tool_catalog=[search_tool, scrape_tool, database_tool],
-            search_strategy=SearchStrategy.KEYWORD,
-        )
-
-        # Use with an agent - only the tool_search is loaded initially
-        agent = Agent(
-            role="Researcher",
-            tools=[tool_search],  # Other tools discovered on-demand
-        )
-        ```
-
-    Attributes:
-        tool_catalog: List of tools available for search.
-        search_strategy: Strategy to use for searching (keyword or regex).
-        custom_search_fn: Optional custom search function for advanced matching.
-    """
-
-    name: str = Field(
-        default="Tool Search",
-        description="The name of the tool search tool.",
-    )
-    description: str = Field(
-        default="Search for available tools by describing the capability you need. Returns tool definitions that match your query.",
-        description="Description of what the tool search tool does.",
-    )
-    args_schema: type[BaseModel] = Field(
-        default=ToolSearchToolSchema,
-        description="The schema for the tool search arguments.",
-    )
-    tool_catalog: list[BaseTool | CrewStructuredTool] = Field(
-        default_factory=list,
-        description="List of tools available for search.",
-    )
-    search_strategy: SearchStrategy = Field(
-        default=SearchStrategy.KEYWORD,
-        description="Strategy to use for searching tools.",
-    )
-    custom_search_fn: Callable[
-        [str, Sequence[BaseTool | CrewStructuredTool]], list[BaseTool | CrewStructuredTool]
-    ] | None = Field(
-        default=None,
-        description="Optional custom search function for advanced matching.",
-    )
-
-    def _run(self, query: str, max_results: int = 5) -> str:
-        """Search for tools matching the query.
-
-        Args:
-            query: The search query to find relevant tools.
-            max_results: Maximum number of tools to return.
-
-        Returns:
-            JSON string containing the matching tool definitions.
-        """
-        if not self.tool_catalog:
-            return json.dumps(
-                {
-                    "status": "error",
-                    "message": "No tools available in the catalog.",
-                    "tools": [],
-                }
-            )
-
-        if self.custom_search_fn:
-            matching_tools = self.custom_search_fn(query, self.tool_catalog)
-        elif self.search_strategy == SearchStrategy.REGEX:
-            matching_tools = self._regex_search(query)
-        else:
-            matching_tools = self._keyword_search(query)
-
-        matching_tools = matching_tools[:max_results]
-
-        if not matching_tools:
-            return json.dumps(
-                {
-                    "status": "no_results",
-                    "message": f"No tools found matching query: '{query}'. Try different keywords.",
-                    "tools": [],
-                }
-            )
-
-        tool_results = []
-        for tool in matching_tools:
-            tool_info = self._get_tool_info(tool)
-            tool_results.append(tool_info)
-
-        return json.dumps(
-            {
-                "status": "success",
-                "message": f"Found {len(tool_results)} tool(s) matching your query.",
-                "tools": tool_results,
-            },
-            indent=2,
-        )
-
-    def _keyword_search(
-        self, query: str
-    ) -> list[BaseTool | CrewStructuredTool]:
-        """Search tools using keyword matching.
-
-        Args:
-            query: The search query.
-
-        Returns:
-            List of matching tools sorted by relevance.
-        """
-        query_lower = query.lower()
-        query_words = set(query_lower.split())
-
-        scored_tools: list[tuple[float, BaseTool | CrewStructuredTool]] = []
-
-        for tool in self.tool_catalog:
-            score = self._calculate_keyword_score(tool, query_lower, query_words)
-            if score > 0:
-                scored_tools.append((score, tool))
-
-        scored_tools.sort(key=lambda x: x[0], reverse=True)
-        return [tool for _, tool in scored_tools]
-
-    def _calculate_keyword_score(
-        self,
-        tool: BaseTool | CrewStructuredTool,
-        query_lower: str,
-        query_words: set[str],
-    ) -> float:
-        """Calculate relevance score for a tool based on keyword matching.
-
-        Args:
-            tool: The tool to score.
-            query_lower: Lowercase query string.
-            query_words: Set of query words.
-
-        Returns:
-            Relevance score (higher is better).
-        """
-        score = 0.0
-        tool_name_lower = tool.name.lower()
-        tool_desc_lower = tool.description.lower()
-
-        if query_lower in tool_name_lower:
-            score += 10.0
-        if query_lower in tool_desc_lower:
-            score += 5.0
-
-        for word in query_words:
-            if len(word) < 2:
-                continue
-            if word in tool_name_lower:
-                score += 3.0
-            if word in tool_desc_lower:
-                score += 1.0
-
-        return score
-
-    def _regex_search(
-        self, query: str
-    ) -> list[BaseTool | CrewStructuredTool]:
-        """Search tools using regex pattern matching.
-
-        Args:
-            query: The regex pattern to search for.
-
-        Returns:
-            List of matching tools.
-        """
-        try:
-            pattern = re.compile(query, re.IGNORECASE)
-        except re.error:
-            pattern = re.compile(re.escape(query), re.IGNORECASE)
-
-        return [
-            tool
-            for tool in self.tool_catalog
-            if pattern.search(tool.name) or pattern.search(tool.description)
-        ]
-
-    def _get_tool_info(self, tool: BaseTool | CrewStructuredTool) -> dict[str, Any]:
-        """Get tool information as a dictionary.
-
-        Args:
-            tool: The tool to get information from.
-
-        Returns:
-            Dictionary containing tool name, description, and args schema.
-        """
-        if isinstance(tool, BaseTool):
-            schema_dict = generate_model_description(tool.args_schema)
-            args_schema = schema_dict.get("json_schema", {}).get("schema", {})
-        else:
-            args_schema = tool.args_schema.model_json_schema()
-
-        return {
-            "name": tool.name,
-            "description": self._get_original_description(tool),
-            "args_schema": args_schema,
-        }
-
-    def _get_original_description(self, tool: BaseTool | CrewStructuredTool) -> str:
-        """Get the original description of a tool without the generated schema.
-
-        Args:
-            tool: The tool to get the description from.
-
-        Returns:
-            The original tool description.
-        """
-        description = tool.description
-        if "Tool Description:" in description:
-            parts = description.split("Tool Description:")
-            if len(parts) > 1:
-                return parts[1].strip()
-        return description
-
-    def add_tool(self, tool: BaseTool | CrewStructuredTool) -> None:
-        """Add a tool to the catalog.
-
-        Args:
-            tool: The tool to add.
-        """
-        self.tool_catalog.append(tool)
-
-    def add_tools(self, tools: Sequence[BaseTool | CrewStructuredTool]) -> None:
-        """Add multiple tools to the catalog.
-
-        Args:
-            tools: The tools to add.
-        """
-        self.tool_catalog.extend(tools)
-
-    def remove_tool(self, tool_name: str) -> bool:
-        """Remove a tool from the catalog by name.
-
-        Args:
-            tool_name: The name of the tool to remove.
-
-        Returns:
-            True if the tool was removed, False if not found.
-        """
-        for i, tool in enumerate(self.tool_catalog):
-            if tool.name == tool_name:
-                self.tool_catalog.pop(i)
-                return True
-        return False
-
-    def get_catalog_size(self) -> int:
-        """Get the number of tools in the catalog.
-
-        Returns:
-            The number of tools in the catalog.
-        """
-        return len(self.tool_catalog)
-
-    def list_tool_names(self) -> list[str]:
-        """List all tool names in the catalog.
-
-        Returns:
-            List of tool names.
-        """
-        return [tool.name for tool in self.tool_catalog]

lib/crewai/src/crewai/types/utils.py

@@ -1,8 +1,6 @@
 """Utilities for creating and manipulating types."""
 
-from typing import Annotated, Final, Literal
-
-from typing_extensions import TypeAliasType
+from typing import Annotated, Final, Literal, cast
 
 
 _DYNAMIC_LITERAL_ALIAS: Final[Literal["DynamicLiteral"]] = "DynamicLiteral"
@@ -20,6 +18,11 @@ def create_literals_from_strings(
 
     Returns:
         Literal type for each A2A agent ID
+
+    Raises:
+        ValueError: If values is empty (Literal requires at least one value)
     """
     unique_values: tuple[str, ...] = tuple(dict.fromkeys(values))
-    return Literal.__getitem__(unique_values)
+    if not unique_values:
+        raise ValueError("Cannot create Literal type from empty values")
+    return cast(type, Literal.__getitem__(unique_values))

lib/crewai/tests/a2a/utils/test_agent_card.py

@@ -0,0 +1,325 @@
+"""Tests for A2A agent card utilities."""
+
+from __future__ import annotations
+
+from a2a.types import AgentCard, AgentSkill
+
+from crewai import Agent
+from crewai.a2a.config import A2AClientConfig, A2AServerConfig
+from crewai.a2a.utils.agent_card import inject_a2a_server_methods
+
+
+class TestInjectA2AServerMethods:
+    """Tests for inject_a2a_server_methods function."""
+
+    def test_agent_with_server_config_gets_to_agent_card_method(self) -> None:
+        """Agent with A2AServerConfig should have to_agent_card method injected."""
+        agent = Agent(
+            role="Test Agent",
+            goal="Test goal",
+            backstory="Test backstory",
+            a2a=A2AServerConfig(),
+        )
+
+        assert hasattr(agent, "to_agent_card")
+        assert callable(agent.to_agent_card)
+
+    def test_agent_without_server_config_no_injection(self) -> None:
+        """Agent without A2AServerConfig should not get to_agent_card method."""
+        agent = Agent(
+            role="Test Agent",
+            goal="Test goal",
+            backstory="Test backstory",
+            a2a=A2AClientConfig(endpoint="http://example.com"),
+        )
+
+        assert not hasattr(agent, "to_agent_card")
+
+    def test_agent_without_a2a_no_injection(self) -> None:
+        """Agent without any a2a config should not get to_agent_card method."""
+        agent = Agent(
+            role="Test Agent",
+            goal="Test goal",
+            backstory="Test backstory",
+        )
+
+        assert not hasattr(agent, "to_agent_card")
+
+    def test_agent_with_mixed_configs_gets_injection(self) -> None:
+        """Agent with list containing A2AServerConfig should get to_agent_card."""
+        agent = Agent(
+            role="Test Agent",
+            goal="Test goal",
+            backstory="Test backstory",
+            a2a=[
+                A2AClientConfig(endpoint="http://example.com"),
+                A2AServerConfig(name="My Agent"),
+            ],
+        )
+
+        assert hasattr(agent, "to_agent_card")
+        assert callable(agent.to_agent_card)
+
+    def test_manual_injection_on_plain_agent(self) -> None:
+        """inject_a2a_server_methods should work when called manually."""
+        agent = Agent(
+            role="Test Agent",
+            goal="Test goal",
+            backstory="Test backstory",
+        )
+        # Manually set server config and inject
+        object.__setattr__(agent, "a2a", A2AServerConfig())
+        inject_a2a_server_methods(agent)
+
+        assert hasattr(agent, "to_agent_card")
+        assert callable(agent.to_agent_card)
+
+
+class TestToAgentCard:
+    """Tests for the injected to_agent_card method."""
+
+    def test_returns_agent_card(self) -> None:
+        """to_agent_card should return an AgentCard instance."""
+        agent = Agent(
+            role="Test Agent",
+            goal="Test goal",
+            backstory="Test backstory",
+            a2a=A2AServerConfig(),
+        )
+
+        card = agent.to_agent_card("http://localhost:8000")
+
+        assert isinstance(card, AgentCard)
+
+    def test_uses_agent_role_as_name(self) -> None:
+        """AgentCard name should default to agent role."""
+        agent = Agent(
+            role="Data Analyst",
+            goal="Analyze data",
+            backstory="Expert analyst",
+            a2a=A2AServerConfig(),
+        )
+
+        card = agent.to_agent_card("http://localhost:8000")
+
+        assert card.name == "Data Analyst"
+
+    def test_uses_server_config_name(self) -> None:
+        """AgentCard name should prefer A2AServerConfig.name over role."""
+        agent = Agent(
+            role="Data Analyst",
+            goal="Analyze data",
+            backstory="Expert analyst",
+            a2a=A2AServerConfig(name="Custom Agent Name"),
+        )
+
+        card = agent.to_agent_card("http://localhost:8000")
+
+        assert card.name == "Custom Agent Name"
+
+    def test_uses_goal_as_description(self) -> None:
+        """AgentCard description should include agent goal."""
+        agent = Agent(
+            role="Test Agent",
+            goal="Accomplish important tasks",
+            backstory="Has extensive experience",
+            a2a=A2AServerConfig(),
+        )
+
+        card = agent.to_agent_card("http://localhost:8000")
+
+        assert "Accomplish important tasks" in card.description
+
+    def test_uses_server_config_description(self) -> None:
+        """AgentCard description should prefer A2AServerConfig.description."""
+        agent = Agent(
+            role="Test Agent",
+            goal="Accomplish important tasks",
+            backstory="Has extensive experience",
+            a2a=A2AServerConfig(description="Custom description"),
+        )
+
+        card = agent.to_agent_card("http://localhost:8000")
+
+        assert card.description == "Custom description"
+
+    def test_uses_provided_url(self) -> None:
+        """AgentCard url should use the provided URL."""
+        agent = Agent(
+            role="Test Agent",
+            goal="Test goal",
+            backstory="Test backstory",
+            a2a=A2AServerConfig(),
+        )
+
+        card = agent.to_agent_card("http://my-server.com:9000")
+
+        assert card.url == "http://my-server.com:9000"
+
+    def test_uses_server_config_url(self) -> None:
+        """AgentCard url should prefer A2AServerConfig.url over provided URL."""
+        agent = Agent(
+            role="Test Agent",
+            goal="Test goal",
+            backstory="Test backstory",
+            a2a=A2AServerConfig(url="http://configured-url.com"),
+        )
+
+        card = agent.to_agent_card("http://fallback-url.com")
+
+        assert card.url == "http://configured-url.com/"
+
+    def test_generates_default_skill(self) -> None:
+        """AgentCard should have at least one skill based on agent role."""
+        agent = Agent(
+            role="Research Assistant",
+            goal="Help with research",
+            backstory="Skilled researcher",
+            a2a=A2AServerConfig(),
+        )
+
+        card = agent.to_agent_card("http://localhost:8000")
+
+        assert len(card.skills) >= 1
+        skill = card.skills[0]
+        assert skill.name == "Research Assistant"
+        assert skill.description == "Help with research"
+
+    def test_uses_server_config_skills(self) -> None:
+        """AgentCard skills should prefer A2AServerConfig.skills."""
+        custom_skill = AgentSkill(
+            id="custom-skill",
+            name="Custom Skill",
+            description="A custom skill",
+            tags=["custom"],
+        )
+        agent = Agent(
+            role="Test Agent",
+            goal="Test goal",
+            backstory="Test backstory",
+            a2a=A2AServerConfig(skills=[custom_skill]),
+        )
+
+        card = agent.to_agent_card("http://localhost:8000")
+
+        assert len(card.skills) == 1
+        assert card.skills[0].id == "custom-skill"
+        assert card.skills[0].name == "Custom Skill"
+
+    def test_includes_custom_version(self) -> None:
+        """AgentCard should include version from A2AServerConfig."""
+        agent = Agent(
+            role="Test Agent",
+            goal="Test goal",
+            backstory="Test backstory",
+            a2a=A2AServerConfig(version="2.0.0"),
+        )
+
+        card = agent.to_agent_card("http://localhost:8000")
+
+        assert card.version == "2.0.0"
+
+    def test_default_version(self) -> None:
+        """AgentCard should have default version 1.0.0."""
+        agent = Agent(
+            role="Test Agent",
+            goal="Test goal",
+            backstory="Test backstory",
+            a2a=A2AServerConfig(),
+        )
+
+        card = agent.to_agent_card("http://localhost:8000")
+
+        assert card.version == "1.0.0"
+
+
+class TestAgentCardJsonStructure:
+    """Tests for the JSON structure of AgentCard."""
+
+    def test_json_has_required_fields(self) -> None:
+        """AgentCard JSON should contain all required A2A protocol fields."""
+        agent = Agent(
+            role="Test Agent",
+            goal="Test goal",
+            backstory="Test backstory",
+            a2a=A2AServerConfig(),
+        )
+
+        card = agent.to_agent_card("http://localhost:8000")
+        json_data = card.model_dump()
+
+        assert "name" in json_data
+        assert "description" in json_data
+        assert "url" in json_data
+        assert "version" in json_data
+        assert "skills" in json_data
+        assert "capabilities" in json_data
+        assert "defaultInputModes" in json_data
+        assert "defaultOutputModes" in json_data
+
+    def test_json_skills_structure(self) -> None:
+        """Each skill in JSON should have required fields."""
+        agent = Agent(
+            role="Test Agent",
+            goal="Test goal",
+            backstory="Test backstory",
+            a2a=A2AServerConfig(),
+        )
+
+        card = agent.to_agent_card("http://localhost:8000")
+        json_data = card.model_dump()
+
+        assert len(json_data["skills"]) >= 1
+        skill = json_data["skills"][0]
+        assert "id" in skill
+        assert "name" in skill
+        assert "description" in skill
+        assert "tags" in skill
+
+    def test_json_capabilities_structure(self) -> None:
+        """Capabilities in JSON should have expected fields."""
+        agent = Agent(
+            role="Test Agent",
+            goal="Test goal",
+            backstory="Test backstory",
+            a2a=A2AServerConfig(),
+        )
+
+        card = agent.to_agent_card("http://localhost:8000")
+        json_data = card.model_dump()
+
+        capabilities = json_data["capabilities"]
+        assert "streaming" in capabilities
+        assert "pushNotifications" in capabilities
+
+    def test_json_serializable(self) -> None:
+        """AgentCard should be JSON serializable."""
+        agent = Agent(
+            role="Test Agent",
+            goal="Test goal",
+            backstory="Test backstory",
+            a2a=A2AServerConfig(),
+        )
+
+        card = agent.to_agent_card("http://localhost:8000")
+        json_str = card.model_dump_json()
+
+        assert isinstance(json_str, str)
+        assert "Test Agent" in json_str
+        assert "http://localhost:8000" in json_str
+
+    def test_json_excludes_none_values(self) -> None:
+        """AgentCard JSON with exclude_none should omit None fields."""
+        agent = Agent(
+            role="Test Agent",
+            goal="Test goal",
+            backstory="Test backstory",
+            a2a=A2AServerConfig(),
+        )
+
+        card = agent.to_agent_card("http://localhost:8000")
+        json_data = card.model_dump(exclude_none=True)
+
+        assert "provider" not in json_data
+        assert "documentationUrl" not in json_data
+        assert "iconUrl" not in json_data

lib/crewai/tests/a2a/utils/test_task.py

@@ -0,0 +1,370 @@
+"""Tests for A2A task utilities."""
+
+from __future__ import annotations
+
+import asyncio
+from typing import Any
+from unittest.mock import AsyncMock, MagicMock, patch
+
+import pytest
+import pytest_asyncio
+from a2a.server.agent_execution import RequestContext
+from a2a.server.events import EventQueue
+from a2a.types import Message, Task as A2ATask, TaskState, TaskStatus
+
+from crewai.a2a.utils.task import cancel, cancellable, execute
+
+
+@pytest.fixture
+def mock_agent() -> MagicMock:
+    """Create a mock CrewAI agent."""
+    agent = MagicMock()
+    agent.role = "Test Agent"
+    agent.tools = []
+    agent.aexecute_task = AsyncMock(return_value="Task completed successfully")
+    return agent
+
+
+@pytest.fixture
+def mock_task() -> MagicMock:
+    """Create a mock Task."""
+    return MagicMock()
+
+
+@pytest.fixture
+def mock_context() -> MagicMock:
+    """Create a mock RequestContext."""
+    context = MagicMock(spec=RequestContext)
+    context.task_id = "test-task-123"
+    context.context_id = "test-context-456"
+    context.get_user_input.return_value = "Test user message"
+    context.message = MagicMock(spec=Message)
+    context.current_task = None
+    return context
+
+
+@pytest.fixture
+def mock_event_queue() -> AsyncMock:
+    """Create a mock EventQueue."""
+    queue = AsyncMock(spec=EventQueue)
+    queue.enqueue_event = AsyncMock()
+    return queue
+
+
+@pytest_asyncio.fixture(autouse=True)
+async def clear_cache(mock_context: MagicMock) -> None:
+    """Clear cancel flag from cache before each test."""
+    from aiocache import caches
+
+    cache = caches.get("default")
+    await cache.delete(f"cancel:{mock_context.task_id}")
+
+
+class TestCancellableDecorator:
+    """Tests for the cancellable decorator."""
+
+    @pytest.mark.asyncio
+    async def test_executes_function_without_context(self) -> None:
+        """Function executes normally when no RequestContext is provided."""
+        call_count = 0
+
+        @cancellable
+        async def my_func(value: int) -> int:
+            nonlocal call_count
+            call_count += 1
+            return value * 2
+
+        result = await my_func(5)
+
+        assert result == 10
+        assert call_count == 1
+
+    @pytest.mark.asyncio
+    async def test_executes_function_with_context(self, mock_context: MagicMock) -> None:
+        """Function executes normally with RequestContext when not cancelled."""
+        @cancellable
+        async def my_func(context: RequestContext) -> str:
+            await asyncio.sleep(0.01)
+            return "completed"
+
+        result = await my_func(mock_context)
+
+        assert result == "completed"
+
+    @pytest.mark.asyncio
+    async def test_cancellation_raises_cancelled_error(
+        self, mock_context: MagicMock
+    ) -> None:
+        """Function raises CancelledError when cancel flag is set."""
+        from aiocache import caches
+
+        cache = caches.get("default")
+
+        @cancellable
+        async def slow_func(context: RequestContext) -> str:
+            await asyncio.sleep(1.0)
+            return "should not reach"
+
+        await cache.set(f"cancel:{mock_context.task_id}", True)
+
+        with pytest.raises(asyncio.CancelledError):
+            await slow_func(mock_context)
+
+    @pytest.mark.asyncio
+    async def test_cleanup_removes_cancel_flag(self, mock_context: MagicMock) -> None:
+        """Cancel flag is cleaned up after execution."""
+        from aiocache import caches
+
+        cache = caches.get("default")
+
+        @cancellable
+        async def quick_func(context: RequestContext) -> str:
+            return "done"
+
+        await quick_func(mock_context)
+
+        flag = await cache.get(f"cancel:{mock_context.task_id}")
+        assert flag is None
+
+    @pytest.mark.asyncio
+    async def test_extracts_context_from_kwargs(self, mock_context: MagicMock) -> None:
+        """Context can be passed as keyword argument."""
+        @cancellable
+        async def my_func(value: int, context: RequestContext | None = None) -> int:
+            return value + 1
+
+        result = await my_func(10, context=mock_context)
+
+        assert result == 11
+
+
+class TestExecute:
+    """Tests for the execute function."""
+
+    @pytest.mark.asyncio
+    async def test_successful_execution(
+        self,
+        mock_agent: MagicMock,
+        mock_context: MagicMock,
+        mock_event_queue: AsyncMock,
+        mock_task: MagicMock,
+    ) -> None:
+        """Execute completes successfully and enqueues completed task."""
+        with (
+            patch("crewai.a2a.utils.task.Task", return_value=mock_task),
+            patch("crewai.a2a.utils.task.crewai_event_bus") as mock_bus,
+        ):
+            await execute(mock_agent, mock_context, mock_event_queue)
+
+        mock_agent.aexecute_task.assert_called_once()
+        mock_event_queue.enqueue_event.assert_called_once()
+        assert mock_bus.emit.call_count == 2
+
+    @pytest.mark.asyncio
+    async def test_emits_started_event(
+        self,
+        mock_agent: MagicMock,
+        mock_context: MagicMock,
+        mock_event_queue: AsyncMock,
+        mock_task: MagicMock,
+    ) -> None:
+        """Execute emits A2AServerTaskStartedEvent."""
+        with (
+            patch("crewai.a2a.utils.task.Task", return_value=mock_task),
+            patch("crewai.a2a.utils.task.crewai_event_bus") as mock_bus,
+        ):
+            await execute(mock_agent, mock_context, mock_event_queue)
+
+        first_call = mock_bus.emit.call_args_list[0]
+        event = first_call[0][1]
+
+        assert event.type == "a2a_server_task_started"
+        assert event.a2a_task_id == mock_context.task_id
+        assert event.a2a_context_id == mock_context.context_id
+
+    @pytest.mark.asyncio
+    async def test_emits_completed_event(
+        self,
+        mock_agent: MagicMock,
+        mock_context: MagicMock,
+        mock_event_queue: AsyncMock,
+        mock_task: MagicMock,
+    ) -> None:
+        """Execute emits A2AServerTaskCompletedEvent on success."""
+        with (
+            patch("crewai.a2a.utils.task.Task", return_value=mock_task),
+            patch("crewai.a2a.utils.task.crewai_event_bus") as mock_bus,
+        ):
+            await execute(mock_agent, mock_context, mock_event_queue)
+
+        second_call = mock_bus.emit.call_args_list[1]
+        event = second_call[0][1]
+
+        assert event.type == "a2a_server_task_completed"
+        assert event.a2a_task_id == mock_context.task_id
+        assert event.result == "Task completed successfully"
+
+    @pytest.mark.asyncio
+    async def test_emits_failed_event_on_exception(
+        self,
+        mock_agent: MagicMock,
+        mock_context: MagicMock,
+        mock_event_queue: AsyncMock,
+        mock_task: MagicMock,
+    ) -> None:
+        """Execute emits A2AServerTaskFailedEvent on exception."""
+        mock_agent.aexecute_task = AsyncMock(side_effect=ValueError("Test error"))
+
+        with (
+            patch("crewai.a2a.utils.task.Task", return_value=mock_task),
+            patch("crewai.a2a.utils.task.crewai_event_bus") as mock_bus,
+        ):
+            with pytest.raises(Exception):
+                await execute(mock_agent, mock_context, mock_event_queue)
+
+        failed_call = mock_bus.emit.call_args_list[1]
+        event = failed_call[0][1]
+
+        assert event.type == "a2a_server_task_failed"
+        assert "Test error" in event.error
+
+    @pytest.mark.asyncio
+    async def test_emits_canceled_event_on_cancellation(
+        self,
+        mock_agent: MagicMock,
+        mock_context: MagicMock,
+        mock_event_queue: AsyncMock,
+        mock_task: MagicMock,
+    ) -> None:
+        """Execute emits A2AServerTaskCanceledEvent on CancelledError."""
+        mock_agent.aexecute_task = AsyncMock(side_effect=asyncio.CancelledError())
+
+        with (
+            patch("crewai.a2a.utils.task.Task", return_value=mock_task),
+            patch("crewai.a2a.utils.task.crewai_event_bus") as mock_bus,
+        ):
+            with pytest.raises(asyncio.CancelledError):
+                await execute(mock_agent, mock_context, mock_event_queue)
+
+        canceled_call = mock_bus.emit.call_args_list[1]
+        event = canceled_call[0][1]
+
+        assert event.type == "a2a_server_task_canceled"
+        assert event.a2a_task_id == mock_context.task_id
+
+
+class TestCancel:
+    """Tests for the cancel function."""
+
+    @pytest.mark.asyncio
+    async def test_sets_cancel_flag_in_cache(
+        self,
+        mock_context: MagicMock,
+        mock_event_queue: AsyncMock,
+    ) -> None:
+        """Cancel sets the cancel flag in cache."""
+        from aiocache import caches
+
+        cache = caches.get("default")
+
+        await cancel(mock_context, mock_event_queue)
+
+        flag = await cache.get(f"cancel:{mock_context.task_id}")
+        assert flag is True
+
+    @pytest.mark.asyncio
+    async def test_enqueues_task_status_update_event(
+        self,
+        mock_context: MagicMock,
+        mock_event_queue: AsyncMock,
+    ) -> None:
+        """Cancel enqueues TaskStatusUpdateEvent with canceled state."""
+        await cancel(mock_context, mock_event_queue)
+
+        mock_event_queue.enqueue_event.assert_called_once()
+        event = mock_event_queue.enqueue_event.call_args[0][0]
+
+        assert event.task_id == mock_context.task_id
+        assert event.context_id == mock_context.context_id
+        assert event.status.state == TaskState.canceled
+        assert event.final is True
+
+    @pytest.mark.asyncio
+    async def test_returns_none_when_no_current_task(
+        self,
+        mock_context: MagicMock,
+        mock_event_queue: AsyncMock,
+    ) -> None:
+        """Cancel returns None when context has no current_task."""
+        mock_context.current_task = None
+
+        result = await cancel(mock_context, mock_event_queue)
+
+        assert result is None
+
+    @pytest.mark.asyncio
+    async def test_returns_updated_task_when_current_task_exists(
+        self,
+        mock_context: MagicMock,
+        mock_event_queue: AsyncMock,
+    ) -> None:
+        """Cancel returns updated task when context has current_task."""
+        current_task = MagicMock(spec=A2ATask)
+        current_task.status = TaskStatus(state=TaskState.working)
+        mock_context.current_task = current_task
+
+        result = await cancel(mock_context, mock_event_queue)
+
+        assert result is current_task
+        assert result.status.state == TaskState.canceled
+
+    @pytest.mark.asyncio
+    async def test_cleanup_after_cancel(
+        self,
+        mock_context: MagicMock,
+        mock_event_queue: AsyncMock,
+    ) -> None:
+        """Cancel flag persists for cancellable decorator to detect."""
+        from aiocache import caches
+
+        cache = caches.get("default")
+
+        await cancel(mock_context, mock_event_queue)
+
+        flag = await cache.get(f"cancel:{mock_context.task_id}")
+        assert flag is True
+
+        await cache.delete(f"cancel:{mock_context.task_id}")
+
+
+class TestExecuteAndCancelIntegration:
+    """Integration tests for execute and cancel working together."""
+
+    @pytest.mark.asyncio
+    async def test_cancel_stops_running_execute(
+        self,
+        mock_agent: MagicMock,
+        mock_context: MagicMock,
+        mock_event_queue: AsyncMock,
+        mock_task: MagicMock,
+    ) -> None:
+        """Calling cancel stops a running execute."""
+        async def slow_task(**kwargs: Any) -> str:
+            await asyncio.sleep(2.0)
+            return "should not complete"
+
+        mock_agent.aexecute_task = slow_task
+
+        with (
+            patch("crewai.a2a.utils.task.Task", return_value=mock_task),
+            patch("crewai.a2a.utils.task.crewai_event_bus"),
+        ):
+            execute_task = asyncio.create_task(
+                execute(mock_agent, mock_context, mock_event_queue)
+            )
+
+            await asyncio.sleep(0.1)
+            await cancel(mock_context, mock_event_queue)
+
+            with pytest.raises(asyncio.CancelledError):
+                await execute_task

lib/crewai/tests/cassettes/llms/google/test_google_express_mode_works.yaml

@@ -0,0 +1,75 @@
+interactions:
+- request:
+    body: '{"contents": [{"parts": [{"text": "\nCurrent Task: What is the capital
+      of Japan?\n\nThis is the expected criteria for your final answer: The capital
+      of Japan\nyou MUST return the actual complete content as the final answer, not
+      a summary.\n\nBegin! This is VERY important to you, use the tools available
+      and give your best Final Answer, your job depends on it!\n\nThought:"}], "role":
+      "user"}], "systemInstruction": {"parts": [{"text": "You are Research Assistant.
+      You are a helpful research assistant.\nYour personal goal is: Find information
+      about the capital of Japan\nTo give my best complete final answer to the task
+      respond using the exact following format:\n\nThought: I now can give a great
+      answer\nFinal Answer: Your final answer must be the great and the most complete
+      as possible, it must be outcome described.\n\nI MUST use these formats, my job
+      depends on it!"}], "role": "user"}, "generationConfig": {"stopSequences": ["\nObservation:"]}}'
+    headers:
+      User-Agent:
+      - X-USER-AGENT-XXX
+      accept:
+      - '*/*'
+      accept-encoding:
+      - ACCEPT-ENCODING-XXX
+      connection:
+      - keep-alive
+      content-length:
+      - '952'
+      content-type:
+      - application/json
+      host:
+      - aiplatform.googleapis.com
+      x-goog-api-client:
+      - google-genai-sdk/1.59.0 gl-python/3.13.3
+      x-goog-api-key:
+      - X-GOOG-API-KEY-XXX
+    method: POST
+    uri: https://aiplatform.googleapis.com/v1/publishers/google/models/gemini-2.0-flash-exp:generateContent
+  response:
+    body:
+      string: "{\n  \"candidates\": [\n    {\n      \"content\": {\n        \"role\":
+        \"model\",\n        \"parts\": [\n          {\n            \"text\": \"The
+        capital of Japan is Tokyo.\\nFinal Answer: Tokyo\\n\"\n          }\n        ]\n
+        \     },\n      \"finishReason\": \"STOP\",\n      \"avgLogprobs\": -0.017845841554495003\n
+        \   }\n  ],\n  \"usageMetadata\": {\n    \"promptTokenCount\": 163,\n    \"candidatesTokenCount\":
+        13,\n    \"totalTokenCount\": 176,\n    \"trafficType\": \"ON_DEMAND\",\n
+        \   \"promptTokensDetails\": [\n      {\n        \"modality\": \"TEXT\",\n
+        \       \"tokenCount\": 163\n      }\n    ],\n    \"candidatesTokensDetails\":
+        [\n      {\n        \"modality\": \"TEXT\",\n        \"tokenCount\": 13\n
+        \     }\n    ]\n  },\n  \"modelVersion\": \"gemini-2.0-flash-exp\",\n  \"createTime\":
+        \"2026-01-15T22:27:38.066749Z\",\n  \"responseId\": \"2mlpab2JBNOFidsPh5GigQs\"\n}\n"
+    headers:
+      Alt-Svc:
+      - h3=":443"; ma=2592000,h3-29=":443"; ma=2592000
+      Content-Type:
+      - application/json; charset=UTF-8
+      Date:
+      - Thu, 15 Jan 2026 22:27:38 GMT
+      Server:
+      - scaffolding on HTTPServer2
+      Transfer-Encoding:
+      - chunked
+      Vary:
+      - Origin
+      - X-Origin
+      - Referer
+      X-Content-Type-Options:
+      - X-CONTENT-TYPE-XXX
+      X-Frame-Options:
+      - X-FRAME-OPTIONS-XXX
+      X-XSS-Protection:
+      - '0'
+      content-length:
+      - '786'
+    status:
+      code: 200
+      message: OK
+version: 1

lib/crewai/tests/cli/authentication/providers/test_keycloak.py

@@ -0,0 +1,138 @@
+import pytest
+
+from crewai.cli.authentication.main import Oauth2Settings
+from crewai.cli.authentication.providers.keycloak import KeycloakProvider
+
+
+class TestKeycloakProvider:
+    @pytest.fixture(autouse=True)
+    def setup_method(self):
+        self.valid_settings = Oauth2Settings(
+            provider="keycloak",
+            domain="keycloak.example.com",
+            client_id="test-client-id",
+            audience="test-audience",
+            extra={
+                "realm": "test-realm"
+            }
+        )
+        self.provider = KeycloakProvider(self.valid_settings)
+
+    def test_initialization_with_valid_settings(self):
+        provider = KeycloakProvider(self.valid_settings)
+        assert provider.settings == self.valid_settings
+        assert provider.settings.provider == "keycloak"
+        assert provider.settings.domain == "keycloak.example.com"
+        assert provider.settings.client_id == "test-client-id"
+        assert provider.settings.audience == "test-audience"
+        assert provider.settings.extra.get("realm") == "test-realm"
+
+    def test_get_authorize_url(self):
+        expected_url = "https://keycloak.example.com/realms/test-realm/protocol/openid-connect/auth/device"
+        assert self.provider.get_authorize_url() == expected_url
+
+    def test_get_authorize_url_with_different_domain(self):
+        settings = Oauth2Settings(
+            provider="keycloak",
+            domain="auth.company.com",
+            client_id="test-client",
+            audience="test-audience",
+            extra={
+                "realm": "my-realm"
+            }
+        )
+        provider = KeycloakProvider(settings)
+        expected_url = "https://auth.company.com/realms/my-realm/protocol/openid-connect/auth/device"
+        assert provider.get_authorize_url() == expected_url
+
+    def test_get_token_url(self):
+        expected_url = "https://keycloak.example.com/realms/test-realm/protocol/openid-connect/token"
+        assert self.provider.get_token_url() == expected_url
+
+    def test_get_token_url_with_different_domain(self):
+        settings = Oauth2Settings(
+            provider="keycloak",
+            domain="sso.enterprise.com",
+            client_id="test-client",
+            audience="test-audience",
+            extra={
+                "realm": "enterprise-realm"
+            }
+        )
+        provider = KeycloakProvider(settings)
+        expected_url = "https://sso.enterprise.com/realms/enterprise-realm/protocol/openid-connect/token"
+        assert provider.get_token_url() == expected_url
+
+    def test_get_jwks_url(self):
+        expected_url = "https://keycloak.example.com/realms/test-realm/protocol/openid-connect/certs"
+        assert self.provider.get_jwks_url() == expected_url
+
+    def test_get_jwks_url_with_different_domain(self):
+        settings = Oauth2Settings(
+            provider="keycloak",
+            domain="identity.org",
+            client_id="test-client",
+            audience="test-audience",
+            extra={
+                "realm": "org-realm"
+            }
+        )
+        provider = KeycloakProvider(settings)
+        expected_url = "https://identity.org/realms/org-realm/protocol/openid-connect/certs"
+        assert provider.get_jwks_url() == expected_url
+
+    def test_get_issuer(self):
+        expected_issuer = "https://keycloak.example.com/realms/test-realm"
+        assert self.provider.get_issuer() == expected_issuer
+
+    def test_get_issuer_with_different_domain(self):
+        settings = Oauth2Settings(
+            provider="keycloak",
+            domain="login.myapp.io",
+            client_id="test-client",
+            audience="test-audience",
+            extra={
+                "realm": "app-realm"
+            }
+        )
+        provider = KeycloakProvider(settings)
+        expected_issuer = "https://login.myapp.io/realms/app-realm"
+        assert provider.get_issuer() == expected_issuer
+
+    def test_get_audience(self):
+        assert self.provider.get_audience() == "test-audience"
+
+    def test_get_client_id(self):
+        assert self.provider.get_client_id() == "test-client-id"
+
+    def test_get_required_fields(self):
+        assert self.provider.get_required_fields() == ["realm"]
+
+    def test_oauth2_base_url(self):
+        assert self.provider._oauth2_base_url() == "https://keycloak.example.com"
+
+    def test_oauth2_base_url_strips_https_prefix(self):
+        settings = Oauth2Settings(
+            provider="keycloak",
+            domain="https://keycloak.example.com",
+            client_id="test-client-id",
+            audience="test-audience",
+            extra={
+                "realm": "test-realm"
+            }
+        )
+        provider = KeycloakProvider(settings)
+        assert provider._oauth2_base_url() == "https://keycloak.example.com"
+
+    def test_oauth2_base_url_strips_http_prefix(self):
+        settings = Oauth2Settings(
+            provider="keycloak",
+            domain="http://keycloak.example.com",
+            client_id="test-client-id",
+            audience="test-audience",
+            extra={
+                "realm": "test-realm"
+            }
+        )
+        provider = KeycloakProvider(settings)
+        assert provider._oauth2_base_url() == "https://keycloak.example.com"

lib/crewai/tests/llms/azure/test_azure.py

@@ -515,6 +515,94 @@ def test_azure_supports_stop_words():
     assert llm.supports_stop_words() == True
 
 
+def test_azure_gpt5_models_do_not_support_stop_words():
+    """
+    Test that GPT-5 family models do not support stop words.
+    GPT-5 models use the Responses API which doesn't support stop sequences.
+    See: https://learn.microsoft.com/en-us/azure/ai-foundry/foundry-models/concepts/models-sold-directly-by-azure
+    """
+    # GPT-5 base models
+    gpt5_models = [
+        "azure/gpt-5",
+        "azure/gpt-5-mini",
+        "azure/gpt-5-nano",
+        "azure/gpt-5-chat",
+        # GPT-5.1 series
+        "azure/gpt-5.1",
+        "azure/gpt-5.1-chat",
+        "azure/gpt-5.1-codex",
+        "azure/gpt-5.1-codex-mini",
+        # GPT-5.2 series
+        "azure/gpt-5.2",
+        "azure/gpt-5.2-chat",
+    ]
+
+    for model_name in gpt5_models:
+        llm = LLM(model=model_name)
+        assert llm.supports_stop_words() == False, f"Expected {model_name} to NOT support stop words"
+
+
+def test_azure_o_series_models_do_not_support_stop_words():
+    """
+    Test that o-series reasoning models do not support stop words.
+    """
+    o_series_models = [
+        "azure/o1",
+        "azure/o1-mini",
+        "azure/o3",
+        "azure/o3-mini",
+        "azure/o4",
+        "azure/o4-mini",
+    ]
+
+    for model_name in o_series_models:
+        llm = LLM(model=model_name)
+        assert llm.supports_stop_words() == False, f"Expected {model_name} to NOT support stop words"
+
+
+def test_azure_responses_api_models_do_not_support_stop_words():
+    """
+    Test that models using the Responses API do not support stop words.
+    """
+    responses_api_models = [
+        "azure/computer-use-preview",
+    ]
+
+    for model_name in responses_api_models:
+        llm = LLM(model=model_name)
+        assert llm.supports_stop_words() == False, f"Expected {model_name} to NOT support stop words"
+
+
+def test_azure_stop_words_not_included_for_unsupported_models():
+    """
+    Test that stop words are not included in completion params for models that don't support them.
+    """
+    with patch.dict(os.environ, {
+        "AZURE_API_KEY": "test-key",
+        "AZURE_ENDPOINT": "https://models.inference.ai.azure.com"
+    }):
+        # Test GPT-5 model - stop should NOT be included even if set
+        llm_gpt5 = LLM(
+            model="azure/gpt-5-nano",
+            stop=["STOP", "END"]
+        )
+        params = llm_gpt5._prepare_completion_params(
+            messages=[{"role": "user", "content": "test"}]
+        )
+        assert "stop" not in params, "stop should not be included for GPT-5 models"
+
+        # Test regular model - stop SHOULD be included
+        llm_gpt4 = LLM(
+            model="azure/gpt-4",
+            stop=["STOP", "END"]
+        )
+        params = llm_gpt4._prepare_completion_params(
+            messages=[{"role": "user", "content": "test"}]
+        )
+        assert "stop" in params, "stop should be included for GPT-4 models"
+        assert params["stop"] == ["STOP", "END"]
+
+
 def test_azure_context_window_size():
     """
     Test that Azure models return correct context window sizes

lib/crewai/tests/llms/google/test_google.py

@@ -728,3 +728,39 @@ def test_google_streaming_returns_usage_metrics():
     assert result.token_usage.prompt_tokens > 0
     assert result.token_usage.completion_tokens > 0
     assert result.token_usage.successful_requests >= 1
+
+
+@pytest.mark.vcr()
+def test_google_express_mode_works() -> None:
+    """
+    Test Google Vertex AI Express mode with API key authentication.
+    This tests Vertex AI Express mode (aiplatform.googleapis.com) with API key
+    authentication.
+
+    """
+    with patch.dict(os.environ, {"GOOGLE_GENAI_USE_VERTEXAI": "true"}):
+        agent = Agent(
+            role="Research Assistant",
+            goal="Find information about the capital of Japan",
+            backstory="You are a helpful research assistant.",
+            llm=LLM(
+                model="gemini/gemini-2.0-flash-exp",
+            ),
+            verbose=True,
+        )
+
+        task = Task(
+            description="What is the capital of Japan?",
+            expected_output="The capital of Japan",
+            agent=agent,
+        )
+
+
+        crew = Crew(agents=[agent], tasks=[task])
+        result = crew.kickoff()
+
+        assert result.token_usage is not None
+        assert result.token_usage.total_tokens > 0
+        assert result.token_usage.prompt_tokens > 0
+        assert result.token_usage.completion_tokens > 0
+        assert result.token_usage.successful_requests >= 1

lib/crewai/tests/test_crew.py

@@ -4500,6 +4500,71 @@ def test_crew_copy_with_memory():
         pytest.fail(f"Copying crew raised an unexpected exception: {e}")
 
 
+def test_sets_parent_flow_when_using_crewbase_pattern_inside_flow():
+    @CrewBase
+    class TestCrew:
+        agents_config = None
+        tasks_config = None
+
+        agents: list[BaseAgent]
+        tasks: list[Task]
+
+        @agent
+        def researcher(self) -> Agent:
+            return Agent(
+                role="Researcher",
+                goal="Research things",
+                backstory="Expert researcher",
+            )
+
+        @agent
+        def writer_agent(self) -> Agent:
+            return Agent(
+                role="Writer",
+                goal="Write things",
+                backstory="Expert writer",
+            )
+
+        @task
+        def research_task(self) -> Task:
+            return Task(
+                description="Test task for researcher",
+                expected_output="output",
+                agent=self.researcher(),
+            )
+
+        @task
+        def write_task(self) -> Task:
+            return Task(
+                description="Test task for writer",
+                expected_output="output",
+                agent=self.writer_agent(),
+            )
+
+        @crew
+        def crew(self) -> Crew:
+            return Crew(
+                agents=self.agents,
+                tasks=self.tasks,
+                process=Process.sequential,
+            )
+
+    captured_crew = None
+
+    class MyFlow(Flow):
+        @start()
+        def start_method(self):
+            nonlocal captured_crew
+            captured_crew = TestCrew().crew()
+            return captured_crew
+
+    flow = MyFlow()
+    flow.kickoff()
+
+    assert captured_crew is not None
+    assert captured_crew.parent_flow is flow
+
+
 def test_sets_parent_flow_when_outside_flow(researcher, writer):
     crew = Crew(
         agents=[researcher, writer],

lib/crewai/tests/tools/test_tool_search_tool.py

@@ -1,393 +0,0 @@
-"""Tests for the ToolSearchTool functionality."""
-
-import json
-
-import pytest
-from pydantic import BaseModel
-
-from crewai.tools import BaseTool, SearchStrategy, ToolSearchTool
-
-
-class MockSearchTool(BaseTool):
-    """A mock search tool for testing."""
-
-    name: str = "Web Search"
-    description: str = "Search the web for information on any topic."
-
-    def _run(self, query: str) -> str:
-        return f"Search results for: {query}"
-
-
-class MockDatabaseTool(BaseTool):
-    """A mock database tool for testing."""
-
-    name: str = "Database Query"
-    description: str = "Query a SQL database to retrieve data."
-
-    def _run(self, query: str) -> str:
-        return f"Database results for: {query}"
-
-
-class MockScrapeTool(BaseTool):
-    """A mock web scraping tool for testing."""
-
-    name: str = "Web Scraper"
-    description: str = "Scrape content from websites and extract text."
-
-    def _run(self, url: str) -> str:
-        return f"Scraped content from: {url}"
-
-
-class MockEmailTool(BaseTool):
-    """A mock email tool for testing."""
-
-    name: str = "Send Email"
-    description: str = "Send an email to a specified recipient."
-
-    def _run(self, to: str, subject: str, body: str) -> str:
-        return f"Email sent to {to}"
-
-
-class MockCalculatorTool(BaseTool):
-    """A mock calculator tool for testing."""
-
-    name: str = "Calculator"
-    description: str = "Perform mathematical calculations and arithmetic operations."
-
-    def _run(self, expression: str) -> str:
-        return f"Result: {eval(expression)}"
-
-
-@pytest.fixture
-def sample_tools() -> list[BaseTool]:
-    """Create a list of sample tools for testing."""
-    return [
-        MockSearchTool(),
-        MockDatabaseTool(),
-        MockScrapeTool(),
-        MockEmailTool(),
-        MockCalculatorTool(),
-    ]
-
-
-@pytest.fixture
-def tool_search(sample_tools: list[BaseTool]) -> ToolSearchTool:
-    """Create a ToolSearchTool with sample tools."""
-    return ToolSearchTool(tool_catalog=sample_tools)
-
-
-class TestToolSearchToolCreation:
-    """Tests for ToolSearchTool creation and initialization."""
-
-    def test_create_tool_search_with_empty_catalog(self) -> None:
-        """Test creating a ToolSearchTool with an empty catalog."""
-        tool_search = ToolSearchTool()
-        assert tool_search.name == "Tool Search"
-        assert tool_search.tool_catalog == []
-        assert tool_search.search_strategy == SearchStrategy.KEYWORD
-
-    def test_create_tool_search_with_tools(self, sample_tools: list[BaseTool]) -> None:
-        """Test creating a ToolSearchTool with a list of tools."""
-        tool_search = ToolSearchTool(tool_catalog=sample_tools)
-        assert len(tool_search.tool_catalog) == 5
-        assert tool_search.get_catalog_size() == 5
-
-    def test_create_tool_search_with_regex_strategy(
-        self, sample_tools: list[BaseTool]
-    ) -> None:
-        """Test creating a ToolSearchTool with regex search strategy."""
-        tool_search = ToolSearchTool(
-            tool_catalog=sample_tools, search_strategy=SearchStrategy.REGEX
-        )
-        assert tool_search.search_strategy == SearchStrategy.REGEX
-
-    def test_create_tool_search_with_custom_name(self) -> None:
-        """Test creating a ToolSearchTool with a custom name."""
-        tool_search = ToolSearchTool(name="My Tool Finder")
-        assert tool_search.name == "My Tool Finder"
-
-
-class TestToolSearchKeywordSearch:
-    """Tests for keyword-based tool search."""
-
-    def test_search_by_exact_name(self, tool_search: ToolSearchTool) -> None:
-        """Test searching for a tool by its exact name."""
-        result = tool_search._run("Web Search")
-        result_data = json.loads(result)
-
-        assert result_data["status"] == "success"
-        assert len(result_data["tools"]) >= 1
-        assert result_data["tools"][0]["name"] == "Web Search"
-
-    def test_search_by_partial_name(self, tool_search: ToolSearchTool) -> None:
-        """Test searching for a tool by partial name."""
-        result = tool_search._run("Search")
-        result_data = json.loads(result)
-
-        assert result_data["status"] == "success"
-        assert len(result_data["tools"]) >= 1
-        tool_names = [t["name"] for t in result_data["tools"]]
-        assert "Web Search" in tool_names
-
-    def test_search_by_description_keyword(self, tool_search: ToolSearchTool) -> None:
-        """Test searching for a tool by keyword in description."""
-        result = tool_search._run("database")
-        result_data = json.loads(result)
-
-        assert result_data["status"] == "success"
-        assert len(result_data["tools"]) >= 1
-        tool_names = [t["name"] for t in result_data["tools"]]
-        assert "Database Query" in tool_names
-
-    def test_search_with_multiple_keywords(self, tool_search: ToolSearchTool) -> None:
-        """Test searching with multiple keywords."""
-        result = tool_search._run("web scrape content")
-        result_data = json.loads(result)
-
-        assert result_data["status"] == "success"
-        assert len(result_data["tools"]) >= 1
-        tool_names = [t["name"] for t in result_data["tools"]]
-        assert "Web Scraper" in tool_names
-
-    def test_search_no_results(self, tool_search: ToolSearchTool) -> None:
-        """Test searching with a query that returns no results."""
-        result = tool_search._run("xyznonexistent123abc")
-        result_data = json.loads(result)
-
-        assert result_data["status"] == "no_results"
-        assert len(result_data["tools"]) == 0
-
-    def test_search_max_results_limit(self, tool_search: ToolSearchTool) -> None:
-        """Test that max_results limits the number of returned tools."""
-        result = tool_search._run("tool", max_results=2)
-        result_data = json.loads(result)
-
-        assert result_data["status"] == "success"
-        assert len(result_data["tools"]) <= 2
-
-    def test_search_empty_catalog(self) -> None:
-        """Test searching with an empty tool catalog."""
-        tool_search = ToolSearchTool()
-        result = tool_search._run("search")
-        result_data = json.loads(result)
-
-        assert result_data["status"] == "error"
-        assert "No tools available" in result_data["message"]
-
-
-class TestToolSearchRegexSearch:
-    """Tests for regex-based tool search."""
-
-    def test_regex_search_simple_pattern(
-        self, sample_tools: list[BaseTool]
-    ) -> None:
-        """Test regex search with a simple pattern."""
-        tool_search = ToolSearchTool(
-            tool_catalog=sample_tools, search_strategy=SearchStrategy.REGEX
-        )
-        result = tool_search._run("Web.*")
-        result_data = json.loads(result)
-
-        assert result_data["status"] == "success"
-        tool_names = [t["name"] for t in result_data["tools"]]
-        assert "Web Search" in tool_names or "Web Scraper" in tool_names
-
-    def test_regex_search_case_insensitive(
-        self, sample_tools: list[BaseTool]
-    ) -> None:
-        """Test that regex search is case insensitive."""
-        tool_search = ToolSearchTool(
-            tool_catalog=sample_tools, search_strategy=SearchStrategy.REGEX
-        )
-        result = tool_search._run("email")
-        result_data = json.loads(result)
-
-        assert result_data["status"] == "success"
-        tool_names = [t["name"] for t in result_data["tools"]]
-        assert "Send Email" in tool_names
-
-    def test_regex_search_invalid_pattern_fallback(
-        self, sample_tools: list[BaseTool]
-    ) -> None:
-        """Test that invalid regex patterns are escaped and still work."""
-        tool_search = ToolSearchTool(
-            tool_catalog=sample_tools, search_strategy=SearchStrategy.REGEX
-        )
-        result = tool_search._run("[invalid(regex")
-        result_data = json.loads(result)
-
-        assert result_data["status"] in ["success", "no_results"]
-
-
-class TestToolSearchCustomSearch:
-    """Tests for custom search function."""
-
-    def test_custom_search_function(self, sample_tools: list[BaseTool]) -> None:
-        """Test using a custom search function."""
-
-        def custom_search(
-            query: str, tools: list[BaseTool]
-        ) -> list[BaseTool]:
-            return [t for t in tools if "email" in t.name.lower()]
-
-        tool_search = ToolSearchTool(
-            tool_catalog=sample_tools, custom_search_fn=custom_search
-        )
-        result = tool_search._run("anything")
-        result_data = json.loads(result)
-
-        assert result_data["status"] == "success"
-        assert len(result_data["tools"]) == 1
-        assert result_data["tools"][0]["name"] == "Send Email"
-
-
-class TestToolSearchCatalogManagement:
-    """Tests for tool catalog management."""
-
-    def test_add_tool(self, tool_search: ToolSearchTool) -> None:
-        """Test adding a tool to the catalog."""
-        initial_size = tool_search.get_catalog_size()
-
-        class NewTool(BaseTool):
-            name: str = "New Tool"
-            description: str = "A new tool for testing."
-
-            def _run(self) -> str:
-                return "New tool result"
-
-        tool_search.add_tool(NewTool())
-        assert tool_search.get_catalog_size() == initial_size + 1
-
-    def test_add_tools(self, tool_search: ToolSearchTool) -> None:
-        """Test adding multiple tools to the catalog."""
-        initial_size = tool_search.get_catalog_size()
-
-        class NewTool1(BaseTool):
-            name: str = "New Tool 1"
-            description: str = "First new tool."
-
-            def _run(self) -> str:
-                return "Result 1"
-
-        class NewTool2(BaseTool):
-            name: str = "New Tool 2"
-            description: str = "Second new tool."
-
-            def _run(self) -> str:
-                return "Result 2"
-
-        tool_search.add_tools([NewTool1(), NewTool2()])
-        assert tool_search.get_catalog_size() == initial_size + 2
-
-    def test_remove_tool(self, tool_search: ToolSearchTool) -> None:
-        """Test removing a tool from the catalog."""
-        initial_size = tool_search.get_catalog_size()
-        result = tool_search.remove_tool("Web Search")
-
-        assert result is True
-        assert tool_search.get_catalog_size() == initial_size - 1
-
-    def test_remove_nonexistent_tool(self, tool_search: ToolSearchTool) -> None:
-        """Test removing a tool that doesn't exist."""
-        initial_size = tool_search.get_catalog_size()
-        result = tool_search.remove_tool("Nonexistent Tool")
-
-        assert result is False
-        assert tool_search.get_catalog_size() == initial_size
-
-    def test_list_tool_names(self, tool_search: ToolSearchTool) -> None:
-        """Test listing all tool names in the catalog."""
-        names = tool_search.list_tool_names()
-
-        assert len(names) == 5
-        assert "Web Search" in names
-        assert "Database Query" in names
-        assert "Web Scraper" in names
-        assert "Send Email" in names
-        assert "Calculator" in names
-
-
-class TestToolSearchResultFormat:
-    """Tests for the format of search results."""
-
-    def test_result_contains_tool_info(self, tool_search: ToolSearchTool) -> None:
-        """Test that search results contain complete tool information."""
-        result = tool_search._run("Calculator")
-        result_data = json.loads(result)
-
-        assert result_data["status"] == "success"
-        tool_info = result_data["tools"][0]
-
-        assert "name" in tool_info
-        assert "description" in tool_info
-        assert "args_schema" in tool_info
-        assert tool_info["name"] == "Calculator"
-
-    def test_result_args_schema_format(self, tool_search: ToolSearchTool) -> None:
-        """Test that args_schema is properly formatted."""
-        result = tool_search._run("Email")
-        result_data = json.loads(result)
-
-        assert result_data["status"] == "success"
-        tool_info = result_data["tools"][0]
-
-        assert "args_schema" in tool_info
-        args_schema = tool_info["args_schema"]
-        assert isinstance(args_schema, dict)
-
-
-class TestToolSearchIntegration:
-    """Integration tests for ToolSearchTool."""
-
-    def test_tool_search_as_base_tool(self, sample_tools: list[BaseTool]) -> None:
-        """Test that ToolSearchTool works as a BaseTool."""
-        tool_search = ToolSearchTool(tool_catalog=sample_tools)
-
-        assert isinstance(tool_search, BaseTool)
-        assert tool_search.name == "Tool Search"
-        assert "search" in tool_search.description.lower()
-
-    def test_tool_search_to_structured_tool(
-        self, sample_tools: list[BaseTool]
-    ) -> None:
-        """Test converting ToolSearchTool to structured tool."""
-        tool_search = ToolSearchTool(tool_catalog=sample_tools)
-        structured = tool_search.to_structured_tool()
-
-        assert structured.name == "Tool Search"
-        assert structured.args_schema is not None
-
-    def test_tool_search_run_method(self, tool_search: ToolSearchTool) -> None:
-        """Test the run method of ToolSearchTool."""
-        result = tool_search.run(query="search", max_results=3)
-
-        assert isinstance(result, str)
-        result_data = json.loads(result)
-        assert "status" in result_data
-        assert "tools" in result_data
-
-
-class TestToolSearchScoring:
-    """Tests for the keyword scoring algorithm."""
-
-    def test_exact_name_match_scores_highest(
-        self, sample_tools: list[BaseTool]
-    ) -> None:
-        """Test that exact name matches score higher than partial matches."""
-        tool_search = ToolSearchTool(tool_catalog=sample_tools)
-        result = tool_search._run("Web Search")
-        result_data = json.loads(result)
-
-        assert result_data["status"] == "success"
-        assert result_data["tools"][0]["name"] == "Web Search"
-
-    def test_name_match_scores_higher_than_description(
-        self, sample_tools: list[BaseTool]
-    ) -> None:
-        """Test that name matches score higher than description matches."""
-        tool_search = ToolSearchTool(tool_catalog=sample_tools)
-        result = tool_search._run("Calculator")
-        result_data = json.loads(result)
-
-        assert result_data["status"] == "success"
-        assert result_data["tools"][0]["name"] == "Calculator"

lib/devtools/src/crewai_devtools/__init__.py

@@ -1,3 +1,3 @@
 """CrewAI development tools."""
 
-__version__ = "1.8.0"
+__version__ = "1.8.1"

pyproject.toml

@@ -117,7 +117,7 @@ show_error_codes = true
 warn_unused_ignores = true
 python_version = "3.12"
 exclude = "(?x)(^lib/crewai/src/crewai/cli/templates/ | ^lib/crewai/tests/ | ^lib/crewai-tools/tests/)"
-plugins = ["pydantic.mypy", "crewai.mypy"]
+plugins = ["pydantic.mypy"]
 
 
 [tool.bandit]