refactor: remove cli/ from crewai package and relocate to proper modules

Move framework infrastructure out of crewai/cli/ to dedicated modules: - cli/authentication/ → crewai/auth/ - cli/config.py → crewai/settings.py - cli/constants.py → crewai/constants.py - cli/plus_api.py → crewai/plus_api.py - cli/version.py → crewai/version.py - cli/crew_chat.py → crewai/utilities/crew_chat.py - cli/reset_memories_command.py → crewai/utilities/reset_memories.py - cli/utils.py (framework parts) → crewai/utilities/project_utils.py Delete CLI-only duplicates (command.py, git.py, provider.py) already present in crewai_cli. Replace _login_to_tool_repository with a _post_login() hook in AuthenticationCommand. Update all imports and mock.patch paths across both packages and tests.
fix(ci): exclude crewai_cli templates from ruff linting
2026-03-17 01:08:15 +00:00 · 2026-03-15 19:39:55 -04:00 · 2026-03-14 22:38:48 -04:00 · 2026-03-14 22:24:34 -04:00 · 2026-03-14 22:21:02 -04:00 · 2026-03-14 22:17:02 -04:00
312 changed files with 12618 additions and 45173 deletions
--- a/.github/workflows/linter.yml
+++ b/.github/workflows/linter.yml
@@ -55,6 +55,7 @@ jobs:
         echo "${{ steps.changed-files.outputs.files }}" \
           | tr ' ' '\n' \
           | grep -v 'src/crewai/cli/templates/' \
+           | grep -v 'src/crewai_cli/templates/' \
           | grep -v '/tests/' \
           | xargs -I{} uv run ruff check "{}"

--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -19,7 +19,7 @@ repos:
        language: system
        pass_filenames: true
        types: [python]
-        exclude: ^(lib/crewai/src/crewai/cli/templates/|lib/crewai/tests/|lib/crewai-tools/tests/|lib/crewai-files/tests/)
+        exclude: ^(lib/crewai/src/crewai/cli/templates/|lib/cli/|lib/crewai/tests/|lib/crewai-tools/tests/|lib/crewai-files/tests/)
  - repo: https://github.com/astral-sh/uv-pre-commit
    rev: 0.9.3
    hooks:
--- a/conftest.py
+++ b/conftest.py
@@ -226,7 +226,7 @@ def vcr_cassette_dir(request: Any) -> str:

    for parent in test_file.parents:
        if (
-            parent.name in ("crewai", "crewai-tools", "crewai-files")
+            parent.name in ("crewai", "crewai-tools", "crewai-files", "cli")
            and parent.parent.name == "lib"
        ):
            package_root = parent
--- a/docs/en/changelog.mdx
+++ b/docs/en/changelog.mdx
@@ -4,29 +4,6 @@ description: "Product updates, improvements, and bug fixes for CrewAI"
 icon: "clock"
 mode: "wide"
 ---
-<Update label="Mar 15, 2026">
-  ## v1.11.0rc1
-
-  [View release on GitHub](https://github.com/crewAIInc/crewAI/releases/tag/1.11.0rc1)
-
-  ## What's Changed
-
-  ### Features
-  - Add Plus API token authentication in a2a
-  - Implement plan execute pattern
-
-  ### Bug Fixes
-  - Resolve code interpreter sandbox escape issue
-
-  ### Documentation
-  - Update changelog and version for v1.10.2rc2
-
-  ## Contributors
-
-  @Copilot, @greysonlalonde, @lorenzejay, @theCyberTech
-
-</Update>
-
 <Update label="Mar 14, 2026">
  ## v1.10.2rc2

--- a/docs/en/concepts/event-listener.mdx
+++ b/docs/en/concepts/event-listener.mdx
@@ -219,16 +219,6 @@ CrewAI provides a wide range of events that you can listen for:
 - **ToolExecutionErrorEvent**: Emitted when a tool execution encounters an error
 - **ToolSelectionErrorEvent**: Emitted when there's an error selecting a tool

-### MCP Events
-
- **MCPConnectionStartedEvent**: Emitted when starting to connect to an MCP server. Contains the server name, URL, transport type, connection timeout, and whether it's a reconnection attempt.
- **MCPConnectionCompletedEvent**: Emitted when successfully connected to an MCP server. Contains the server name, connection duration in milliseconds, and whether it was a reconnection.
- **MCPConnectionFailedEvent**: Emitted when connection to an MCP server fails. Contains the server name, error message, and error type (`timeout`, `authentication`, `network`, etc.).
- **MCPToolExecutionStartedEvent**: Emitted when starting to execute an MCP tool. Contains the server name, tool name, and tool arguments.
- **MCPToolExecutionCompletedEvent**: Emitted when MCP tool execution completes successfully. Contains the server name, tool name, result, and execution duration in milliseconds.
- **MCPToolExecutionFailedEvent**: Emitted when MCP tool execution fails. Contains the server name, tool name, error message, and error type (`timeout`, `validation`, `server_error`, etc.).
- **MCPConfigFetchFailedEvent**: Emitted when fetching an MCP server configuration fails (e.g., the MCP is not connected in your account, API error, or connection failure after config was fetched). Contains the slug, error message, and error type (`not_connected`, `api_error`, `connection_failed`).
-
 ### Knowledge Events

 - **KnowledgeRetrievalStartedEvent**: Emitted when a knowledge retrieval is started
--- a/docs/en/mcp/dsl-integration.mdx
+++ b/docs/en/mcp/dsl-integration.mdx
@@ -62,22 +62,22 @@ Use the `#` syntax to select specific tools from a server:
 "https://mcp.exa.ai/mcp?api_key=your_key#web_search_exa"
 ```

-### Connected MCP Integrations
+### CrewAI AMP Marketplace

-Connect MCP servers from the CrewAI catalog or bring your own. Once connected in your account, reference them by slug:
+Access tools from the CrewAI AMP marketplace:

 ```python
-# Connected MCP with all tools
-"snowflake"
+# Full service with all tools
+"crewai-amp:financial-data"

-# Specific tool from a connected MCP
-"stripe#list_invoices"
+# Specific tool from AMP service
+"crewai-amp:research-tools#pubmed_search"

-# Multiple connected MCPs
+# Multiple AMP services
 mcps=[
-    "snowflake",
-    "stripe",
-    "github"
+    "crewai-amp:weather-insights",
+    "crewai-amp:market-analysis",
+    "crewai-amp:social-media-monitoring"
 ]
 ```

@@ -99,10 +99,10 @@ multi_source_agent = Agent(
        "https://mcp.exa.ai/mcp?api_key=your_exa_key&profile=research",
        "https://weather.api.com/mcp#get_current_conditions",

-        # Connected MCPs from catalog
-        "snowflake",
-        "stripe#list_invoices",
-        "github#search_repositories"
+        # CrewAI AMP marketplace
+        "crewai-amp:financial-insights",
+        "crewai-amp:academic-research#pubmed_search",
+        "crewai-amp:market-intelligence#competitor_analysis"
    ]
 )

@@ -147,7 +147,7 @@ agent = Agent(
    mcps=[
        "https://mcp.exa.ai/mcp?api_key=key",      # Tools: mcp_exa_ai_*
        "https://weather.service.com/mcp",         # Tools: weather_service_com_*
-        "snowflake"                                # Tools: snowflake_*
+        "crewai-amp:financial-data"                # Tools: financial_data_*
    ]
 )

@@ -170,7 +170,7 @@ agent = Agent(
        "https://primary-server.com/mcp",         # Primary data source
        "https://backup-server.com/mcp",          # Backup if primary fails
        "https://unreachable-server.com/mcp",     # Will be skipped with warning
-        "snowflake"                               # Connected MCP from catalog
+        "crewai-amp:reliable-service"             # Reliable AMP service
    ]
 )

@@ -254,7 +254,7 @@ agent = Agent(
    apps=["gmail", "slack"],                       # Platform integrations
    mcps=[                                         # MCP servers
        "https://mcp.exa.ai/mcp?api_key=key",
-        "snowflake"
+        "crewai-amp:research-tools"
    ],

    verbose=True,
@@ -298,7 +298,7 @@ agent = Agent(
 mcps=[
    "https://primary-api.com/mcp",       # Primary choice
    "https://backup-api.com/mcp",        # Backup option
-    "snowflake"                          # Connected MCP fallback
+    "crewai-amp:reliable-service"        # AMP fallback
 ]
 ```

@@ -311,7 +311,7 @@ agent = Agent(
    backstory="Financial analyst with access to weather data for agricultural market insights",
    mcps=[
        "https://weather.service.com/mcp#get_forecast",
-        "stripe#list_invoices"
+        "crewai-amp:financial-data#stock_analysis"
    ]
 )
 ```
--- a/docs/en/mcp/overview.mdx
+++ b/docs/en/mcp/overview.mdx
@@ -17,7 +17,7 @@ Use the `mcps` field directly on agents for seamless MCP tool integration. The D

 #### String-Based References (Quick Setup)

-Perfect for remote HTTPS servers and connected MCP integrations from the CrewAI catalog:
+Perfect for remote HTTPS servers and CrewAI AMP marketplace:

 ```python
 from crewai import Agent
@@ -29,8 +29,8 @@ agent = Agent(
    mcps=[
        "https://mcp.exa.ai/mcp?api_key=your_key",           # External MCP server
        "https://api.weather.com/mcp#get_forecast",          # Specific tool from server
-        "snowflake",                                         # Connected MCP from catalog
-        "stripe#list_invoices"                               # Specific tool from connected MCP
+        "crewai-amp:financial-data",                         # CrewAI AMP marketplace
+        "crewai-amp:research-tools#pubmed_search"            # Specific AMP tool
    ]
 )
 # MCP tools are now automatically available to your agent!
@@ -127,7 +127,7 @@ research_agent = Agent(
    backstory="Expert researcher with access to multiple data sources",
    mcps=[
        "https://mcp.exa.ai/mcp?api_key=your_key&profile=your_profile",
-        "snowflake#run_query"
+        "crewai-amp:weather-service#current_conditions"
    ]
 )

@@ -204,22 +204,19 @@ mcps=[
 ]
 ```

-#### Connected MCP Integrations
-
-Connect MCP servers from the CrewAI catalog or bring your own. Once connected in your account, reference them by slug:
+#### CrewAI AMP Marketplace

 ```python
 mcps=[
-    # Connected MCP - get all available tools
-    "snowflake",
+    # Full AMP MCP service - get all available tools
+    "crewai-amp:financial-data",

-    # Specific tool from a connected MCP using # syntax
-    "stripe#list_invoices",
+    # Specific tool from AMP service using # syntax
+    "crewai-amp:research-tools#pubmed_search",

-    # Multiple connected MCPs
-    "snowflake",
-    "stripe",
-    "github"
+    # Multiple AMP services
+    "crewai-amp:weather-service",
+    "crewai-amp:market-analysis"
 ]
 ```

@@ -302,7 +299,7 @@ from crewai.mcp import MCPServerStdio, MCPServerHTTP
 mcps=[
    # String references
    "https://external-api.com/mcp",              # External server
-    "snowflake",                                 # Connected MCP from catalog
+    "crewai-amp:financial-insights",             # AMP service

    # Structured configurations
    MCPServerStdio(
@@ -412,7 +409,7 @@ agent = Agent(
        # String references
        "https://reliable-server.com/mcp",        # Will work
        "https://unreachable-server.com/mcp",     # Will be skipped gracefully
-        "snowflake",                              # Connected MCP from catalog
+        "crewai-amp:working-service",             # Will work

        # Structured configs
        MCPServerStdio(
--- a/docs/ko/changelog.mdx
+++ b/docs/ko/changelog.mdx
@@ -4,29 +4,6 @@ description: "CrewAI의 제품 업데이트, 개선 사항 및 버그 수정"
 icon: "clock"
 mode: "wide"
 ---
-<Update label="2026년 3월 15일">
-  ## v1.11.0rc1
-
-  [GitHub 릴리스 보기](https://github.com/crewAIInc/crewAI/releases/tag/1.11.0rc1)
-
-  ## 변경 사항
-
-  ### 기능
-  - Plus API 토큰 인증 추가
-  - 에서 계획 실행 패턴 구현
-
-  ### 버그 수정
-  - 코드 인터프리터 샌드박스 탈출 문제 해결
-
-  ### 문서
-  - v1.10.2rc2의 변경 로그 및 버전 업데이트
-
-  ## 기여자
-
-  @Copilot, @greysonlalonde, @lorenzejay, @theCyberTech
-
-</Update>
-
 <Update label="2026년 3월 14일">
  ## v1.10.2rc2

--- a/docs/ko/mcp/dsl-integration.mdx
+++ b/docs/ko/mcp/dsl-integration.mdx
@@ -62,22 +62,22 @@ agent = Agent(
 "https://mcp.exa.ai/mcp?api_key=your_key#web_search_exa"
 ```

-### 연결된 MCP 통합
+### CrewAI AMP 마켓플레이스

-CrewAI 카탈로그에서 MCP 서버를 연결하거나 직접 가져올 수 있습니다. 계정에 연결한 후 슬러그로 참조하세요:
+CrewAI AMP 마켓플레이스의 도구에 액세스하세요:

 ```python
-# 모든 도구가 포함된 연결된 MCP
-"snowflake"
+# 모든 도구가 포함된 전체 서비스
+"crewai-amp:financial-data"

-# 연결된 MCP의 특정 도구
-"stripe#list_invoices"
+# AMP 서비스의 특정 도구
+"crewai-amp:research-tools#pubmed_search"

-# 여러 연결된 MCP
+# 다중 AMP 서비스
 mcps=[
-    "snowflake",
-    "stripe",
-    "github"
+    "crewai-amp:weather-insights",
+    "crewai-amp:market-analysis",
+    "crewai-amp:social-media-monitoring"
 ]
 ```

@@ -99,10 +99,10 @@ multi_source_agent = Agent(
        "https://mcp.exa.ai/mcp?api_key=your_exa_key&profile=research",
        "https://weather.api.com/mcp#get_current_conditions",

-        # 카탈로그에서 연결된 MCP
-        "snowflake",
-        "stripe#list_invoices",
-        "github#search_repositories"
+        # CrewAI AMP 마켓플레이스
+        "crewai-amp:financial-insights",
+        "crewai-amp:academic-research#pubmed_search",
+        "crewai-amp:market-intelligence#competitor_analysis"
    ]
 )

