linted

- Introduced  command group to browse and install project templates.
- Added  command to display available templates.
- Implemented  command to install a selected template into the current directory.
- Created  class to handle template-related operations, including fetching templates from GitHub and managing installations.
- Enhanced telemetry to track template installations.

lib/crewai/pyproject.toml

@@ -10,7 +10,7 @@ requires-python = ">=3.10, <3.14"
 dependencies = [
     # Core Dependencies
     "pydantic~=2.11.9",
-    "openai>=1.83.0,<3",
+    "openai>=2.0.0,<3",
     "instructor>=1.3.3",
     # Text Processing
     "pdfplumber~=0.11.4",

lib/crewai/src/crewai/cli/cli.py

@@ -18,6 +18,7 @@ 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.remote_template.main import TemplateCommand
 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
@@ -496,6 +497,33 @@ def tool_publish(is_public: bool, force: bool) -> None:
     tool_cmd.publish(is_public, force)
 
 
+@crewai.group()
+def template() -> None:
+    """Browse and install project templates."""
+
+
+@template.command(name="list")
+def template_list() -> None:
+    """List available templates and select one to install."""
+    template_cmd = TemplateCommand()
+    template_cmd.list_templates()
+
+
+@template.command(name="add")
+@click.argument("name")
+@click.option(
+    "-o",
+    "--output-dir",
+    type=str,
+    default=None,
+    help="Directory name for the template (defaults to template name)",
+)
+def template_add(name: str, output_dir: str | None) -> None:
+    """Add a template to the current directory."""
+    template_cmd = TemplateCommand()
+    template_cmd.add_template(name, output_dir)
+
+
 @crewai.group()
 def flow() -> None:
     """Flow related commands."""

lib/crewai/src/crewai/cli/remote_template/main.py

@@ -0,0 +1,248 @@
+import io
+import logging
+import os
+import shutil
+from typing import Any
+import zipfile
+
+import click
+import httpx
+from rich.console import Console
+from rich.panel import Panel
+from rich.text import Text
+
+from crewai.cli.command import BaseCommand
+
+
+logger = logging.getLogger(__name__)
+console = Console()
+
+GITHUB_ORG = "crewAIInc"
+TEMPLATE_PREFIX = "template_"
+GITHUB_API_BASE = "https://api.github.com"
+
+BANNER = """\
+[bold white] ██████╗██████╗ ███████╗██╗    ██╗[/bold white] [bold red] █████╗ ██╗[/bold red]
+[bold white]██╔════╝██╔══██╗██╔════╝██║    ██║[/bold white] [bold red]██╔══██╗██║[/bold red]
+[bold white]██║     ██████╔╝█████╗  ██║ █╗ ██║[/bold white] [bold red]███████║██║[/bold red]
+[bold white]██║     ██╔══██╗██╔══╝  ██║███╗██║[/bold white] [bold red]██╔══██║██║[/bold red]
+[bold white]╚██████╗██║  ██║███████╗╚███╔███╔╝[/bold white] [bold red]██║  ██║██║[/bold red]
+[bold white] ╚═════╝╚═╝  ╚═╝╚══════╝ ╚══╝╚══╝[/bold white] [bold red]╚═╝  ╚═╝╚═╝[/bold red]
+[dim white]████████╗███████╗███╗   ███╗██████╗ ██╗      █████╗ ████████╗███████╗███████╗[/dim white]
+[dim white]╚══██╔══╝██╔════╝████╗ ████║██╔══██╗██║     ██╔══██╗╚══██╔══╝██╔════╝██╔════╝[/dim white]
+[dim white]   ██║   █████╗  ██╔████╔██║██████╔╝██║     ███████║   ██║   █████╗  ███████╗[/dim white]
+[dim white]   ██║   ██╔══╝  ██║╚██╔╝██║██╔═══╝ ██║     ██╔══██║   ██║   ██╔══╝  ╚════██║[/dim white]
+[dim white]   ██║   ███████╗██║ ╚═╝ ██║██║     ███████╗██║  ██║   ██║   ███████╗███████║[/dim white]
+[dim white]   ╚═╝   ╚══════╝╚═╝     ╚═╝╚═╝     ╚══════╝╚═╝  ╚═╝   ╚═╝   ╚══════╝╚══════╝[/dim white]"""
+
+
+class TemplateCommand(BaseCommand):
+    """Handle template-related operations for CrewAI projects."""
+
+    def __init__(self) -> None:
+        super().__init__()
+
+    def list_templates(self) -> None:
+        """List available templates with an interactive selector to install."""
+        templates = self._fetch_templates()
+        if not templates:
+            click.echo("No templates found.")
+            return
+
+        console.print(f"\n{BANNER}\n")
+        console.print(" [on cyan] templates [/on cyan]\n")
+        console.print(f" [green]o[/green]  Source: https://github.com/{GITHUB_ORG}")
+        console.print(
+            f" [green]o[/green]  Found [bold]{len(templates)}[/bold] templates\n"
+        )
+        console.print(" [green]o[/green]  Select a template to install")
+
+        for idx, repo in enumerate(templates, start=1):
+            name = repo["name"].removeprefix(TEMPLATE_PREFIX)
+            description = repo.get("description") or ""
+            if description:
+                console.print(
+                    f"      [bold cyan]{idx}.[/bold cyan] [bold white]{name}[/bold white] [dim]({description})[/dim]"
+                )
+            else:
+                console.print(
+                    f"      [bold cyan]{idx}.[/bold cyan] [bold white]{name}[/bold white]"
+                )
+
+        console.print("      [bold cyan]q.[/bold cyan] [dim]Quit[/dim]\n")
+
+        while True:
+            choice = click.prompt("Enter your choice", type=str)
+
+            if choice.lower() == "q":
+                return
+
+            try:
+                selected_index = int(choice) - 1
+                if 0 <= selected_index < len(templates):
+                    break
+            except ValueError:
+                pass
+
+            click.secho(
+                f"Please enter a number between 1 and {len(templates)}, or 'q' to quit.",
+                fg="yellow",
+            )
+
+        selected = templates[selected_index]
+        repo_name = selected["name"]
+        template_name = repo_name.removeprefix(TEMPLATE_PREFIX)
+        self.add_template(template_name)
+
+    def add_template(self, name: str, output_dir: str | None = None) -> None:
+        """Download a template and copy it into the current working directory.
+
+        Args:
+            name: Template name (with or without the template_ prefix).
+            output_dir: Optional directory name. Defaults to the template name.
+        """
+        repo_name = self._resolve_repo_name(name)
+        if repo_name is None:
+            click.secho(f"Template '{name}' not found.", fg="red")
+            click.echo("Run 'crewai template list' to see available templates.")
+            raise SystemExit(1)
+
+        folder_name = output_dir or repo_name.removeprefix(TEMPLATE_PREFIX)
+        dest = os.path.join(os.getcwd(), folder_name)
+
+        while os.path.exists(dest):
+            click.secho(f"Directory '{folder_name}' already exists.", fg="yellow")
+            folder_name = click.prompt(
+                "Enter a different directory name (or 'q' to quit)", type=str
+            )
+            if folder_name.lower() == "q":
+                return
+            dest = os.path.join(os.getcwd(), folder_name)
+
+        click.echo(
+            f"Downloading template '{repo_name.removeprefix(TEMPLATE_PREFIX)}'..."
+        )
+
+        zip_bytes = self._download_zip(repo_name)
+        self._extract_zip(zip_bytes, dest)
+
+        try:
+            from crewai.telemetry import Telemetry
+
+            telemetry = Telemetry()
+            telemetry.set_tracer()
+            telemetry.template_installed_span(repo_name.removeprefix(TEMPLATE_PREFIX))
+        except Exception:
+            logger.debug("Failed to record template install telemetry")
+
+        console.print(
+            f"\n [green]\u2713[/green]  Installed template [bold white]{folder_name}[/bold white]"
+            f" [dim](source: github.com/{GITHUB_ORG}/{repo_name})[/dim]\n"
+        )
+
+        next_steps = Text()
+        next_steps.append(f"  cd {folder_name}\n", style="bold white")
+        next_steps.append("  crewai install", style="bold white")
+
+        panel = Panel(
+            next_steps,
+            title="[green]\u25c7  Next steps[/green]",
+            title_align="left",
+            border_style="dim",
+            padding=(1, 2),
+        )
+        console.print(panel)
+
+    def _fetch_templates(self) -> list[dict[str, Any]]:
+        """Fetch all template repos from the GitHub org."""
+        templates: list[dict[str, Any]] = []
+        page = 1
+        while True:
+            url = f"{GITHUB_API_BASE}/orgs/{GITHUB_ORG}/repos"
+            params: dict[str, str | int] = {
+                "per_page": 100,
+                "page": page,
+                "type": "public",
+            }
+            try:
+                response = httpx.get(url, params=params, timeout=15)
+                response.raise_for_status()
+            except httpx.HTTPError as e:
+                click.secho(f"Failed to fetch templates from GitHub: {e}", fg="red")
+                raise SystemExit(1) from e
+
+            repos = response.json()
+            if not repos:
+                break
+
+            templates.extend(
+                repo
+                for repo in repos
+                if repo["name"].startswith(TEMPLATE_PREFIX) and not repo.get("private")
+            )
+
+            page += 1
+
+        templates.sort(key=lambda r: r["name"])
+        return templates
+
+    def _resolve_repo_name(self, name: str) -> str | None:
+        """Resolve user input to a full repo name, or None if not found."""
+        # Accept both 'deep_research' and 'template_deep_research'
+        candidates = [
+            f"{TEMPLATE_PREFIX}{name}"
+            if not name.startswith(TEMPLATE_PREFIX)
+            else name,
+            name,
+        ]
+
+        templates = self._fetch_templates()
+        template_names = {t["name"] for t in templates}
+
+        for candidate in candidates:
+            if candidate in template_names:
+                return candidate
+
+        return None
+
+    def _download_zip(self, repo_name: str) -> bytes:
+        """Download the default branch zipball for a repo."""
+        url = f"{GITHUB_API_BASE}/repos/{GITHUB_ORG}/{repo_name}/zipball"
+        try:
+            response = httpx.get(url, follow_redirects=True, timeout=60)
+            response.raise_for_status()
+        except httpx.HTTPError as e:
+            click.secho(f"Failed to download template: {e}", fg="red")
+            raise SystemExit(1) from e
+
+        return response.content
+
+    def _extract_zip(self, zip_bytes: bytes, dest: str) -> None:
+        """Extract a GitHub zipball into dest, stripping the top-level directory."""
+        with zipfile.ZipFile(io.BytesIO(zip_bytes)) as zf:
+            # GitHub zipballs have a single top-level dir like 'crewAIInc-template_xxx-<sha>/'
+            members = zf.namelist()
+            if not members:
+                click.secho("Downloaded archive is empty.", fg="red")
+                raise SystemExit(1)
+
+            top_dir = members[0].split("/")[0] + "/"
+
+            os.makedirs(dest, exist_ok=True)
+
+            for member in members:
+                if member == top_dir or not member.startswith(top_dir):
+                    continue
+
+                relative_path = member[len(top_dir) :]
+                if not relative_path:
+                    continue
+
+                target = os.path.join(dest, relative_path)
+
+                if member.endswith("/"):
+                    os.makedirs(target, exist_ok=True)
+                else:
+                    os.makedirs(os.path.dirname(target), exist_ok=True)
+                    with zf.open(member) as src, open(target, "wb") as dst:
+                        shutil.copyfileobj(src, dst)

lib/crewai/src/crewai/lite_agent.py

@@ -16,7 +16,6 @@ from typing import (
     get_origin,
 )
 import uuid
-import warnings
 
 from pydantic import (
     UUID4,
@@ -26,7 +25,7 @@ from pydantic import (
     field_validator,
     model_validator,
 )
-from typing_extensions import Self
+from typing_extensions import Self, deprecated
 
 
 if TYPE_CHECKING:
@@ -173,9 +172,12 @@ def _kickoff_with_a2a_support(
     )
 
 
+@deprecated(
+    "LiteAgent is deprecated and will be removed in v2.0.0.",
+    category=FutureWarning,
+)
 class LiteAgent(FlowTrackable, BaseModel):
-    """
-    A lightweight agent that can process messages and use tools.
+    """A lightweight agent that can process messages and use tools.
 
     .. deprecated::
         LiteAgent is deprecated and will be removed in a future version.
@@ -278,18 +280,6 @@ class LiteAgent(FlowTrackable, BaseModel):
     )
     _memory: Any = PrivateAttr(default=None)
 
-    @model_validator(mode="after")
-    def emit_deprecation_warning(self) -> Self:
-        """Emit deprecation warning for LiteAgent usage."""
-        warnings.warn(
-            "LiteAgent is deprecated and will be removed in a future version. "
-            "Use Agent().kickoff(messages) instead, which provides the same "
-            "functionality with additional features like memory and knowledge support.",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        return self
-
     @model_validator(mode="after")
     def setup_llm(self) -> Self:
         """Set up the LLM and other components after initialization."""

lib/crewai/src/crewai/telemetry/telemetry.py

@@ -1058,3 +1058,20 @@ class Telemetry:
             close_span(span)
 
         self._safe_telemetry_operation(_operation)
+
+    def template_installed_span(self, template_name: str) -> None:
+        """Records when a template is downloaded and installed.
+
+        Args:
+            template_name: Name of the template that was installed
+                (without the template_ prefix).
+        """
+
+        def _operation() -> None:
+            tracer = trace.get_tracer("crewai.telemetry")
+            span = tracer.start_span("Template Installed")
+            self._add_attribute(span, "crewai_version", version("crewai"))
+            self._add_attribute(span, "template_name", template_name)
+            close_span(span)
+
+        self._safe_telemetry_operation(_operation)

lib/crewai/tests/agents/test_lite_agent.py

@@ -1051,7 +1051,7 @@ def test_lite_agent_verbose_false_suppresses_printer_output():
         successful_requests=1,
     )
 
-    with pytest.warns(DeprecationWarning):
+    with pytest.warns(FutureWarning):
         agent = LiteAgent(
             role="Test Agent",
             goal="Test goal",

lib/crewai/tests/cli/remote_template/test_main.py

@@ -0,0 +1,281 @@
+import io
+import os
+import zipfile
+from unittest.mock import MagicMock, patch
+
+import httpx
+import pytest
+from click.testing import CliRunner
+
+from crewai.cli.cli import template_add, template_list
+from crewai.cli.remote_template.main import TemplateCommand
+
+
+@pytest.fixture
+def runner():
+    return CliRunner()
+
+
+SAMPLE_REPOS = [
+    {"name": "template_deep_research", "description": "Deep research template", "private": False},
+    {"name": "template_pull_request_review", "description": "PR review template", "private": False},
+    {"name": "template_conversational_example", "description": "Conversational demo", "private": False},
+    {"name": "crewai", "description": "Main repo", "private": False},
+    {"name": "marketplace-crew-template", "description": "Marketplace", "private": False},
+]
+
+
+def _make_zipball(files: dict[str, str], top_dir: str = "crewAIInc-template_test-abc123") -> bytes:
+    """Create an in-memory zipball mimicking GitHub's format."""
+    buf = io.BytesIO()
+    with zipfile.ZipFile(buf, "w") as zf:
+        zf.writestr(f"{top_dir}/", "")
+        for path, content in files.items():
+            zf.writestr(f"{top_dir}/{path}", content)
+    return buf.getvalue()
+
+
+# --- CLI command tests ---
+
+
+@patch("crewai.cli.cli.TemplateCommand")
+def test_template_list_command(mock_cls, runner):
+    mock_instance = MagicMock()
+    mock_cls.return_value = mock_instance
+
+    result = runner.invoke(template_list)
+
+    assert result.exit_code == 0
+    mock_cls.assert_called_once()
+    mock_instance.list_templates.assert_called_once()
+
+
+@patch("crewai.cli.cli.TemplateCommand")
+def test_template_add_command(mock_cls, runner):
+    mock_instance = MagicMock()
+    mock_cls.return_value = mock_instance
+
+    result = runner.invoke(template_add, ["deep_research"])
+
+    assert result.exit_code == 0
+    mock_cls.assert_called_once()
+    mock_instance.add_template.assert_called_once_with("deep_research", None)
+
+
+@patch("crewai.cli.cli.TemplateCommand")
+def test_template_add_with_output_dir(mock_cls, runner):
+    mock_instance = MagicMock()
+    mock_cls.return_value = mock_instance
+
+    result = runner.invoke(template_add, ["deep_research", "-o", "my_project"])
+
+    assert result.exit_code == 0
+    mock_instance.add_template.assert_called_once_with("deep_research", "my_project")
+
+
+# --- TemplateCommand unit tests ---
+
+
+class TestTemplateCommand:
+    @pytest.fixture
+    def cmd(self):
+        with patch.object(TemplateCommand, "__init__", return_value=None):
+            return TemplateCommand()
+
+    @patch("crewai.cli.remote_template.main.httpx.get")
+    def test_fetch_templates_filters_by_prefix(self, mock_get, cmd):
+        mock_response = MagicMock()
+        mock_response.json.return_value = SAMPLE_REPOS
+        mock_response.raise_for_status = MagicMock()
+        # Return empty on page 2 to stop pagination
+        mock_empty = MagicMock()
+        mock_empty.json.return_value = []
+        mock_empty.raise_for_status = MagicMock()
+        mock_get.side_effect = [mock_response, mock_empty]
+
+        templates = cmd._fetch_templates()
+
+        assert len(templates) == 3
+        assert all(t["name"].startswith("template_") for t in templates)
+
+    @patch("crewai.cli.remote_template.main.httpx.get")
+    def test_fetch_templates_excludes_private(self, mock_get, cmd):
+        repos = [
+            {"name": "template_private_one", "description": "", "private": True},
+            {"name": "template_public_one", "description": "", "private": False},
+        ]
+        mock_response = MagicMock()
+        mock_response.json.return_value = repos
+        mock_response.raise_for_status = MagicMock()
+        mock_empty = MagicMock()
+        mock_empty.json.return_value = []
+        mock_empty.raise_for_status = MagicMock()
+        mock_get.side_effect = [mock_response, mock_empty]
+
+        templates = cmd._fetch_templates()
+
+        assert len(templates) == 1
+        assert templates[0]["name"] == "template_public_one"
+
+    @patch("crewai.cli.remote_template.main.httpx.get")
+    def test_fetch_templates_api_error(self, mock_get, cmd):
+        mock_get.side_effect = httpx.HTTPError("connection error")
+
+        with pytest.raises(SystemExit):
+            cmd._fetch_templates()
+
+    @patch("crewai.cli.remote_template.main.click.prompt", return_value="q")
+    @patch("crewai.cli.remote_template.main.httpx.get")
+    def test_list_templates_prints_output(self, mock_get, mock_prompt, cmd):
+        mock_response = MagicMock()
+        mock_response.json.return_value = SAMPLE_REPOS
+        mock_response.raise_for_status = MagicMock()
+        mock_empty = MagicMock()
+        mock_empty.json.return_value = []
+        mock_empty.raise_for_status = MagicMock()
+        mock_get.side_effect = [mock_response, mock_empty]
+
+        with patch("crewai.cli.remote_template.main.console") as mock_console:
+            cmd.list_templates()
+            assert mock_console.print.call_count > 0
+
+    @patch("crewai.cli.remote_template.main.httpx.get")
+    def test_resolve_repo_name_with_prefix(self, mock_get, cmd):
+        mock_response = MagicMock()
+        mock_response.json.return_value = SAMPLE_REPOS
+        mock_response.raise_for_status = MagicMock()
+        mock_empty = MagicMock()
+        mock_empty.json.return_value = []
+        mock_empty.raise_for_status = MagicMock()
+        mock_get.side_effect = [mock_response, mock_empty]
+
+        result = cmd._resolve_repo_name("template_deep_research")
+        assert result == "template_deep_research"
+
+    @patch("crewai.cli.remote_template.main.httpx.get")
+    def test_resolve_repo_name_without_prefix(self, mock_get, cmd):
+        mock_response = MagicMock()
+        mock_response.json.return_value = SAMPLE_REPOS
+        mock_response.raise_for_status = MagicMock()
+        mock_empty = MagicMock()
+        mock_empty.json.return_value = []
+        mock_empty.raise_for_status = MagicMock()
+        mock_get.side_effect = [mock_response, mock_empty]
+
+        result = cmd._resolve_repo_name("deep_research")
+        assert result == "template_deep_research"
+
+    @patch("crewai.cli.remote_template.main.httpx.get")
+    def test_resolve_repo_name_not_found(self, mock_get, cmd):
+        mock_response = MagicMock()
+        mock_response.json.return_value = SAMPLE_REPOS
+        mock_response.raise_for_status = MagicMock()
+        mock_empty = MagicMock()
+        mock_empty.json.return_value = []
+        mock_empty.raise_for_status = MagicMock()
+        mock_get.side_effect = [mock_response, mock_empty]
+
+        result = cmd._resolve_repo_name("nonexistent")
+        assert result is None
+
+    def test_extract_zip(self, cmd, tmp_path):
+        files = {
+            "README.md": "# Test Template",
+            "src/main.py": "print('hello')",
+            "config/settings.yaml": "key: value",
+        }
+        zip_bytes = _make_zipball(files)
+        dest = str(tmp_path / "output")
+
+        cmd._extract_zip(zip_bytes, dest)
+
+        assert os.path.isfile(os.path.join(dest, "README.md"))
+        assert os.path.isfile(os.path.join(dest, "src", "main.py"))
+        assert os.path.isfile(os.path.join(dest, "config", "settings.yaml"))
+
+        with open(os.path.join(dest, "src", "main.py")) as f:
+            assert f.read() == "print('hello')"
+
+    @patch.object(TemplateCommand, "_extract_zip")
+    @patch.object(TemplateCommand, "_download_zip")
+    @patch.object(TemplateCommand, "_resolve_repo_name")
+    def test_add_template_success(self, mock_resolve, mock_download, mock_extract, cmd, tmp_path):
+        mock_resolve.return_value = "template_deep_research"
+        mock_download.return_value = b"fake-zip-bytes"
+
+        os.chdir(tmp_path)
+        cmd.add_template("deep_research")
+
+        mock_resolve.assert_called_once_with("deep_research")
+        mock_download.assert_called_once_with("template_deep_research")
+        expected_dest = os.path.join(str(tmp_path), "deep_research")
+        mock_extract.assert_called_once_with(b"fake-zip-bytes", expected_dest)
+
+    @patch.object(TemplateCommand, "_resolve_repo_name")
+    def test_add_template_not_found(self, mock_resolve, cmd):
+        mock_resolve.return_value = None
+
+        with pytest.raises(SystemExit):
+            cmd.add_template("nonexistent")
+
+    @patch.object(TemplateCommand, "_extract_zip")
+    @patch.object(TemplateCommand, "_download_zip")
+    @patch("crewai.cli.remote_template.main.click.prompt", return_value="my_project")
+    @patch.object(TemplateCommand, "_resolve_repo_name")
+    def test_add_template_dir_exists_prompts_rename(self, mock_resolve, mock_prompt, mock_download, mock_extract, cmd, tmp_path):
+        mock_resolve.return_value = "template_deep_research"
+        mock_download.return_value = b"fake-zip-bytes"
+        existing = tmp_path / "deep_research"
+        existing.mkdir()
+
+        os.chdir(tmp_path)
+        cmd.add_template("deep_research")
+
+        expected_dest = os.path.join(str(tmp_path), "my_project")
+        mock_extract.assert_called_once_with(b"fake-zip-bytes", expected_dest)
+
+    @patch.object(TemplateCommand, "_resolve_repo_name")
+    @patch("crewai.cli.remote_template.main.click.prompt", return_value="q")
+    def test_add_template_dir_exists_quit(self, mock_prompt, mock_resolve, cmd, tmp_path):
+        mock_resolve.return_value = "template_deep_research"
+        existing = tmp_path / "deep_research"
+        existing.mkdir()
+
+        os.chdir(tmp_path)
+        cmd.add_template("deep_research")
+        # Should return without downloading
+
+    @patch.object(TemplateCommand, "add_template")
+    @patch("crewai.cli.remote_template.main.click.prompt", return_value="2")
+    @patch("crewai.cli.remote_template.main.httpx.get")
+    def test_list_templates_selects_and_installs(self, mock_get, mock_prompt, mock_add, cmd):
+        mock_response = MagicMock()
+        mock_response.json.return_value = SAMPLE_REPOS
+        mock_response.raise_for_status = MagicMock()
+        mock_empty = MagicMock()
+        mock_empty.json.return_value = []
+        mock_empty.raise_for_status = MagicMock()
+        mock_get.side_effect = [mock_response, mock_empty]
+
+        with patch("crewai.cli.remote_template.main.console"):
+            cmd.list_templates()
+
+        # Templates are sorted by name; index 1 (choice "2") = template_deep_research
+        mock_add.assert_called_once_with("deep_research")
+
+    @patch.object(TemplateCommand, "add_template")
+    @patch("crewai.cli.remote_template.main.click.prompt", return_value="q")
+    @patch("crewai.cli.remote_template.main.httpx.get")
+    def test_list_templates_quit(self, mock_get, mock_prompt, mock_add, cmd):
+        mock_response = MagicMock()
+        mock_response.json.return_value = SAMPLE_REPOS
+        mock_response.raise_for_status = MagicMock()
+        mock_empty = MagicMock()
+        mock_empty.json.return_value = []
+        mock_empty.raise_for_status = MagicMock()
+        mock_get.side_effect = [mock_response, mock_empty]
+
+        with patch("crewai.cli.remote_template.main.console"):
+            cmd.list_templates()
+
+        mock_add.assert_not_called()

lib/devtools/src/crewai_devtools/cli.py

@@ -29,6 +29,33 @@ load_dotenv()
 console = Console()
 
 
+def _resume_hint(message: str) -> None:
+    """Print a boxed resume hint after a failure."""
+    console.print()
+    console.print(
+        Panel(
+            message,
+            title="[bold yellow]How to resume[/bold yellow]",
+            border_style="yellow",
+            padding=(1, 2),
+        )
+    )
+
+
+def _print_release_error(e: BaseException) -> None:
+    """Print a release error with stderr if available."""
+    if isinstance(e, KeyboardInterrupt):
+        raise
+    if isinstance(e, SystemExit):
+        return
+    if isinstance(e, subprocess.CalledProcessError):
+        console.print(f"[red]Error running command:[/red] {e}")
+        if e.stderr:
+            console.print(e.stderr)
+    else:
+        console.print(f"[red]Error:[/red] {e}")
+
+
 def run_command(cmd: list[str], cwd: Path | None = None) -> str:
     """Run a shell command and return output.
 
@@ -264,11 +291,9 @@ def add_docs_version(docs_json_path: Path, version: str) -> bool:
         if not versions:
             continue
 
-        # Skip if this version already exists for this language
         if any(v.get("version") == version_label for v in versions):
             continue
 
-        # Find the current default and copy its tabs
         default_version = next(
             (v for v in versions if v.get("default")),
             versions[0],
@@ -280,10 +305,7 @@ def add_docs_version(docs_json_path: Path, version: str) -> bool:
             "tabs": default_version.get("tabs", []),
         }
 
-        # Remove default flag from old default
         default_version.pop("default", None)
-
-        # Insert new version at the beginning
         versions.insert(0, new_version)
         updated = True
 
@@ -477,7 +499,7 @@ def _is_crewai_dep(spec: str) -> bool:
     """Return True if *spec* is a ``crewai`` or ``crewai[...]`` dependency."""
     if not spec.startswith("crewai"):
         return False
-    rest = spec[6:]  # after "crewai"
+    rest = spec[6:]
     return len(rest) > 0 and rest[0] in ("[", "=", ">", "<", "~", "!")
 
 
@@ -499,7 +521,6 @@ def _pin_crewai_deps(content: str, version: str) -> str:
         deps = doc.get("project", {}).get(key)
         if deps is None:
             continue
-        # optional-dependencies is a table of lists; dependencies is a list
         dep_lists = deps.values() if isinstance(deps, Mapping) else [deps]
         for dep_list in dep_lists:
             for i, dep in enumerate(dep_list):
@@ -638,7 +659,6 @@ def get_github_contributors(commit_range: str) -> list[str]:
         List of GitHub usernames sorted alphabetically.
     """
     try:
-        # Get GitHub token from gh CLI
         try:
             gh_token = run_command(["gh", "auth", "token"])
         except subprocess.CalledProcessError:
@@ -680,11 +700,6 @@ def get_github_contributors(commit_range: str) -> list[str]:
         return []
 
 
-# ---------------------------------------------------------------------------
-# Shared workflow helpers
-# ---------------------------------------------------------------------------
-
-
 def _poll_pr_until_merged(
     branch_name: str, label: str, repo: str | None = None
 ) -> None:
@@ -764,7 +779,6 @@ def _update_all_versions(
             "[yellow]Warning:[/yellow] No __version__ attributes found to update"
         )
 
-    # Update CLI template pyproject.toml files
     templates_dir = lib_dir / "crewai" / "src" / "crewai" / "cli" / "templates"
     if templates_dir.exists():
         if dry_run:
@@ -1163,13 +1177,11 @@ def _repin_crewai_install(run_value: str, version: str) -> str:
     while marker in remainder:
         before, _, after = remainder.partition(marker)
         result.append(before)
-        # after looks like: a2a]==1.14.0" ...
         bracket_end = after.index("]")
         extras = after[:bracket_end]
         rest = after[bracket_end + 1 :]
         if rest.startswith("=="):
-            # Find end of version — next quote or whitespace
-            ver_start = 2  # len("==")
+            ver_start = 2
             ver_end = ver_start
             while ver_end < len(rest) and rest[ver_end] not in ('"', "'", " ", "\n"):
                 ver_end += 1
@@ -1331,7 +1343,6 @@ def _release_enterprise(version: str, is_prerelease: bool, dry_run: bool) -> Non
         run_command(["gh", "repo", "clone", enterprise_repo, str(repo_dir)])
         console.print(f"[green]✓[/green] Cloned {enterprise_repo}")
 
-        # --- bump versions ---
         for rel_dir in _ENTERPRISE_VERSION_DIRS:
             pkg_dir = repo_dir / rel_dir
             if not pkg_dir.exists():
@@ -1361,14 +1372,12 @@ def _release_enterprise(version: str, is_prerelease: bool, dry_run: bool) -> Non
                         f"{pyproject.relative_to(repo_dir)}"
                     )
 
-        # --- update crewai[tools] pin ---
         enterprise_pyproject = repo_dir / enterprise_dep_path
         if _update_enterprise_crewai_dep(enterprise_pyproject, version):
             console.print(
                 f"[green]✓[/green] Updated crewai[tools] dep in {enterprise_dep_path}"
             )
 
-        # --- update crewai pins in CI workflows ---
         for wf in _update_enterprise_workflows(repo_dir, version):
             console.print(
                 f"[green]✓[/green] Updated crewai pin in {wf.relative_to(repo_dir)}"
@@ -1408,7 +1417,6 @@ def _release_enterprise(version: str, is_prerelease: bool, dry_run: bool) -> Non
                 time.sleep(_PYPI_POLL_INTERVAL)
         console.print("[green]✓[/green] Workspace synced")
 
-        # --- branch, commit, push, PR ---
         branch_name = f"feat/bump-version-{version}"
         run_command(["git", "checkout", "-b", branch_name], cwd=repo_dir)
         run_command(["git", "add", "."], cwd=repo_dir)
@@ -1442,7 +1450,6 @@ def _release_enterprise(version: str, is_prerelease: bool, dry_run: bool) -> Non
 
         _poll_pr_until_merged(branch_name, "enterprise bump PR", repo=enterprise_repo)
 
-        # --- tag and release ---
         run_command(["git", "checkout", "main"], cwd=repo_dir)
         run_command(["git", "pull"], cwd=repo_dir)
 
@@ -1484,7 +1491,6 @@ def _trigger_pypi_publish(tag_name: str, wait: bool = False) -> None:
         tag_name: The release tag to publish.
         wait: Block until the workflow run completes.
     """
-    # Capture the latest run ID before triggering so we can detect the new one
     prev_run_id = ""
     if wait:
         try:
@@ -1559,11 +1565,6 @@ def _trigger_pypi_publish(tag_name: str, wait: bool = False) -> None:
         console.print("[green]✓[/green] PyPI publish workflow completed")
 
 
-# ---------------------------------------------------------------------------
-# CLI commands
-# ---------------------------------------------------------------------------
-
-
 @click.group()
 def cli() -> None:
     """Development tools for version bumping and git automation."""
@@ -1831,62 +1832,80 @@ def release(
         skip_enterprise: Skip the enterprise release phase.
         skip_to_enterprise: Skip phases 1 & 2, run only the enterprise release phase.
     """
-    try:
-        check_gh_installed()
+    flags: list[str] = []
+    if no_edit:
+        flags.append("--no-edit")
+    if skip_enterprise:
+        flags.append("--skip-enterprise")
+    flag_suffix = (" " + " ".join(flags)) if flags else ""
+    enterprise_hint = (
+        ""
+        if skip_enterprise
+        else f"\n\nThen release enterprise:\n\n"
+        f"  devtools release {version} --skip-to-enterprise"
+    )
 
-        if skip_enterprise and skip_to_enterprise:
+    check_gh_installed()
+
+    if skip_enterprise and skip_to_enterprise:
+        console.print(
+            "[red]Error:[/red] Cannot use both --skip-enterprise "
+            "and --skip-to-enterprise"
+        )
+        sys.exit(1)
+
+    if not skip_enterprise or skip_to_enterprise:
+        missing: list[str] = []
+        if not _ENTERPRISE_REPO:
+            missing.append("ENTERPRISE_REPO")
+        if not _ENTERPRISE_VERSION_DIRS:
+            missing.append("ENTERPRISE_VERSION_DIRS")
+        if not _ENTERPRISE_CREWAI_DEP_PATH:
+            missing.append("ENTERPRISE_CREWAI_DEP_PATH")
+        if missing:
             console.print(
-                "[red]Error:[/red] Cannot use both --skip-enterprise "
-                "and --skip-to-enterprise"
+                f"[red]Error:[/red] Missing required environment variable(s): "
+                f"{', '.join(missing)}\n"
+                f"Set them or pass --skip-enterprise to skip the enterprise release."
             )
             sys.exit(1)
 
-        if not skip_enterprise or skip_to_enterprise:
-            missing: list[str] = []
-            if not _ENTERPRISE_REPO:
-                missing.append("ENTERPRISE_REPO")
-            if not _ENTERPRISE_VERSION_DIRS:
-                missing.append("ENTERPRISE_VERSION_DIRS")
-            if not _ENTERPRISE_CREWAI_DEP_PATH:
-                missing.append("ENTERPRISE_CREWAI_DEP_PATH")
-            if missing:
-                console.print(
-                    f"[red]Error:[/red] Missing required environment variable(s): "
-                    f"{', '.join(missing)}\n"
-                    f"Set them or pass --skip-enterprise to skip the enterprise release."
-                )
-                sys.exit(1)
+    cwd = Path.cwd()
+    lib_dir = cwd / "lib"
 
-        cwd = Path.cwd()
-        lib_dir = cwd / "lib"
+    is_prerelease = _is_prerelease(version)
 
-        is_prerelease = _is_prerelease(version)
-
-        if skip_to_enterprise:
+    if skip_to_enterprise:
+        try:
             _release_enterprise(version, is_prerelease, dry_run)
-            console.print(
-                f"\n[green]✓[/green] Enterprise release [bold]{version}[/bold] complete!"
+        except BaseException as e:
+            _print_release_error(e)
+            _resume_hint(
+                f"Fix the issue, then re-run:\n\n"
+                f"  devtools release {version} --skip-to-enterprise"
             )
-            return
-
-        if not dry_run:
-            console.print("Checking git status...")
-            check_git_clean()
-            console.print("[green]✓[/green] Working directory is clean")
-        else:
-            console.print("[dim][DRY RUN][/dim] Would check git status")
-
-        packages = get_packages(lib_dir)
-
-        console.print(f"\nFound {len(packages)} package(s) to update:")
-        for pkg in packages:
-            console.print(f"  - {pkg.name}")
-
-        # --- Phase 1: Bump versions ---
+            sys.exit(1)
         console.print(
-            f"\n[bold cyan]Phase 1: Bumping versions to {version}[/bold cyan]"
+            f"\n[green]✓[/green] Enterprise release [bold]{version}[/bold] complete!"
         )
+        return
 
+    if not dry_run:
+        console.print("Checking git status...")
+        check_git_clean()
+        console.print("[green]✓[/green] Working directory is clean")
+    else:
+        console.print("[dim][DRY RUN][/dim] Would check git status")
+
+    packages = get_packages(lib_dir)
+
+    console.print(f"\nFound {len(packages)} package(s) to update:")
+    for pkg in packages:
+        console.print(f"  - {pkg.name}")
+
+    console.print(f"\n[bold cyan]Phase 1: Bumping versions to {version}[/bold cyan]")
+
+    try:
         _update_all_versions(cwd, lib_dir, version, packages, dry_run)
 
         branch_name = f"feat/bump-version-{version}"
@@ -1930,12 +1949,17 @@ def release(
             console.print(
                 "[dim][DRY RUN][/dim] Would push branch, create PR, and wait for merge"
             )
-
-        # --- Phase 2: Tag and release ---
-        console.print(
-            f"\n[bold cyan]Phase 2: Tagging and releasing {version}[/bold cyan]"
+    except BaseException as e:
+        _print_release_error(e)
+        _resume_hint(
+            f"Phase 1 failed. Fix the issue, then re-run:\n\n"
+            f"  devtools release {version}{flag_suffix}"
         )
+        sys.exit(1)
 
+    console.print(f"\n[bold cyan]Phase 2: Tagging and releasing {version}[/bold cyan]")
+
+    try:
         tag_name = version
 
         if not dry_run:
@@ -1962,22 +1986,57 @@ def release(
 
         if not dry_run:
             _create_tag_and_release(tag_name, release_notes, is_prerelease)
+    except BaseException as e:
+        _print_release_error(e)
+        _resume_hint(
+            "Phase 2 failed before PyPI publish. The bump PR is already merged.\n"
+            "Fix the issue, then resume with:\n\n"
+            "  devtools tag"
+            f"\n\nAfter tagging, publish to PyPI and update deployment test:\n\n"
+            f"  gh workflow run publish.yml -f release_tag={version}"
+            f"{enterprise_hint}"
+        )
+        sys.exit(1)
+
+    try:
+        if not dry_run:
             _trigger_pypi_publish(tag_name, wait=True)
+    except BaseException as e:
+        _print_release_error(e)
+        _resume_hint(
+            f"Phase 2 failed at PyPI publish. Tag and GitHub release already exist.\n"
+            f"Retry PyPI publish manually:\n\n"
+            f"  gh workflow run publish.yml -f release_tag={version}"
+            f"{enterprise_hint}"
+        )
+        sys.exit(1)
+
+    try:
+        if not dry_run:
             _update_deployment_test_repo(version, is_prerelease)
+    except BaseException as e:
+        _print_release_error(e)
+        _resume_hint(
+            f"Phase 2 failed updating deployment test repo. "
+            f"Tag, release, and PyPI are done.\n"
+            f"Fix the issue and update {_DEPLOYMENT_TEST_REPO} manually."
+            f"{enterprise_hint}"
+        )
+        sys.exit(1)
 
-        if not skip_enterprise:
+    if not skip_enterprise:
+        try:
             _release_enterprise(version, is_prerelease, dry_run)
+        except BaseException as e:
+            _print_release_error(e)
+            _resume_hint(
+                f"Phase 3 (enterprise) failed. Phases 1 & 2 completed successfully.\n"
+                f"Fix the issue, then resume:\n\n"
+                f"  devtools release {version} --skip-to-enterprise"
+            )
+            sys.exit(1)
 
-        console.print(f"\n[green]✓[/green] Release [bold]{version}[/bold] complete!")
-
-    except subprocess.CalledProcessError as e:
-        console.print(f"[red]Error running command:[/red] {e}")
-        if e.stderr:
-            console.print(e.stderr)
-        sys.exit(1)
-    except Exception as e:
-        console.print(f"[red]Error:[/red] {e}")
-        sys.exit(1)
+    console.print(f"\n[green]✓[/green] Release [bold]{version}[/bold] complete!")
 
 
 cli.add_command(bump)

pyproject.toml

@@ -12,7 +12,7 @@ dev = [
     "mypy==1.19.1",
     "pre-commit==4.5.1",
     "bandit==1.9.2",
-    "pytest==8.4.2",
+    "pytest==9.0.3",
     "pytest-asyncio==1.3.0",
     "pytest-subprocess==1.5.3",
     "vcrpy==7.0.0", # pinned, less versions break pytest-recording
@@ -20,7 +20,7 @@ dev = [
     "pytest-randomly==4.0.1",
     "pytest-timeout==2.4.0",
     "pytest-xdist==3.8.0",
-    "pytest-split==0.10.0",
+    "pytest-split==0.11.0",
     "types-requests~=2.31.0.6",
     "types-pyyaml==6.0.*",
     "types-regex==2026.1.15.*",

uv.lock

@@ -13,7 +13,7 @@ resolution-markers = [
 ]
 
 [options]
-exclude-newer = "2026-04-10T12:25:00.712108Z"
+exclude-newer = "2026-04-10T18:30:59.748668Z"
 exclude-newer-span = "P3D"
 
 [manifest]
@@ -43,11 +43,11 @@ dev = [
     { name = "mypy", specifier = "==1.19.1" },
     { name = "pip-audit", specifier = "==2.9.0" },
     { name = "pre-commit", specifier = "==4.5.1" },
-    { name = "pytest", specifier = "==8.4.2" },
+    { name = "pytest", specifier = "==9.0.3" },
     { name = "pytest-asyncio", specifier = "==1.3.0" },
     { name = "pytest-randomly", specifier = "==4.0.1" },
     { name = "pytest-recording", specifier = "==0.13.4" },
-    { name = "pytest-split", specifier = "==0.10.0" },
+    { name = "pytest-split", specifier = "==0.11.0" },
     { name = "pytest-subprocess", specifier = "==1.5.3" },
     { name = "pytest-timeout", specifier = "==2.4.0" },
     { name = "pytest-xdist", specifier = "==3.8.0" },
@@ -1355,7 +1355,7 @@ requires-dist = [
     { name = "litellm", marker = "extra == 'litellm'", specifier = "~=1.83.0" },
     { name = "mcp", specifier = "~=1.26.0" },
     { name = "mem0ai", marker = "extra == 'mem0'", specifier = "~=0.1.94" },
-    { name = "openai", specifier = ">=1.83.0,<3" },
+    { name = "openai", specifier = ">=2.0.0,<3" },
     { name = "openpyxl", specifier = "~=3.1.5" },
     { name = "openpyxl", marker = "extra == 'openpyxl'", specifier = "~=3.1.5" },
     { name = "opentelemetry-api", specifier = "~=1.34.0" },
@@ -6817,7 +6817,7 @@ sdist = { url = "https://files.pythonhosted.org/packages/12/a0/d0638470df605ce26
 
 [[package]]
 name = "pytest"
-version = "8.4.2"
+version = "9.0.3"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "colorama", marker = "sys_platform == 'win32'" },
@@ -6828,9 +6828,9 @@ dependencies = [
     { name = "pygments" },
     { name = "tomli", marker = "python_full_version < '3.11'" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/a3/5c/00a0e072241553e1a7496d638deababa67c5058571567b92a7eaa258397c/pytest-8.4.2.tar.gz", hash = "sha256:86c0d0b93306b961d58d62a4db4879f27fe25513d4b969df351abdddb3c30e01", size = 1519618, upload-time = "2025-09-04T14:34:22.711Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/7d/0d/549bd94f1a0a402dc8cf64563a117c0f3765662e2e668477624baeec44d5/pytest-9.0.3.tar.gz", hash = "sha256:b86ada508af81d19edeb213c681b1d48246c1a91d304c6c81a427674c17eb91c", size = 1572165, upload-time = "2026-04-07T17:16:18.027Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/a8/a4/20da314d277121d6534b3a980b29035dcd51e6744bd79075a6ce8fa4eb8d/pytest-8.4.2-py3-none-any.whl", hash = "sha256:872f880de3fc3a5bdc88a11b39c9710c3497a547cfa9320bc3c5e62fbf272e79", size = 365750, upload-time = "2025-09-04T14:34:20.226Z" },
+    { url = "https://files.pythonhosted.org/packages/d4/24/a372aaf5c9b7208e7112038812994107bc65a84cd00e0354a88c2c77a617/pytest-9.0.3-py3-none-any.whl", hash = "sha256:2c5efc453d45394fdd706ade797c0a81091eccd1d6e4bccfcd476e2b8e0ab5d9", size = 375249, upload-time = "2026-04-07T17:16:16.13Z" },
 ]
 
 [[package]]
@@ -6874,14 +6874,14 @@ wheels = [
 
 [[package]]
 name = "pytest-split"
-version = "0.10.0"
+version = "0.11.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "pytest" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/46/d7/e30ba44adf83f15aee3f636daea54efadf735769edc0f0a7d98163f61038/pytest_split-0.10.0.tar.gz", hash = "sha256:adf80ba9fef7be89500d571e705b4f963dfa05038edf35e4925817e6b34ea66f", size = 13903, upload-time = "2024-10-16T15:45:19.783Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/2f/16/8af4c5f2ceb3640bb1f78dfdf5c184556b10dfe9369feaaad7ff1c13f329/pytest_split-0.11.0.tar.gz", hash = "sha256:8ebdb29cc72cc962e8eb1ec07db1eeb98ab25e215ed8e3216f6b9fc7ce0ec2b5", size = 13421, upload-time = "2026-02-03T09:14:31.469Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/d6/a7/cad88e9c1109a5c2a320d608daa32e5ee008ccbc766310f54b1cd6b3d69c/pytest_split-0.10.0-py3-none-any.whl", hash = "sha256:466096b086a7147bcd423c6e6c2e57fc62af1c5ea2e256b4ed50fc030fc3dddc", size = 11961, upload-time = "2024-10-16T15:45:18.289Z" },
+    { url = "https://files.pythonhosted.org/packages/ae/a1/d4423657caaa8be9b31e491592b49cebdcfd434d3e74512ce71f6ec39905/pytest_split-0.11.0-py3-none-any.whl", hash = "sha256:899d7c0f5730da91e2daf283860eb73b503259cb416851a65599368849c7f382", size = 11911, upload-time = "2026-02-03T09:14:33.708Z" },
 ]
 
 [[package]]