@@ -154,7 +154,7 @@ agent = Agent(
        "https://reliable-server.com/mcp",        # 작동할 것
        "https://unreachable-server.com/mcp",     # 우아하게 건너뛸 것
        "https://slow-server.com/mcp",            # 우아하게 타임아웃될 것
-        "snowflake"                               # 카탈로그에서 연결된 MCP
+        "crewai-amp:working-service"              # 작동할 것
    ]
 )
 # 에이전트는 작동하는 서버의 도구를 사용하고 실패한 서버에 대한 경고를 로그에 남깁니다
@@ -229,6 +229,6 @@ agent = Agent(
 mcps=[
    "https://primary-api.com/mcp",       # 주요 선택
    "https://backup-api.com/mcp",        # 백업 옵션
-    "snowflake"                          # 연결된 MCP 폴백
+    "crewai-amp:reliable-service"        # AMP 폴백
 ]
 ```
--- a/docs/ko/mcp/overview.mdx
+++ b/docs/ko/mcp/overview.mdx
@@ -25,8 +25,8 @@ agent = Agent(
    mcps=[
        "https://mcp.exa.ai/mcp?api_key=your_key",           # 외부 MCP 서버
        "https://api.weather.com/mcp#get_forecast",          # 서버의 특정 도구
-        "snowflake",                                         # 카탈로그에서 연결된 MCP
-        "stripe#list_invoices"                               # 연결된 MCP의 특정 도구
+        "crewai-amp:financial-data",                         # CrewAI AMP 마켓플레이스
+        "crewai-amp:research-tools#pubmed_search"            # 특정 AMP 도구
    ]
 )
 # MCP 도구들이 이제 자동으로 에이전트에서 사용 가능합니다!
--- a/docs/pt-BR/changelog.mdx
+++ b/docs/pt-BR/changelog.mdx
@@ -4,29 +4,6 @@ description: "Atualizações de produto, melhorias e correções do CrewAI"
 icon: "clock"
 mode: "wide"
 ---
-<Update label="15 mar 2026">
-  ## v1.11.0rc1
-
-  [Ver release no GitHub](https://github.com/crewAIInc/crewAI/releases/tag/1.11.0rc1)
-
-  ## O que Mudou
-
-  ### Funcionalidades
-  - Adicionar autenticação de token da API Plus
-  - Implementar padrão de execução de plano
-
-  ### Correções de Bugs
-  - Resolver problema de escape do sandbox do interpretador de código
-
-  ### Documentação
-  - Atualizar changelog e versão para v1.10.2rc2
-
-  ## Contribuidores
-
-  @Copilot, @greysonlalonde, @lorenzejay, @theCyberTech
-
-</Update>
-
 <Update label="14 mar 2026">
  ## v1.10.2rc2

--- a/docs/pt-BR/mcp/dsl-integration.mdx
+++ b/docs/pt-BR/mcp/dsl-integration.mdx
@@ -62,22 +62,22 @@ Use a sintaxe `#` para selecionar ferramentas específicas de um servidor:
 "https://mcp.exa.ai/mcp?api_key=sua_chave#web_search_exa"
 ```

-### Integrações MCP Conectadas
+### Marketplace CrewAI AMP

-Conecte servidores MCP do catálogo CrewAI ou traga os seus próprios. Uma vez conectados em sua conta, referencie-os pelo slug:
+Acesse ferramentas do marketplace CrewAI AMP:

 ```python
-# MCP conectado com todas as ferramentas
-"snowflake"
+# Serviço completo com todas as ferramentas
+"crewai-amp:financial-data"

-# Ferramenta específica de um MCP conectado
-"stripe#list_invoices"
+# Ferramenta específica do serviço AMP
+"crewai-amp:research-tools#pubmed_search"

-# Múltiplos MCPs conectados
+# Múltiplos serviços AMP
 mcps=[
-    "snowflake",
-    "stripe",
-    "github"
+    "crewai-amp:weather-insights",
+    "crewai-amp:market-analysis",
+    "crewai-amp:social-media-monitoring"
 ]
 ```

@@ -99,10 +99,10 @@ agente_multi_fonte = Agent(
        "https://mcp.exa.ai/mcp?api_key=sua_chave_exa&profile=pesquisa",
        "https://weather.api.com/mcp#get_current_conditions",

-        # MCPs conectados do catálogo
-        "snowflake",
-        "stripe#list_invoices",
-        "github#search_repositories"
+        # Marketplace CrewAI AMP
+        "crewai-amp:financial-insights",
+        "crewai-amp:academic-research#pubmed_search",
+        "crewai-amp:market-intelligence#competitor_analysis"
    ]
 )

@@ -154,7 +154,7 @@ agente = Agent(
        "https://servidor-confiavel.com/mcp",        # Vai funcionar
        "https://servidor-inalcancavel.com/mcp",     # Será ignorado graciosamente
        "https://servidor-lento.com/mcp",            # Timeout gracioso
-        "snowflake"                                  # MCP conectado do catálogo
+        "crewai-amp:servico-funcionando"             # Vai funcionar
    ]
 )
 # O agente usará ferramentas de servidores funcionais e registrará avisos para os que falharem
@@ -229,6 +229,6 @@ agente = Agent(
 mcps=[
    "https://api-principal.com/mcp",       # Escolha principal
    "https://api-backup.com/mcp",          # Opção de backup
-    "snowflake"                            # Fallback MCP conectado
+    "crewai-amp:servico-confiavel"         # Fallback AMP
 ]
 ```
--- a/docs/pt-BR/mcp/overview.mdx
+++ b/docs/pt-BR/mcp/overview.mdx
@@ -25,8 +25,8 @@ agent = Agent(
    mcps=[
        "https://mcp.exa.ai/mcp?api_key=sua_chave",           # Servidor MCP externo
        "https://api.weather.com/mcp#get_forecast",           # Ferramenta específica do servidor
-        "snowflake",                                          # MCP conectado do catálogo
-        "stripe#list_invoices"                                # Ferramenta específica de MCP conectado
+        "crewai-amp:financial-data",                          # Marketplace CrewAI AMP
+        "crewai-amp:research-tools#pubmed_search"             # Ferramenta AMP específica
    ]
 )
 # Ferramentas MCP agora estão automaticamente disponíveis para seu agente!
--- a/lib/cli/README.md
+++ b/lib/cli/README.md
@@ -0,0 +1,15 @@
+# crewai-cli
+
+CLI for CrewAI - scaffold, run, deploy and manage AI agent crews without installing the full framework.
+
+## Installation
+
+```bash
+pip install crewai-cli
+```
+
+Or install alongside the full framework:
+
+```bash
+pip install crewai[cli]
+```
--- a/lib/cli/pyproject.toml
+++ b/lib/cli/pyproject.toml
@@ -0,0 +1,39 @@
+[project]
+name = "crewai-cli"
+version = "1.10.0"
+description = "CLI for CrewAI - scaffold, run, deploy and manage AI agent crews without installing the full framework."
+readme = "README.md"
+authors = [
+    { name = "Joao Moura", email = "joao@crewai.com" }
+]
+requires-python = ">=3.10, <3.14"
+dependencies = [
+    "click~=8.1.7",
+    "pydantic~=2.11.9",
+    "pydantic-settings~=2.10.1",
+    "appdirs~=1.4.4",
+    "httpx~=0.28.1",
+    "pyjwt>=2.9.0,<3",
+    "rich>=13.7.1",
+    "tomli~=2.0.2",
+    "tomli-w~=1.1.0",
+    "packaging>=23.0",
+    "python-dotenv~=1.1.1",
+    "uv~=0.9.13",
+    "portalocker~=2.7.0",
+]
+
+[project.urls]
+Homepage = "https://crewai.com"
+Documentation = "https://docs.crewai.com"
+Repository = "https://github.com/crewAIInc/crewAI"
+
+[project.scripts]
+crewai = "crewai_cli.cli:crewai"
+
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[tool.hatch.build.targets.wheel]
+packages = ["src/crewai_cli"]
--- a/lib/cli/src/crewai_cli/init.py
+++ b/lib/cli/src/crewai_cli/init.py
@@ -0,0 +1 @@
+__version__ = "1.10.0"
--- a/lib/crewai/src/crewai/cli/add_crew_to_flow.py
+++ b/lib/crewai/src/crewai/cli/add_crew_to_flow.py
@@ -2,19 +2,15 @@ from pathlib import Path

 import click

-from crewai.cli.utils import copy_template
-from crewai.utilities.printer import Printer
-
-
-_printer = Printer()
+from crewai_cli.utils import copy_template


 def add_crew_to_flow(crew_name: str) -> None:
    """Add a new crew to the current flow."""
    # Check if pyproject.toml exists in the current directory
    if not Path("pyproject.toml").exists():
-        _printer.print(
-            "This command must be run from the root of a flow project.", color="red"
+        click.secho(
+            "This command must be run from the root of a flow project.", fg="red"
        )
        raise click.ClickException(
            "This command must be run from the root of a flow project."
@@ -25,7 +21,7 @@ def add_crew_to_flow(crew_name: str) -> None:
    crews_folder = flow_folder / "src" / flow_folder.name / "crews"

    if not crews_folder.exists():
-        _printer.print("Crews folder does not exist in the current flow.", color="red")
+        click.secho("Crews folder does not exist in the current flow.", fg="red")
        raise click.ClickException("Crews folder does not exist in the current flow.")

    # Create the crew within the flow's crews directory
--- a/lib/cli/src/crewai_cli/authentication/init.py
+++ b/lib/cli/src/crewai_cli/authentication/init.py
@@ -0,0 +1,4 @@
+from crewai_cli.authentication.main import AuthenticationCommand
+
+
+__all__ = ["AuthenticationCommand"]
--- a/lib/crewai/src/crewai/cli/authentication/constants.py
+++ b/lib/crewai/src/crewai/cli/authentication/constants.py
--- a/lib/crewai/src/crewai/cli/authentication/main.py
+++ b/lib/crewai/src/crewai/cli/authentication/main.py
@@ -6,9 +6,9 @@ import httpx
 from pydantic import BaseModel, Field
 from rich.console import Console

-from crewai.cli.authentication.utils import validate_jwt_token
-from crewai.cli.config import Settings
-from crewai.cli.shared.token_manager import TokenManager
+from crewai_cli.authentication.utils import validate_jwt_token
+from crewai_cli.config import Settings
+from crewai_cli.shared.token_manager import TokenManager


 console = Console()
@@ -51,7 +51,7 @@ class Oauth2Settings(BaseModel):


 if TYPE_CHECKING:
-    from crewai.cli.authentication.providers.base_provider import BaseProvider
+    from crewai_cli.authentication.providers.base_provider import BaseProvider


 class ProviderFactory:
@@ -65,7 +65,7 @@ class ProviderFactory:
        import importlib

        module = importlib.import_module(
-            f"crewai.cli.authentication.providers.{settings.provider.lower()}"
+            f"crewai_cli.authentication.providers.{settings.provider.lower()}"
        )
        # Converts from snake_case to CamelCase to obtain the provider class name.
        provider = getattr(
@@ -180,7 +180,7 @@ class AuthenticationCommand:
    def _login_to_tool_repository(self) -> None:
        """Login to the tool repository."""

-        from crewai.cli.tools.main import ToolCommand
+        from crewai_cli.tools.main import ToolCommand

        try:
            console.print(
--- a/lib/cli/src/crewai_cli/authentication/providers/init.py
+++ b/lib/cli/src/crewai_cli/authentication/providers/init.py
--- a/lib/crewai/src/crewai/cli/authentication/providers/auth0.py
+++ b/lib/crewai/src/crewai/cli/authentication/providers/auth0.py
@@ -1,4 +1,4 @@
-from crewai.cli.authentication.providers.base_provider import BaseProvider
+from crewai_cli.authentication.providers.base_provider import BaseProvider


 class Auth0Provider(BaseProvider):
--- a/lib/crewai/src/crewai/cli/authentication/providers/base_provider.py
+++ b/lib/crewai/src/crewai/cli/authentication/providers/base_provider.py
@@ -1,6 +1,6 @@
 from abc import ABC, abstractmethod

-from crewai.cli.authentication.main import Oauth2Settings
+from crewai_cli.authentication.main import Oauth2Settings


 class BaseProvider(ABC):
--- a/lib/crewai/src/crewai/cli/authentication/providers/entra_id.py
+++ b/lib/crewai/src/crewai/cli/authentication/providers/entra_id.py
@@ -1,6 +1,6 @@
 from typing import cast

-from crewai.cli.authentication.providers.base_provider import BaseProvider
+from crewai_cli.authentication.providers.base_provider import BaseProvider


 class EntraIdProvider(BaseProvider):
--- a/lib/crewai/src/crewai/cli/authentication/providers/keycloak.py
+++ b/lib/crewai/src/crewai/cli/authentication/providers/keycloak.py
@@ -1,4 +1,4 @@
-from crewai.cli.authentication.providers.base_provider import BaseProvider
+from crewai_cli.authentication.providers.base_provider import BaseProvider


 class KeycloakProvider(BaseProvider):
--- a/lib/crewai/src/crewai/cli/authentication/providers/okta.py
+++ b/lib/crewai/src/crewai/cli/authentication/providers/okta.py
@@ -1,4 +1,4 @@
-from crewai.cli.authentication.providers.base_provider import BaseProvider
+from crewai_cli.authentication.providers.base_provider import BaseProvider


 class OktaProvider(BaseProvider):
--- a/lib/crewai/src/crewai/cli/authentication/providers/workos.py
+++ b/lib/crewai/src/crewai/cli/authentication/providers/workos.py
@@ -1,4 +1,4 @@
-from crewai.cli.authentication.providers.base_provider import BaseProvider
+from crewai_cli.authentication.providers.base_provider import BaseProvider


 class WorkosProvider(BaseProvider):
--- a/lib/crewai/src/crewai/cli/authentication/token.py
+++ b/lib/crewai/src/crewai/cli/authentication/token.py
@@ -1,4 +1,4 @@
-from crewai.cli.shared.token_manager import TokenManager
+from crewai_cli.shared.token_manager import TokenManager


 class AuthError(Exception):
--- a/lib/crewai/src/crewai/cli/authentication/utils.py
+++ b/lib/crewai/src/crewai/cli/authentication/utils.py
--- a/lib/crewai/src/crewai/cli/cli.py
+++ b/lib/crewai/src/crewai/cli/cli.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from importlib.metadata import version as get_version
 import os
 import subprocess
@@ -5,44 +7,58 @@ from typing import Any

 import click

-from crewai.cli.add_crew_to_flow import add_crew_to_flow
-from crewai.cli.authentication.main import AuthenticationCommand
-from crewai.cli.config import Settings
-from crewai.cli.create_crew import create_crew
-from crewai.cli.create_flow import create_flow
-from crewai.cli.crew_chat import run_chat
-from crewai.cli.deploy.main import DeployCommand
-from crewai.cli.enterprise.main import EnterpriseConfigureCommand
-from crewai.cli.evaluate_crew import evaluate_crew
-from crewai.cli.install_crew import install_crew
-from crewai.cli.kickoff_flow import kickoff_flow
-from crewai.cli.organization.main import OrganizationCommand
-from crewai.cli.plot_flow import plot_flow
-from crewai.cli.replay_from_task import replay_task_command
-from crewai.cli.reset_memories_command import reset_memories_command
-from crewai.cli.run_crew import run_crew
-from crewai.cli.settings.main import SettingsCommand
-from crewai.cli.tools.main import ToolCommand
-from crewai.cli.train_crew import train_crew
-from crewai.cli.triggers.main import TriggersCommand
-from crewai.cli.update_crew import update_crew
-from crewai.cli.utils import build_env_with_tool_repository_credentials, read_toml
-from crewai.memory.storage.kickoff_task_outputs_storage import (
-    KickoffTaskOutputsSQLiteStorage,
+from crewai_cli.add_crew_to_flow import add_crew_to_flow
+from crewai_cli.authentication.main import AuthenticationCommand
+from crewai_cli.config import Settings
+from crewai_cli.create_crew import create_crew
+from crewai_cli.create_flow import create_flow
+from crewai_cli.crew_chat import run_chat
+from crewai_cli.deploy.main import DeployCommand
+from crewai_cli.enterprise.main import EnterpriseConfigureCommand
+from crewai_cli.evaluate_crew import evaluate_crew
+from crewai_cli.install_crew import install_crew
+from crewai_cli.kickoff_flow import kickoff_flow
+from crewai_cli.organization.main import OrganizationCommand
+from crewai_cli.plot_flow import plot_flow
+from crewai_cli.replay_from_task import replay_task_command
+from crewai_cli.reset_memories_command import reset_memories_command
+from crewai_cli.run_crew import run_crew
+from crewai_cli.settings.main import SettingsCommand
+from crewai_cli.task_outputs import load_task_outputs
+from crewai_cli.tools.main import ToolCommand
+from crewai_cli.train_crew import train_crew
+from crewai_cli.triggers.main import TriggersCommand
+from crewai_cli.update_crew import update_crew
+from crewai_cli.user_data import (
+    _load_user_data,
+    _save_user_data,
+    is_tracing_enabled,
 )
+from crewai_cli.utils import build_env_with_tool_repository_credentials, read_toml
+
+
+def _get_cli_version() -> str:
+    """Return the best available version string for the CLI."""
+    # Prefer crewai version if installed (keeps existing UX)
+    try:
+        return get_version("crewai")
+    except Exception:  # noqa: S110
+        pass
+    try:
+        return get_version("crewai-cli")
+    except Exception:
+        return "unknown"


@click.group()
-@click.version_option(get_version("crewai"))
+@click.version_option(_get_cli_version())
 def crewai():
    """Top-level command group for crewai."""


@crewai.command(
    name="uv",
-    context_settings=dict(
-        ignore_unknown_options=True,
-    ),
+    context_settings={"ignore_unknown_options": True},
 )
@click.argument("uv_args", nargs=-1, type=click.UNPROCESSED)
 def uv(uv_args):
@@ -107,7 +123,7 @@ def version(tools):

    if tools:
        try:
-            tools_version = get_version("crewai")
+            tools_version = get_version("crewai-tools")
            click.echo(f"crewai tools version: {tools_version}")
        except Exception:
            click.echo("crewai tools not installed")
@@ -142,12 +158,7 @@ def train(n_iterations: int, filename: str):
    help="Replay the crew from this task ID, including all subsequent tasks.",
 )
 def replay(task_id: str) -> None:
-    """
-    Replay the crew execution from a specific task.
-
-    Args:
-        task_id (str): The ID of the task to replay from.
-    """
+    """Replay the crew execution from a specific task."""
    try:
        click.echo(f"Replaying the crew from task {task_id}")
        replay_task_command(task_id)
@@ -157,12 +168,9 @@ def replay(task_id: str) -> None:

@crewai.command()
 def log_tasks_outputs() -> None:
-    """
-    Retrieve your latest crew.kickoff() task outputs.
-    """
+    """Retrieve your latest crew.kickoff() task outputs."""
    try:
-        storage = KickoffTaskOutputsSQLiteStorage()
-        tasks = storage.load()
+        tasks = load_task_outputs()

        if not tasks:
            click.echo(
@@ -220,11 +228,8 @@ def reset_memories(
    agent_knowledge: bool,
    all: bool,
 ) -> None:
-    """
-    Reset the crew memories (memory, knowledge, agent_knowledge, kickoff_outputs). This will delete all the data saved.
-    """
+    """Reset the crew memories (memory, knowledge, agent_knowledge, kickoff_outputs). This will delete all the data saved."""
    try:
-        # Treat legacy flags as --memory with a deprecation warning
        if long or short or entities:
            legacy_used = [
                f
@@ -291,7 +296,7 @@ def memory(
 ) -> None:
    """Open the Memory TUI to browse scopes and recall memories."""
    try:
-        from crewai.cli.memory_tui import MemoryTUI
+        from crewai_cli.memory_tui import MemoryTUI
    except ImportError as exc:
        click.echo(
            "Textual is required for the memory TUI but could not be imported. "
@@ -341,10 +346,10 @@ def test(n_iterations: int, model: str):


@crewai.command(
-    context_settings=dict(
-        ignore_unknown_options=True,
-        allow_extra_args=True,
-    )
+    context_settings={
+        "ignore_unknown_options": True,
+        "allow_extra_args": True,
+    }
 )
@click.pass_context
 def install(context):
@@ -509,14 +514,12 @@ def triggers_run(trigger_path: str):

@crewai.command()
 def chat():
-    """
-    Start a conversation with the Crew, collecting user-supplied inputs,
+    """Start a conversation with the Crew, collecting user-supplied inputs,
    and using the Chat LLM to generate responses.
    """
    click.secho(
        "\nStarting a conversation with the Crew\nType 'exit' or Ctrl+C to quit.\n",
    )
-
    run_chat()


@@ -627,7 +630,7 @@ def env_view():
        table.add_row(
            "CREWAI_TRACING_ENABLED",
            "[dim]Not set[/dim]",
-            "[dim]—[/dim]",
+            "[dim]---[/dim]",
        )

    # Check other related env vars
@@ -646,7 +649,7 @@ def env_view():
    # Check if .env file exists
    table.add_row(
        ".env file",
-        "✅ Found" if env_file_exists else "❌ Not found",
+        "Found" if env_file_exists else "Not found",
        str(env_file.resolve()) if env_file_exists else "N/A",
    )

@@ -662,11 +665,11 @@ def env_view():
    # Show helpful message
    if env_file_exists:
        console.print(
-            "\n[dim]💡 Tip: To enable tracing via .env, add: CREWAI_TRACING_ENABLED=true[/dim]"
+            "\n[dim]Tip: To enable tracing via .env, add: CREWAI_TRACING_ENABLED=true[/dim]"
        )
    else:
        console.print(
-            "\n[dim]💡 Tip: Create a .env file in your project root and add: CREWAI_TRACING_ENABLED=true[/dim]"
+            "\n[dim]Tip: Create a .env file in your project root and add: CREWAI_TRACING_ENABLED=true[/dim]"
        )
    console.print()

@@ -682,14 +685,16 @@ def traces_enable():
    from rich.console import Console
    from rich.panel import Panel

-    from crewai.events.listeners.tracing.utils import update_user_data
-
    console = Console()

-    update_user_data({"trace_consent": True, "first_execution_done": True})
+    # Update user data to enable traces
+    user_data = _load_user_data()
+    user_data["trace_consent"] = True
+    user_data["first_execution_done"] = True
+    _save_user_data(user_data)

    panel = Panel(
-        "✅ Trace collection has been enabled!\n\n"
+        "Trace collection has been enabled!\n\n"
        "Your crew/flow executions will now send traces to CrewAI+.\n"
        "Use 'crewai traces disable' to turn off trace collection.",
        title="Traces Enabled",
@@ -705,14 +710,16 @@ def traces_disable():
    from rich.console import Console
    from rich.panel import Panel

-    from crewai.events.listeners.tracing.utils import update_user_data
-
    console = Console()

-    update_user_data({"trace_consent": False, "first_execution_done": True})
+    # Update user data to disable traces
+    user_data = _load_user_data()
+    user_data["trace_consent"] = False
+    user_data["first_execution_done"] = True
+    _save_user_data(user_data)

    panel = Panel(
-        "❌ Trace collection has been disabled!\n\n"
+        "Trace collection has been disabled!\n\n"
        "Your crew/flow executions will no longer send traces.\n"
        "Use 'crewai traces enable' to turn trace collection back on.",
        title="Traces Disabled",
@@ -731,11 +738,6 @@ def traces_status():
    from rich.panel import Panel
    from rich.table import Table

-    from crewai.events.listeners.tracing.utils import (
-        _load_user_data,
-        is_tracing_enabled,
-    )
-
    console = Console()
    user_data = _load_user_data()

@@ -750,19 +752,19 @@ def traces_status():
    # Check user consent
    trace_consent = user_data.get("trace_consent")
    if trace_consent is True:
-        consent_status = "✅ Enabled (user consented)"
+        consent_status = "Enabled (user consented)"
    elif trace_consent is False:
-        consent_status = "❌ Disabled (user declined)"
+        consent_status = "Disabled (user declined)"
    else:
-        consent_status = "⚪ Not set (first-time user)"
+        consent_status = "Not set (first-time user)"
    table.add_row("User Consent", consent_status)

    # Check overall status
    if is_tracing_enabled():
-        overall_status = "✅ ENABLED"
+        overall_status = "ENABLED"
        border_style = "green"
    else:
-        overall_status = "❌ DISABLED"
+        overall_status = "DISABLED"
        border_style = "red"
    table.add_row("Overall Status", overall_status)

--- a/lib/crewai/src/crewai/cli/command.py
+++ b/lib/crewai/src/crewai/cli/command.py
@@ -1,11 +1,12 @@
+from __future__ import annotations
+
 import json

 import httpx
 from rich.console import Console

-from crewai.cli.authentication.token import get_auth_token
-from crewai.cli.plus_api import PlusAPI
-from crewai.telemetry.telemetry import Telemetry
+from crewai_cli.authentication.token import get_auth_token
+from crewai_cli.plus_api import PlusAPI


 console = Console()
@@ -13,17 +14,14 @@ console = Console()

 class BaseCommand:
    def __init__(self) -> None:
-        self._telemetry = Telemetry()
-        self._telemetry.set_tracer()
+        pass


 class PlusAPIMixin:
-    def __init__(self, telemetry: Telemetry) -> None:
+    def __init__(self) -> None:
        try:
-            telemetry.set_tracer()
            self.plus_api_client = PlusAPI(api_key=get_auth_token())
        except Exception:
-            telemetry.deploy_signup_error_span()
            console.print(
                "Please sign up/login to CrewAI+ before using the CLI.",
                style="bold red",
@@ -32,12 +30,6 @@ class PlusAPIMixin:
            raise SystemExit from None

    def _validate_response(self, response: httpx.Response) -> None:
-        """
-        Handle and display error messages from API responses.
-
-        Args:
-            response (httpx.Response): The response from the Plus API
-        """
        try:
            json_response = response.json()
        except (json.JSONDecodeError, ValueError):
--- a/lib/crewai/src/crewai/cli/config.py
+++ b/lib/crewai/src/crewai/cli/config.py
@@ -6,14 +6,14 @@ from typing import Any

 from pydantic import BaseModel, Field

-from crewai.cli.constants import (
+from crewai_cli.constants import (
    CREWAI_ENTERPRISE_DEFAULT_OAUTH2_AUDIENCE,
    CREWAI_ENTERPRISE_DEFAULT_OAUTH2_CLIENT_ID,
    CREWAI_ENTERPRISE_DEFAULT_OAUTH2_DOMAIN,
    CREWAI_ENTERPRISE_DEFAULT_OAUTH2_PROVIDER,
    DEFAULT_CREWAI_ENTERPRISE_URL,
 )
-from crewai.cli.shared.token_manager import TokenManager
+from crewai_cli.shared.token_manager import TokenManager


 logger = getLogger(__name__)
--- a/lib/crewai/src/crewai/cli/constants.py
+++ b/lib/crewai/src/crewai/cli/constants.py
--- a/lib/crewai/src/crewai/cli/create_crew.py
+++ b/lib/crewai/src/crewai/cli/create_crew.py
@@ -5,13 +5,13 @@ import sys
 import click
 import tomli

-from crewai.cli.constants import ENV_VARS, MODELS
-from crewai.cli.provider import (
+from crewai_cli.constants import ENV_VARS, MODELS
+from crewai_cli.provider import (
    get_provider_data,
    select_model,
    select_provider,
 )
-from crewai.cli.utils import copy_template, load_env_vars, write_env_file
+from crewai_cli.utils import copy_template, load_env_vars, write_env_file


 def get_reserved_script_names() -> set[str]:
--- a/lib/crewai/src/crewai/cli/create_flow.py
+++ b/lib/crewai/src/crewai/cli/create_flow.py
@@ -3,8 +3,6 @@ import shutil

 import click

-from crewai.telemetry import Telemetry
-

 def create_flow(name):
    """Create a new flow."""
@@ -18,10 +16,6 @@ def create_flow(name):
        click.secho(f"Error: Folder {folder_name} already exists.", fg="red")
        return

-    # Initialize telemetry
-    telemetry = Telemetry()
-    telemetry.flow_creation_span(class_name)
-
    # Create directory structure
    (project_root / "src" / folder_name).mkdir(parents=True)
    (project_root / "src" / folder_name / "crews").mkdir(parents=True)
--- a/lib/cli/src/crewai_cli/crew_chat.py
+++ b/lib/cli/src/crewai_cli/crew_chat.py
@@ -0,0 +1,23 @@
+"""Wrapper for the crew chat command.
+
+Delegates to ``crewai.utilities.crew_chat.run_chat`` when the full crewai
+package is installed, otherwise prints a helpful error message.
+"""
+
+from __future__ import annotations
+
+import click
+
+
+def run_chat() -> None:
+    try:
+        from crewai.utilities.crew_chat import run_chat as _run_chat
+    except ImportError:
+        click.secho(
+            "The 'chat' command requires the full crewai package.\n"
+            "Install it with: pip install crewai",
+            fg="red",
+        )
+        raise SystemExit(1) from None
+
+    _run_chat()
--- a/lib/crewai/src/crewai/cli/authentication/providers/init.py
+++ b/lib/crewai/src/crewai/cli/authentication/providers/init.py
--- a/lib/crewai/src/crewai/cli/deploy/main.py
+++ b/lib/crewai/src/crewai/cli/deploy/main.py
@@ -1,10 +1,11 @@
+from pathlib import Path
 from typing import Any

 from rich.console import Console

-from crewai.cli import git
-from crewai.cli.command import BaseCommand, PlusAPIMixin
-from crewai.cli.utils import fetch_and_json_env_file, get_project_name
+from crewai_cli import git
+from crewai_cli.command import BaseCommand, PlusAPIMixin
+from crewai_cli.utils import fetch_and_json_env_file, get_project_name


 console = Console()
@@ -21,8 +22,43 @@ class DeployCommand(BaseCommand, PlusAPIMixin):
        """

        BaseCommand.__init__(self)
-        PlusAPIMixin.__init__(self, telemetry=self._telemetry)
+        PlusAPIMixin.__init__(self)
        self.project_name = get_project_name(require=True)
+        self._validate_project_structure()
+
+    def _validate_project_structure(self) -> None:
+        """Validate that the local project has the files required for deployment."""
+        errors: list[str] = []
+
+        if not Path("pyproject.toml").exists():
+            errors.append("Cannot find pyproject.toml in the current directory.")
+
+        has_lockfile = Path("uv.lock").exists() or Path("poetry.lock").exists()
+        if not has_lockfile:
+            errors.append(
+                "No uv.lock or poetry.lock found. "
+                "Run 'uv lock' or 'poetry lock' to generate one."
+            )
+
+        src_dir = Path("src") / (self.project_name or "")
+        crew_py = src_dir / "crew.py"
+        config_dir = src_dir / "config"
+        if not crew_py.exists() and not config_dir.exists():
+            errors.append(
+                f"Cannot find src/{self.project_name}/crew.py or "
+                f"src/{self.project_name}/config. "
+                "Ensure you are running this command from the project root."
+            )
+
+        if errors:
+            console.print(
+                "\n[bold red]Pre-flight check failed:[/bold red] "
+                "Your project is missing required files for deployment.\n"
+            )
+            for error in errors:
+                console.print(f"  • {error}", style="red")
+            console.print()
+            raise SystemExit(1)

    def _standard_no_param_error_message(self) -> None:
        """
@@ -67,7 +103,6 @@ class DeployCommand(BaseCommand, PlusAPIMixin):
        Args:
            uuid (Optional[str]): The UUID of the crew to deploy.
        """
-        self._start_deployment_span = self._telemetry.start_deployment_span(uuid)
        console.print("Starting deployment...", style="bold blue")
        if uuid:
            response = self.plus_api_client.deploy_by_uuid(uuid)
@@ -84,9 +119,6 @@ class DeployCommand(BaseCommand, PlusAPIMixin):
        """
        Create a new crew deployment.
        """
-        self._create_crew_deployment_span = (
-            self._telemetry.create_crew_deployment_span()
-        )
        console.print("Creating deployment...", style="bold blue")
        env_vars = fetch_and_json_env_file()

@@ -236,7 +268,6 @@ class DeployCommand(BaseCommand, PlusAPIMixin):
            uuid (Optional[str]): The UUID of the crew to get logs for.
            log_type (str): The type of logs to retrieve (default: "deployment").
        """
-        self._get_crew_logs_span = self._telemetry.get_crew_logs_span(uuid, log_type)
        console.print(f"Fetching {log_type} logs...", style="bold blue")

        if uuid:
@@ -257,7 +288,6 @@ class DeployCommand(BaseCommand, PlusAPIMixin):
        Args:
            uuid (Optional[str]): The UUID of the crew to remove.
        """
-        self._remove_crew_span = self._telemetry.remove_crew_span(uuid)
        console.print("Removing deployment...", style="bold blue")

        if uuid:
--- a/lib/cli/src/crewai_cli/enterprise/init.py
+++ b/lib/cli/src/crewai_cli/enterprise/init.py
--- a/lib/crewai/src/crewai/cli/enterprise/main.py
+++ b/lib/crewai/src/crewai/cli/enterprise/main.py
@@ -4,10 +4,10 @@ from typing import Any, cast
 import httpx
 from rich.console import Console

-from crewai.cli.authentication.main import Oauth2Settings, ProviderFactory
-from crewai.cli.command import BaseCommand
-from crewai.cli.settings.main import SettingsCommand
-from crewai.cli.version import get_crewai_version
+from crewai_cli.authentication.main import Oauth2Settings, ProviderFactory
+from crewai_cli.command import BaseCommand
+from crewai_cli.settings.main import SettingsCommand
+from crewai_cli.version import get_crewai_version


 console = Console()
--- a/lib/crewai/src/crewai/cli/evaluate_crew.py
+++ b/lib/crewai/src/crewai/cli/evaluate_crew.py
--- a/lib/crewai/src/crewai/cli/git.py
+++ b/lib/crewai/src/crewai/cli/git.py
--- a/lib/crewai/src/crewai/cli/install_crew.py
+++ b/lib/crewai/src/crewai/cli/install_crew.py
--- a/lib/crewai/src/crewai/cli/kickoff_flow.py
+++ b/lib/crewai/src/crewai/cli/kickoff_flow.py
--- a/lib/crewai/src/crewai/cli/memory_tui.py
+++ b/lib/crewai/src/crewai/cli/memory_tui.py
--- a/lib/crewai/src/crewai/cli/organization/init.py
+++ b/lib/crewai/src/crewai/cli/organization/init.py
--- a/lib/crewai/src/crewai/cli/organization/main.py
+++ b/lib/crewai/src/crewai/cli/organization/main.py
@@ -2,8 +2,8 @@ from httpx import HTTPStatusError
 from rich.console import Console
 from rich.table import Table

-from crewai.cli.command import BaseCommand, PlusAPIMixin
-from crewai.cli.config import Settings
+from crewai_cli.command import BaseCommand, PlusAPIMixin
+from crewai_cli.config import Settings


 console = Console()
@@ -12,7 +12,7 @@ console = Console()
 class OrganizationCommand(BaseCommand, PlusAPIMixin):
    def __init__(self) -> None:
        BaseCommand.__init__(self)
-        PlusAPIMixin.__init__(self, telemetry=self._telemetry)
+        PlusAPIMixin.__init__(self)

    def list(self) -> None:
        try:
--- a/lib/crewai/src/crewai/cli/plot_flow.py
+++ b/lib/crewai/src/crewai/cli/plot_flow.py
--- a/lib/cli/src/crewai_cli/plus_api.py
+++ b/lib/cli/src/crewai_cli/plus_api.py
@@ -0,0 +1,210 @@
+import os
+from typing import Any
+from urllib.parse import urljoin
+
+import httpx
+
+from crewai_cli.config import Settings
+from crewai_cli.constants import DEFAULT_CREWAI_ENTERPRISE_URL
+from crewai_cli.version import get_crewai_version
+
+
+class PlusAPI:
+    """
+    This class exposes methods for working with the CrewAI+ API.
+    """
+
+    TOOLS_RESOURCE = "/crewai_plus/api/v1/tools"
+    ORGANIZATIONS_RESOURCE = "/crewai_plus/api/v1/me/organizations"
+    CREWS_RESOURCE = "/crewai_plus/api/v1/crews"
+    AGENTS_RESOURCE = "/crewai_plus/api/v1/agents"
+    TRACING_RESOURCE = "/crewai_plus/api/v1/tracing"
+    EPHEMERAL_TRACING_RESOURCE = "/crewai_plus/api/v1/tracing/ephemeral"
+    INTEGRATIONS_RESOURCE = "/crewai_plus/api/v1/integrations"
+
+    def __init__(self, api_key: str) -> None:
+        self.api_key = api_key
+        self.headers = {
+            "Authorization": f"Bearer {api_key}",
+            "Content-Type": "application/json",
+            "User-Agent": f"CrewAI-CLI/{get_crewai_version()}",
+            "X-Crewai-Version": get_crewai_version(),
+        }
+        settings = Settings()
+        if settings.org_uuid:
+            self.headers["X-Crewai-Organization-Id"] = settings.org_uuid
+
+        self.base_url = (
+            os.getenv("CREWAI_PLUS_URL")
+            or str(settings.enterprise_base_url)
+            or DEFAULT_CREWAI_ENTERPRISE_URL
+        )
+
+    def _make_request(
+        self, method: str, endpoint: str, **kwargs: Any
+    ) -> httpx.Response:
+        url = urljoin(self.base_url, endpoint)
+        verify = kwargs.pop("verify", True)
+        with httpx.Client(trust_env=False, verify=verify) as client:
+            return client.request(method, url, headers=self.headers, **kwargs)
+
+    def login_to_tool_repository(self) -> httpx.Response:
+        return self._make_request("POST", f"{self.TOOLS_RESOURCE}/login")
+
+    def get_tool(self, handle: str) -> httpx.Response:
+        return self._make_request("GET", f"{self.TOOLS_RESOURCE}/{handle}")
+
+    async def get_agent(self, handle: str) -> httpx.Response:
+        url = urljoin(self.base_url, f"{self.AGENTS_RESOURCE}/{handle}")
+        async with httpx.AsyncClient() as client:
+            return await client.get(url, headers=self.headers)
+
+    def publish_tool(
+        self,
+        handle: str,
+        is_public: bool,
+        version: str,
+        description: str | None,
+        encoded_file: str,
+        available_exports: list[dict[str, Any]] | None = None,
+    ) -> httpx.Response:
+        params = {
+            "handle": handle,
+            "public": is_public,
+            "version": version,
+            "file": encoded_file,
+            "description": description,
+            "available_exports": available_exports,
+        }
+        return self._make_request("POST", f"{self.TOOLS_RESOURCE}", json=params)
+
+    def deploy_by_name(self, project_name: str) -> httpx.Response:
+        return self._make_request(
+            "POST", f"{self.CREWS_RESOURCE}/by-name/{project_name}/deploy"
+        )
+
+    def deploy_by_uuid(self, uuid: str) -> httpx.Response:
+        return self._make_request("POST", f"{self.CREWS_RESOURCE}/{uuid}/deploy")
+
+    def crew_status_by_name(self, project_name: str) -> httpx.Response:
+        return self._make_request(
+            "GET", f"{self.CREWS_RESOURCE}/by-name/{project_name}/status"
+        )
+
+    def crew_status_by_uuid(self, uuid: str) -> httpx.Response:
+        return self._make_request("GET", f"{self.CREWS_RESOURCE}/{uuid}/status")
+
+    def crew_by_name(
+        self, project_name: str, log_type: str = "deployment"
+    ) -> httpx.Response:
+        return self._make_request(
+            "GET", f"{self.CREWS_RESOURCE}/by-name/{project_name}/logs/{log_type}"
+        )
+
+    def crew_by_uuid(self, uuid: str, log_type: str = "deployment") -> httpx.Response:
+        return self._make_request(
+            "GET", f"{self.CREWS_RESOURCE}/{uuid}/logs/{log_type}"
+        )
+
+    def delete_crew_by_name(self, project_name: str) -> httpx.Response:
+        return self._make_request(
+            "DELETE", f"{self.CREWS_RESOURCE}/by-name/{project_name}"
+        )
+
+    def delete_crew_by_uuid(self, uuid: str) -> httpx.Response:
+        return self._make_request("DELETE", f"{self.CREWS_RESOURCE}/{uuid}")
+
+    def list_crews(self) -> httpx.Response:
+        return self._make_request("GET", self.CREWS_RESOURCE)
+
+    def create_crew(self, payload: dict[str, Any]) -> httpx.Response:
+        return self._make_request("POST", self.CREWS_RESOURCE, json=payload)
+
+    def get_organizations(self) -> httpx.Response:
+        return self._make_request("GET", self.ORGANIZATIONS_RESOURCE)
+
+    def initialize_trace_batch(self, payload: dict[str, Any]) -> httpx.Response:
+        return self._make_request(
+            "POST",
+            f"{self.TRACING_RESOURCE}/batches",
+            json=payload,
+            timeout=30,
+        )
+
+    def initialize_ephemeral_trace_batch(
+        self, payload: dict[str, Any]
+    ) -> httpx.Response:
+        return self._make_request(
+            "POST",
+            f"{self.EPHEMERAL_TRACING_RESOURCE}/batches",
+            json=payload,
+        )
+
+    def send_trace_events(
+        self, trace_batch_id: str, payload: dict[str, Any]
+    ) -> httpx.Response:
+        return self._make_request(
+            "POST",
+            f"{self.TRACING_RESOURCE}/batches/{trace_batch_id}/events",
+            json=payload,
+            timeout=30,
+        )
+
+    def send_ephemeral_trace_events(
+        self, trace_batch_id: str, payload: dict[str, Any]
+    ) -> httpx.Response:
+        return self._make_request(
+            "POST",
+            f"{self.EPHEMERAL_TRACING_RESOURCE}/batches/{trace_batch_id}/events",
+            json=payload,
+            timeout=30,
+        )
+
+    def finalize_trace_batch(
+        self, trace_batch_id: str, payload: dict[str, Any]
+    ) -> httpx.Response:
+        return self._make_request(
+            "PATCH",
+            f"{self.TRACING_RESOURCE}/batches/{trace_batch_id}/finalize",
+            json=payload,
+            timeout=30,
+        )
+
+    def finalize_ephemeral_trace_batch(
+        self, trace_batch_id: str, payload: dict[str, Any]
+    ) -> httpx.Response:
+        return self._make_request(
+            "PATCH",
+            f"{self.EPHEMERAL_TRACING_RESOURCE}/batches/{trace_batch_id}/finalize",
+            json=payload,
+            timeout=30,
+        )
+
+    def mark_trace_batch_as_failed(
+        self, trace_batch_id: str, error_message: str
+    ) -> httpx.Response:
+        return self._make_request(
+            "PATCH",
+            f"{self.TRACING_RESOURCE}/batches/{trace_batch_id}",
+            json={"status": "failed", "failure_reason": error_message},
+            timeout=30,
+        )
+
+    def get_mcp_configs(self, slugs: list[str]) -> httpx.Response:
+        """Get MCP server configurations for the given slugs."""
+        return self._make_request(
+            "GET",
+            f"{self.INTEGRATIONS_RESOURCE}/mcp_configs",
+            params={"slugs": ",".join(slugs)},
+            timeout=30,
+        )
+
+    def get_triggers(self) -> httpx.Response:
+        """Get all available triggers from integrations."""
+        return self._make_request("GET", f"{self.INTEGRATIONS_RESOURCE}/apps")
+
+    def get_trigger_payload(self, app_slug: str, trigger_slug: str) -> httpx.Response:
+        """Get sample payload for a specific trigger."""
+        return self._make_request(
+            "GET", f"{self.INTEGRATIONS_RESOURCE}/{app_slug}/{trigger_slug}/payload"
+        )
--- a/lib/crewai/src/crewai/cli/provider.py
+++ b/lib/crewai/src/crewai/cli/provider.py
@@ -10,7 +10,7 @@ import certifi
 import click
 import httpx

-from crewai.cli.constants import JSON_URL, MODELS, PROVIDERS
+from crewai_cli.constants import JSON_URL, MODELS, PROVIDERS


 def select_choice(prompt_message: str, choices: Sequence[str]) -> str | None:
--- a/lib/crewai/src/crewai/cli/enterprise/init.py
+++ b/lib/crewai/src/crewai/cli/enterprise/init.py
--- a/lib/crewai/src/crewai/cli/replay_from_task.py
+++ b/lib/crewai/src/crewai/cli/replay_from_task.py
--- a/lib/cli/src/crewai_cli/reset_memories_command.py
+++ b/lib/cli/src/crewai_cli/reset_memories_command.py
@@ -0,0 +1,31 @@
+"""Wrapper for the reset-memories command.
+
+Delegates to ``crewai.utilities.reset_memories`` when the full crewai
+package is installed, otherwise prints a helpful error message.
+"""
+
+from __future__ import annotations
+
+import click
+
+
+def reset_memories_command(
+    memory: bool,
+    knowledge: bool,
+    agent_knowledge: bool,
+    kickoff_outputs: bool,
+    all: bool,
+) -> None:
+    try:
+        from crewai.utilities.reset_memories import (
+            reset_memories_command as _reset,
+        )
+    except ImportError:
+        click.secho(
+            "The 'reset-memories' command requires the full crewai package.\n"
+            "Install it with: pip install crewai",
+            fg="red",
+        )
+        raise SystemExit(1) from None
+
+    _reset(memory, knowledge, agent_knowledge, kickoff_outputs, all)
--- a/lib/crewai/src/crewai/cli/run_crew.py
+++ b/lib/crewai/src/crewai/cli/run_crew.py
@@ -5,8 +5,8 @@ import subprocess
 import click
 from packaging import version

-from crewai.cli.utils import build_env_with_tool_repository_credentials, read_toml
-from crewai.cli.version import get_crewai_version
+from crewai_cli.utils import build_env_with_tool_repository_credentials, read_toml
+from crewai_cli.version import get_crewai_version


 class CrewType(Enum):
--- a/lib/crewai/src/crewai/cli/settings/init.py
+++ b/lib/crewai/src/crewai/cli/settings/init.py
--- a/lib/crewai/src/crewai/cli/settings/main.py
+++ b/lib/crewai/src/crewai/cli/settings/main.py
@@ -5,9 +5,9 @@ from typing import Any
 from rich.console import Console
 from rich.table import Table

-from crewai.cli.command import BaseCommand
-from crewai.cli.config import HIDDEN_SETTINGS_KEYS, READONLY_SETTINGS_KEYS, Settings
-from crewai.events.listeners.tracing.utils import _load_user_data
+from crewai_cli.command import BaseCommand
+from crewai_cli.config import HIDDEN_SETTINGS_KEYS, READONLY_SETTINGS_KEYS, Settings
+from crewai_cli.user_data import _load_user_data


 console = Console()
--- a/lib/crewai/src/crewai/cli/shared/init.py
+++ b/lib/crewai/src/crewai/cli/shared/init.py
--- a/lib/crewai/src/crewai/cli/shared/token_manager.py
+++ b/lib/crewai/src/crewai/cli/shared/token_manager.py
--- a/lib/cli/src/crewai_cli/task_outputs.py
+++ b/lib/cli/src/crewai_cli/task_outputs.py
@@ -0,0 +1,54 @@
+"""Lightweight SQLite reader for kickoff task outputs.
+
+Only used by the ``crewai log-tasks-outputs`` CLI command.  Depends solely on
+the standard library + *appdirs* so crewai-cli can read stored outputs without
+importing the full crewai framework.
+"""
+
+from __future__ import annotations
+
+import json
+import logging
+from pathlib import Path
+import sqlite3
+from typing import Any
+
+from crewai_cli.user_data import _db_storage_path
+
+
+logger = logging.getLogger(__name__)
+
+
+def load_task_outputs(db_path: str | None = None) -> list[dict[str, Any]]:
+    """Return all rows from the kickoff task outputs database."""
+    if db_path is None:
+        db_path = str(Path(_db_storage_path()) / "latest_kickoff_task_outputs.db")
+
+    if not Path(db_path).exists():
+        return []
+
+    try:
+        with sqlite3.connect(db_path) as conn:
+            cursor = conn.cursor()
+            cursor.execute("""
+                SELECT *
+                FROM latest_kickoff_task_outputs
+                ORDER BY task_index
+            """)
+            rows = cursor.fetchall()
+            results: list[dict[str, Any]] = [
+                {
+                    "task_id": row[0],
+                    "expected_output": row[1],
+                    "output": json.loads(row[2]),
+                    "task_index": row[3],
+                    "inputs": json.loads(row[4]),
+                    "was_replayed": row[5],
+                    "timestamp": row[6],
+                }
+                for row in rows
+            ]
+            return results
+    except sqlite3.Error as e:
+        logger.error("Failed to load task outputs: %s", e)
+        return []
--- a/lib/crewai/src/crewai/cli/templates/AGENTS.md
+++ b/lib/crewai/src/crewai/cli/templates/AGENTS.md
--- a/lib/crewai/src/crewai/cli/templates/init.py
+++ b/lib/crewai/src/crewai/cli/templates/init.py
--- a/lib/crewai/src/crewai/cli/templates/crew/.gitignore
+++ b/lib/crewai/src/crewai/cli/templates/crew/.gitignore
--- a/lib/crewai/src/crewai/cli/templates/crew/README.md
+++ b/lib/crewai/src/crewai/cli/templates/crew/README.md
--- a/lib/crewai/src/crewai/cli/templates/crew/init.py
+++ b/lib/crewai/src/crewai/cli/templates/crew/init.py
--- a/lib/crewai/src/crewai/cli/templates/crew/config/agents.yaml
+++ b/lib/crewai/src/crewai/cli/templates/crew/config/agents.yaml
--- a/lib/crewai/src/crewai/cli/templates/crew/config/tasks.yaml
+++ b/lib/crewai/src/crewai/cli/templates/crew/config/tasks.yaml
--- a/lib/crewai/src/crewai/cli/templates/crew/crew.py
+++ b/lib/crewai/src/crewai/cli/templates/crew/crew.py
--- a/lib/crewai/src/crewai/cli/templates/crew/knowledge/user_preference.txt
+++ b/lib/crewai/src/crewai/cli/templates/crew/knowledge/user_preference.txt
--- a/lib/crewai/src/crewai/cli/templates/crew/main.py
+++ b/lib/crewai/src/crewai/cli/templates/crew/main.py
--- a/lib/crewai/src/crewai/cli/templates/crew/pyproject.toml
+++ b/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.11.0rc1"
+    "crewai[tools]==1.10.2rc2"
 ]

 [project.scripts]
--- a/lib/crewai/src/crewai/cli/templates/crew/tools/init.py
+++ b/lib/crewai/src/crewai/cli/templates/crew/tools/init.py
--- a/lib/crewai/src/crewai/cli/templates/crew/tools/custom_tool.py
+++ b/lib/crewai/src/crewai/cli/templates/crew/tools/custom_tool.py
--- a/lib/crewai/src/crewai/cli/templates/flow/.gitignore
+++ b/lib/crewai/src/crewai/cli/templates/flow/.gitignore
--- a/lib/crewai/src/crewai/cli/templates/flow/README.md
+++ b/lib/crewai/src/crewai/cli/templates/flow/README.md
--- a/lib/crewai/src/crewai/cli/templates/flow/init.py
+++ b/lib/crewai/src/crewai/cli/templates/flow/init.py
--- a/lib/crewai/src/crewai/cli/templates/flow/crews/poem_crew/init.py
+++ b/lib/crewai/src/crewai/cli/templates/flow/crews/poem_crew/init.py
--- a/lib/crewai/src/crewai/cli/templates/flow/crews/poem_crew/config/agents.yaml
+++ b/lib/crewai/src/crewai/cli/templates/flow/crews/poem_crew/config/agents.yaml
--- a/lib/crewai/src/crewai/cli/templates/flow/crews/poem_crew/config/tasks.yaml
+++ b/lib/crewai/src/crewai/cli/templates/flow/crews/poem_crew/config/tasks.yaml
--- a/lib/crewai/src/crewai/cli/templates/flow/crews/poem_crew/poem_crew.py
+++ b/lib/crewai/src/crewai/cli/templates/flow/crews/poem_crew/poem_crew.py
--- a/lib/crewai/src/crewai/cli/templates/flow/main.py
+++ b/lib/crewai/src/crewai/cli/templates/flow/main.py
--- a/lib/crewai/src/crewai/cli/templates/flow/pyproject.toml
+++ b/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.11.0rc1"
+    "crewai[tools]==1.10.2rc2"
 ]

 [project.scripts]
--- a/lib/crewai/src/crewai/cli/templates/flow/tools/init.py
+++ b/lib/crewai/src/crewai/cli/templates/flow/tools/init.py
--- a/lib/crewai/src/crewai/cli/templates/flow/tools/custom_tool.py
+++ b/lib/crewai/src/crewai/cli/templates/flow/tools/custom_tool.py
--- a/lib/crewai/src/crewai/cli/templates/tool/.gitignore
+++ b/lib/crewai/src/crewai/cli/templates/tool/.gitignore
--- a/lib/crewai/src/crewai/cli/templates/tool/README.md
+++ b/lib/crewai/src/crewai/cli/templates/tool/README.md
--- a/lib/crewai/src/crewai/cli/templates/tool/pyproject.toml
+++ b/lib/crewai/src/crewai/cli/templates/tool/pyproject.toml
@@ -5,7 +5,7 @@ description = "Power up your crews with {{folder_name}}"
 readme = "README.md"
 requires-python = ">=3.10,<3.14"
 dependencies = [
-    "crewai[tools]==1.11.0rc1"
+    "crewai[tools]==1.10.2rc2"
 ]

 [tool.crewai]
--- a/lib/crewai/src/crewai/cli/templates/tool/src/{{folder_name}}/init.py
+++ b/lib/crewai/src/crewai/cli/templates/tool/src/{{folder_name}}/init.py
--- a/lib/crewai/src/crewai/cli/templates/tool/src/{{folder_name}}/tool.py
+++ b/lib/crewai/src/crewai/cli/templates/tool/src/{{folder_name}}/tool.py
--- a/lib/crewai/src/crewai/cli/tools/init.py
+++ b/lib/crewai/src/crewai/cli/tools/init.py
--- a/lib/crewai/src/crewai/cli/tools/main.py
+++ b/lib/crewai/src/crewai/cli/tools/main.py
@@ -8,13 +8,14 @@ import tempfile
 from typing import Any

 import click
+from crewai.events.listeners.tracing.utils import get_user_id
 from rich.console import Console

-from crewai.cli import git
-from crewai.cli.command import BaseCommand, PlusAPIMixin
-from crewai.cli.config import Settings
-from crewai.cli.constants import DEFAULT_CREWAI_ENTERPRISE_URL
-from crewai.cli.utils import (
+from crewai_cli import git
+from crewai_cli.command import BaseCommand, PlusAPIMixin
+from crewai_cli.config import Settings
+from crewai_cli.constants import DEFAULT_CREWAI_ENTERPRISE_URL
+from crewai_cli.utils import (
    build_env_with_tool_repository_credentials,
    extract_available_exports,
    get_project_description,
@@ -23,7 +24,6 @@ from crewai.cli.utils import (
    tree_copy,
    tree_find_and_replace,
 )
-from crewai.events.listeners.tracing.utils import get_user_id


 console = Console()
@@ -36,7 +36,7 @@ class ToolCommand(BaseCommand, PlusAPIMixin):

    def __init__(self) -> None:
        BaseCommand.__init__(self)
-        PlusAPIMixin.__init__(self, telemetry=self._telemetry)
+        PlusAPIMixin.__init__(self)

    def create(self, handle: str) -> None:
        self._ensure_not_in_project()
--- a/lib/crewai/src/crewai/cli/train_crew.py
+++ b/lib/crewai/src/crewai/cli/train_crew.py
--- a/lib/crewai/src/crewai/cli/triggers/init.py
+++ b/lib/crewai/src/crewai/cli/triggers/init.py
@@ -1,6 +1,6 @@
 """Triggers command module for CrewAI CLI."""

-from crewai.cli.triggers.main import TriggersCommand
+from crewai_cli.triggers.main import TriggersCommand


 __all__ = ["TriggersCommand"]
--- a/lib/crewai/src/crewai/cli/triggers/main.py
+++ b/lib/crewai/src/crewai/cli/triggers/main.py
@@ -5,7 +5,7 @@ from typing import Any
 from rich.console import Console
 from rich.table import Table

-from crewai.cli.command import BaseCommand, PlusAPIMixin
+from crewai_cli.command import BaseCommand, PlusAPIMixin


 console = Console()
@@ -18,7 +18,7 @@ class TriggersCommand(BaseCommand, PlusAPIMixin):

    def __init__(self):
        BaseCommand.__init__(self)
-        PlusAPIMixin.__init__(self, telemetry=self._telemetry)
+        PlusAPIMixin.__init__(self)

    def list_triggers(self) -> None:
        """List all available triggers from integrations."""
--- a/lib/crewai/src/crewai/cli/update_crew.py
+++ b/lib/crewai/src/crewai/cli/update_crew.py
@@ -3,7 +3,7 @@ import shutil

 import tomli_w

-from crewai.cli.utils import read_toml
+from crewai_cli.utils import read_toml


 def update_crew() -> None:
--- a/lib/cli/src/crewai_cli/user_data.py
+++ b/lib/cli/src/crewai_cli/user_data.py
@@ -0,0 +1,66 @@
+"""Standalone user-data helpers for the CLI package.
+
+These mirror the functions in ``crewai.events.listeners.tracing.utils`` but
+depend only on the standard library + *appdirs* so that crewai-cli can work
+without importing the full crewai framework.
+"""
+
+from __future__ import annotations
+
+import json
+import logging
+import os
+from pathlib import Path
+from typing import Any, cast
+
+import appdirs
+
+
+logger = logging.getLogger(__name__)
+
+
+def _get_project_directory_name() -> str:
+    return os.environ.get("CREWAI_STORAGE_DIR", Path.cwd().name)
+
+
+def _db_storage_path() -> str:
+    app_name = _get_project_directory_name()
+    app_author = "CrewAI"
+    data_dir = Path(appdirs.user_data_dir(app_name, app_author))
+    data_dir.mkdir(parents=True, exist_ok=True)
+    return str(data_dir)
+
+
+def _user_data_file() -> Path:
+    base = Path(_db_storage_path())
+    base.mkdir(parents=True, exist_ok=True)
+    return base / ".crewai_user.json"
+
+
+def _load_user_data() -> dict[str, Any]:
+    p = _user_data_file()
+    if p.exists():
+        try:
+            return cast(dict[str, Any], json.loads(p.read_text()))
+        except (json.JSONDecodeError, OSError, PermissionError) as e:
+            logger.warning("Failed to load user data: %s", e)
+    return {}
+
+
+def _save_user_data(data: dict[str, Any]) -> None:
+    try:
+        p = _user_data_file()
+        p.write_text(json.dumps(data, indent=2))
+    except (OSError, PermissionError) as e:
+        logger.warning("Failed to save user data: %s", e)
+
+
+def is_tracing_enabled() -> bool:
+    """Check if tracing is enabled (mirrors crewai core logic)."""
+    data = _load_user_data()
+    if (
+        data.get("first_execution_done", False)
+        and data.get("trace_consent", False) is False
+    ):
+        return False
+    return os.getenv("CREWAI_TRACING_ENABLED", "false").lower() == "true"
--- a/lib/cli/src/crewai_cli/utils.py
+++ b/lib/cli/src/crewai_cli/utils.py
@@ -0,0 +1,369 @@
+from __future__ import annotations
+
+from functools import reduce
+from inspect import getmro, isclass
+import os
+from pathlib import Path
+import shutil
+import sys
+from typing import Any, cast
+
+import click
+from rich.console import Console
+import tomli
+
+from crewai_cli.config import Settings
+from crewai_cli.constants import ENV_VARS
+
+
+if sys.version_info >= (3, 11):
+    import tomllib
+
+console = Console()
+
+
+def copy_template(
+    src: Path, dst: Path, name: str, class_name: str, folder_name: str
+) -> None:
+    """Copy a file from src to dst."""
+    with open(src, "r") as file:
+        content = file.read()
+
+    content = content.replace("{{name}}", name)
+    content = content.replace("{{crew_name}}", class_name)
+    content = content.replace("{{folder_name}}", folder_name)
+
+    with open(dst, "w") as file:
+        file.write(content)
+
+    click.secho(f"  - Created {dst}", fg="green")
+
+
+def read_toml(file_path: str = "pyproject.toml") -> dict[str, Any]:
+    """Read the content of a TOML file and return it as a dictionary."""
+    with open(file_path, "rb") as f:
+        return tomli.load(f)
+
+
+def parse_toml(content: str) -> dict[str, Any]:
+    if sys.version_info >= (3, 11):
+        return tomllib.loads(content)
+    return tomli.loads(content)
+
+
+def get_project_name(
+    pyproject_path: str = "pyproject.toml", require: bool = False
+) -> str | None:
+    """Get the project name from the pyproject.toml file."""
+    return _get_project_attribute(pyproject_path, ["project", "name"], require=require)
+
+
+def get_project_version(
+    pyproject_path: str = "pyproject.toml", require: bool = False
+) -> str | None:
+    """Get the project version from the pyproject.toml file."""
+    return _get_project_attribute(
+        pyproject_path, ["project", "version"], require=require
+    )
+
+
+def get_project_description(
+    pyproject_path: str = "pyproject.toml", require: bool = False
+) -> str | None:
+    """Get the project description from the pyproject.toml file."""
+    return _get_project_attribute(
+        pyproject_path, ["project", "description"], require=require
+    )
+
+
+def _get_project_attribute(
+    pyproject_path: str, keys: list[str], require: bool
+) -> Any | None:
+    """Get an attribute from the pyproject.toml file."""
+    attribute = None
+
+    try:
+        with open(pyproject_path, "r") as f:
+            pyproject_content = parse_toml(f.read())
+
+        dependencies = (
+            _get_nested_value(pyproject_content, ["project", "dependencies"]) or []
+        )
+        if not any(True for dep in dependencies if "crewai" in dep):
+            raise Exception("crewai is not in the dependencies.")
+
+        attribute = _get_nested_value(pyproject_content, keys)
+    except FileNotFoundError:
+        console.print(f"Error: {pyproject_path} not found.", style="bold red")
+    except KeyError:
+        console.print(
+            f"Error: {pyproject_path} is not a valid pyproject.toml file.",
+            style="bold red",
+        )
+    except Exception as e:
+        if sys.version_info >= (3, 11) and isinstance(e, tomllib.TOMLDecodeError):
+            console.print(
+                f"Error: {pyproject_path} is not a valid TOML file.", style="bold red"
+            )
+        else:
+            console.print(
+                f"Error reading the pyproject.toml file: {e}", style="bold red"
+            )
+
+    if require and not attribute:
+        console.print(
+            f"Unable to read '{'.'.join(keys)}' in the pyproject.toml file. Please verify that the file exists and contains the specified attribute.",
+            style="bold red",
+        )
+        raise SystemExit
+
+    return attribute
+
+
+def _get_nested_value(data: dict[str, Any], keys: list[str]) -> Any:
+    return reduce(dict.__getitem__, keys, data)
+
+
+def fetch_and_json_env_file(env_file_path: str = ".env") -> dict[str, Any]:
+    """Fetch the environment variables from a .env file and return them as a dictionary."""
+    try:
+        with open(env_file_path, "r") as f:
+            env_content = f.read()
+
+        env_dict = {}
+        for line in env_content.splitlines():
+            if line.strip() and not line.strip().startswith("#"):
+                key, value = line.split("=", 1)
+                env_dict[key.strip()] = value.strip()
+
+        return env_dict
+
+    except FileNotFoundError:
+        console.print(f"Error: {env_file_path} not found.", style="bold red")
+    except Exception as e:
+        console.print(f"Error reading the .env file: {e}", style="bold red")
+
+    return {}
+
+
+def tree_copy(source: Path, destination: Path) -> None:
+    """Copies the entire directory structure from the source to the destination."""
+    for item in os.listdir(source):
+        source_item = os.path.join(source, item)
+        destination_item = os.path.join(destination, item)
+        if os.path.isdir(source_item):
+            shutil.copytree(source_item, destination_item)
+        else:
+            shutil.copy2(source_item, destination_item)
+
+
+def tree_find_and_replace(directory: Path, find: str, replace: str) -> None:
+    """Recursively searches through a directory, replacing a target string in
+    both file contents and filenames with a specified replacement string.
+    """
+    for path, dirs, files in os.walk(os.path.abspath(directory), topdown=False):
+        for filename in files:
+            filepath = os.path.join(path, filename)
+
+            with open(filepath, "r", encoding="utf-8", errors="ignore") as file:
+                contents = file.read()
+            with open(filepath, "w") as file:
+                file.write(contents.replace(find, replace))
+
+            if find in filename:
+                new_filename = filename.replace(find, replace)
+                new_filepath = os.path.join(path, new_filename)
+                os.rename(filepath, new_filepath)
+
+        for dirname in dirs:
+            if find in dirname:
+                new_dirname = dirname.replace(find, replace)
+                new_dirpath = os.path.join(path, new_dirname)
+                old_dirpath = os.path.join(path, dirname)
+                os.rename(old_dirpath, new_dirpath)
+
+
+def load_env_vars(folder_path: Path) -> dict[str, Any]:
+    """Loads environment variables from a .env file in the specified folder path."""
+    env_file_path = folder_path / ".env"
+    env_vars = {}
+    if env_file_path.exists():
+        with open(env_file_path, "r") as file:
+            for line in file:
+                key, _, value = line.strip().partition("=")
+                if key and value:
+                    env_vars[key] = value
+    return env_vars
+
+
+def update_env_vars(
+    env_vars: dict[str, Any], provider: str, model: str
+) -> dict[str, Any] | None:
+    """Updates environment variables with the API key for the selected provider and model."""
+    provider_config = cast(
+        list[str],
+        ENV_VARS.get(
+            provider,
+            [
+                click.prompt(
+                    f"Enter the environment variable name for your {provider.capitalize()} API key",
+                    type=str,
+                )
+            ],
+        ),
+    )
+
+    api_key_var = provider_config[0]
+
+    if api_key_var not in env_vars:
+        try:
+            env_vars[api_key_var] = click.prompt(
+                f"Enter your {provider.capitalize()} API key", type=str, hide_input=True
+            )
+        except click.exceptions.Abort:
+            click.secho("Operation aborted by the user.", fg="red")
+            return None
+    else:
+        click.secho(f"API key already exists for {provider.capitalize()}.", fg="yellow")
+
+    env_vars["MODEL"] = model
+    click.secho(f"Selected model: {model}", fg="green")
+    return env_vars
+
+
+def write_env_file(folder_path: Path, env_vars: dict[str, Any]) -> None:
+    """Writes environment variables to a .env file in the specified folder."""
+    env_file_path = folder_path / ".env"
+    with open(env_file_path, "w") as file:
+        for key, value in env_vars.items():
+            file.write(f"{key.upper()}={value}\n")
+
+
+def is_valid_tool(obj: Any) -> bool:
+    """Check if an object is a valid tool class.
+
+    Works without importing crewai by checking MRO class names.
+    Falls back to crewai's ``is_valid_tool`` when available.
+    """
+    try:
+        from crewai.utilities.project_utils import is_valid_tool as _core_is_valid_tool
+
+        return _core_is_valid_tool(obj)
+    except ImportError:
+        pass
+
+    if isclass(obj):
+        try:
+            return any(base.__name__ == "BaseTool" for base in getmro(obj))
+        except (TypeError, AttributeError):
+            return False
+    return False
+
+
+def extract_available_exports(dir_path: str = "src") -> list[dict[str, Any]]:
+    """Extract available tool classes from the project's __init__.py files."""
+    try:
+        init_files = Path(dir_path).glob("**/__init__.py")
+        available_exports: list[dict[str, Any]] = []
+
+        for init_file in init_files:
+            tools = _load_tools_from_init(init_file)
+            available_exports.extend(tools)
+
+        if not available_exports:
+            _print_no_tools_warning()
+            raise SystemExit(1)
+
+        return available_exports
+
+    except SystemExit:
+        raise
+    except Exception as e:
+        console.print(f"[red]Error: Could not extract tool classes: {e!s}[/red]")
+        console.print(
+            "Please ensure your project contains valid tools (classes inheriting from BaseTool or functions with @tool decorator)."
+        )
+        raise SystemExit(1) from e
+
+
+def _load_tools_from_init(init_file: Path) -> list[dict[str, Any]]:
+    """Load and validate tools from a given __init__.py file."""
+    import importlib.util as _importlib_util
+
+    spec = _importlib_util.spec_from_file_location("temp_module", init_file)
+
+    if not spec or not spec.loader:
+        return []
+
+    module = _importlib_util.module_from_spec(spec)
+    sys.modules["temp_module"] = module
+
+    try:
+        spec.loader.exec_module(module)
+
+        if not hasattr(module, "__all__"):
+            console.print(
+                f"Warning: No __all__ defined in {init_file}",
+                style="bold yellow",
+            )
+            raise SystemExit(1)
+
+        return [
+            {"name": name}
+            for name in module.__all__
+            if hasattr(module, name) and is_valid_tool(getattr(module, name))
+        ]
+
+    except SystemExit:
+        raise
+    except Exception as e:
+        console.print(f"[red]Warning: Could not load {init_file}: {e!s}[/red]")
+        raise SystemExit(1) from e
+
+    finally:
+        sys.modules.pop("temp_module", None)
+
+
+def _print_no_tools_warning() -> None:
+    """Display warning and usage instructions if no tools were found."""
+    console.print(
+        "\n[bold yellow]Warning: No valid tools were exposed in your __init__.py file![/bold yellow]"
+    )
+    console.print(
+        "Your __init__.py file must contain all classes that inherit from [bold]BaseTool[/bold] "
+        "or functions decorated with [bold]@tool[/bold]."
+    )
+    console.print(
+        "\nExample:\n[dim]# In your __init__.py file[/dim]\n"
+        "[green]__all__ = ['YourTool', 'your_tool_function'][/green]\n\n"
+        "[dim]# In your tool.py file[/dim]\n"
+        "[green]from crewai.tools import BaseTool, tool\n\n"
+        "# Tool class example\n"
+        "class YourTool(BaseTool):\n"
+        '    name = "your_tool"\n'
+        '    description = "Your tool description"\n'
+        "    # ... rest of implementation\n\n"
+        "# Decorated function example\n"
+        "@tool\n"
+        "def your_tool_function(text: str) -> str:\n"
+        '    """Your tool description"""\n'
+        "    # ... implementation\n"
+        "    return result\n"
+    )
+
+
+def build_env_with_tool_repository_credentials(
+    repository_handle: str,
+) -> dict[str, Any]:
+    repository_handle = repository_handle.upper().replace("-", "_")
+    settings = Settings()
+
+    env = os.environ.copy()
+    env[f"UV_INDEX_{repository_handle}_USERNAME"] = str(
+        settings.tool_repository_username or ""
+    )
+    env[f"UV_INDEX_{repository_handle}_PASSWORD"] = str(
+        settings.tool_repository_password or ""
+    )
+
+    return env
--- a/lib/crewai/src/crewai/cli/version.py
+++ b/lib/crewai/src/crewai/cli/version.py
--- a/lib/crewai/tests/cli/enterprise/init.py
+++ b/lib/crewai/tests/cli/enterprise/init.py
--- a/lib/cli/tests/authentication/init.py
+++ b/lib/cli/tests/authentication/init.py
--- a/lib/cli/tests/authentication/providers/init.py
+++ b/lib/cli/tests/authentication/providers/init.py
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Greyson Lalonde	7afca5daab	refactor: remove cli/ from crewai package and relocate to proper modules Move framework infrastructure out of crewai/cli/ to dedicated modules: - cli/authentication/ → crewai/auth/ - cli/config.py → crewai/settings.py - cli/constants.py → crewai/constants.py - cli/plus_api.py → crewai/plus_api.py - cli/version.py → crewai/version.py - cli/crew_chat.py → crewai/utilities/crew_chat.py - cli/reset_memories_command.py → crewai/utilities/reset_memories.py - cli/utils.py (framework parts) → crewai/utilities/project_utils.py Delete CLI-only duplicates (command.py, git.py, provider.py) already present in crewai_cli. Replace _login_to_tool_repository with a _post_login() hook in AuthenticationCommand. Update all imports and mock.patch paths across both packages and tests.	2026-03-15 19:39:55 -04:00
Greyson LaLonde	cf1636c300	fix(ci): exclude crewai_cli templates from ruff linting Ruff fails when checking .py files in the templates directory because it discovers the nearby pyproject.toml which contains {{folder_name}} placeholders that are invalid TOML. Add the new template path to the CI grep filter, matching the existing exclusion for the original path.	2026-03-14 22:38:48 -04:00
Greyson LaLonde	dfea5fb650	refactor: remove CLI shim from crewai package The backward-compat shim is unnecessary — nothing imports from crewai.cli.cli and the entry point lives in crewai-cli now.	2026-03-14 22:24:34 -04:00
Greyson LaLonde	8fd7a73423	fix(deploy): add pre-flight validation before deployment Validate that pyproject.toml, a lockfile (uv.lock or poetry.lock), and the expected src/<project>/crew.py or config directory exist locally before making any API calls. This surfaces clear, actionable errors on the CLI instead of cryptic server-side deployment failures.	2026-03-14 22:21:02 -04:00
Greyson LaLonde	b7bd7aea50	Merge branch 'main' into gl/chore/refactor-cli # Conflicts: # lib/crewai/src/crewai/cli/cli.py	2026-03-14 22:17:02 -04:00
Greyson LaLonde	96fc584ab8	refactor: remove CLI from crewai package and add backward-compat shim Remove all CLI modules and tests that have been moved to the crewai-cli package. Replace cli.py with a thin shim that re-exports from crewai_cli when available, or shows an install hint otherwise. Update crewai pyproject.toml to add a [cli] extra pointing to crewai-cli and comment out the old entry point. Add py.typed marker to crewai_cli for mypy compatibility.	2026-03-14 22:12:38 -04:00
Greyson LaLonde	3732de7b88	test: add CLI tests to crewai-cli package Move and adapt all CLI tests from lib/crewai/tests/cli/ to lib/cli/tests/, updating import paths from crewai.cli.* to crewai_cli.* and adjusting mock targets accordingly.	2026-03-14 22:09:38 -04:00
Greyson LaLonde	4f9a8f4112	refactor: move CLI source modules to crewai-cli package Copy all CLI source modules from lib/crewai/src/crewai/cli/ to the new lib/cli/src/crewai_cli/ package, updating internal imports from crewai.cli.* to crewai_cli.* throughout. Includes: authentication, deploy, enterprise, organization, settings, tools, triggers, templates, and all top-level CLI command modules. Also excludes lib/cli/ from pre-commit mypy checks to match existing behavior (original CLI code has the same type gaps).	2026-03-14 22:08:48 -04:00
Greyson LaLonde	c0689aa6dc	chore: scaffold crewai-cli package and update workspace config Add the new lib/cli package skeleton with pyproject.toml, README, and __init__.py. Register it as a uv workspace member and update root linting, mypy, bandit, and pytest config to include the new package paths.	2026-03-14 22:04:37 -04:00