Merge branch 'main' into my-crewAI

lib/cli/src/crewai_cli/create_json_crew.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import json
+import os
 from pathlib import Path
 import re
 import sys
@@ -16,6 +17,7 @@ from rich.text import Text
 from crewai_cli.constants import ENV_VARS
 from crewai_cli.git import initialize_if_git_available
 from crewai_cli.model_catalog import get_provider_models
+from crewai_cli.platform_tools_catalog import PLATFORM_TOOLS
 from crewai_cli.tui_picker import pick_many, pick_one
 from crewai_cli.utils import (
     enable_prompt_line_editing,
@@ -104,6 +106,7 @@ _TEMPLATES_DIR = Path(__file__).parent / "templates" / "json_crew"
 # ── Common tools for picker ────────────────────────────────────
 
 _TOOL_CATEGORIES: list[tuple[str, list[tuple[str, str]]]] = [
+    ("CrewAI Platform", PLATFORM_TOOLS),
     (
         "Search & Research",
         [
@@ -305,6 +308,9 @@ def _show_interpolation_hint(kind: str) -> None:
 
 
 def _tool_label(name: str, description: str) -> str:
+    if name.startswith("platform:"):
+        app_name = description.removesuffix(" Integration").replace(" ", "")
+        return f"{description:<48s} Platform: {app_name.replace(' ', '')}Integration"
     return f"{description:<48s} {name}"
 
 
@@ -352,6 +358,7 @@ def _select_tools() -> list[str]:
     selected: set[str] = set()
     expanded: str | None = None
     focus_category: str | None = None
+    first_render = True
 
     while True:
         labels: list[str] = []
@@ -388,13 +395,14 @@ def _select_tools() -> list[str]:
                     labels.append(_tool_label(name, desc))
 
         indices, action = pick_many(
-            "Tools (space to toggle, enter to confirm):",
+            "Tools (space to toggle, enter to confirm):" if first_render else "",
             labels,
             action_indices=action_indices,
             separator_indices=separator_indices,
             preselected=preselected,
             initial_cursor=initial_cursor,
         )
+        first_render = False
 
         # Carry over toggles made on this screen; tools not visible in this
         # render keep their previous state.
@@ -613,6 +621,10 @@ def _wizard_agents_and_tasks(
         "inputs": {},
     }
 
+    # Platform authentication belongs to the final wizard step, after the
+    # user has finished configuring agents, tasks, and crew settings.
+    _setup_platform_auth(agents)
+
     return agents, tasks, crew_settings
 
 
@@ -865,6 +877,181 @@ def _setup_env(folder_path: Path, llm_model: str) -> None:
         click.secho("  API keys and model saved to .env file", fg="green")
 
 
+def _platform_apps_from_agents(agents: list[dict[str, Any]]) -> list[str]:
+    """Return unique platform applications selected across all agents."""
+    apps: list[str] = []
+    for agent in agents:
+        for tool in agent.get("tools", []):
+            if isinstance(tool, str) and tool.startswith("platform:"):
+                app = tool.removeprefix("platform:")
+                if app and app not in apps:
+                    apps.append(app)
+    return apps
+
+
+def _platform_app_name(app: str) -> str:
+    """Return the display name for a platform application slug."""
+    return (
+        dict(PLATFORM_TOOLS)
+        .get(f"platform:{app}", app.replace("_", " ").title())
+        .removesuffix(" Integration")
+    )
+
+
+def _prompt_platform_token() -> str:
+    """Explain how to obtain and securely prompt for an AMP integration token."""
+    click.secho(
+        "  To use CrewAI Platform tools, you need a CrewAI Platform Integration Token.",
+        fg="yellow",
+    )
+    click.secho(
+        "  Get your token from CrewAI AMP: https://app.crewai.com "
+        "→ Settings → Integration Tokens.",
+        fg="cyan",
+    )
+    return str(
+        click.prompt(
+            click.style("  CREWAI_PLATFORM_INTEGRATION_TOKEN", fg="cyan"),
+            hide_input=True,
+            prompt_suffix=click.style(" > ", fg="bright_white"),
+        )
+    ).strip()
+
+
+def _validate_platform_apps(
+    apps: list[str], application_selector: Any, client_for_selector: Any
+) -> tuple[list[str], bool]:
+    """Check selected AMP applications and return failures and token validity."""
+    failed: list[str] = []
+    for app in apps:
+        app_name = _platform_app_name(app)
+        click.echo()
+        click.secho(
+            "  Checking CrewAI Platform Integration Token and "
+            f"{app_name} integration on AMP...",
+            fg="cyan",
+        )
+        try:
+            selector = application_selector.from_string(app)
+            actions = client_for_selector(selector).get_actions([selector])
+        except Exception as error:
+            status_code = getattr(getattr(error, "response", None), "status_code", None)
+            if status_code in {401, 403}:
+                click.secho(
+                    "  ✘ CrewAI Platform Integration Token is invalid or expired",
+                    fg="red",
+                )
+                return failed, True
+            click.secho(
+                f"  ✘ {app_name} integration could not be validated: {error}",
+                fg="red",
+            )
+            failed.append(app)
+            continue
+
+        if not actions:
+            click.secho(
+                f"  ✘ {app_name} integration is not connected on CrewAI Platform",
+                fg="red",
+            )
+            failed.append(app)
+        else:
+            click.secho(
+                f"  ✔ {app_name} integration is connected on CrewAI Platform",
+                fg="green",
+            )
+    return failed, False
+
+
+def _show_platform_validation_guidance(
+    failed_apps: list[str], token_invalid: bool
+) -> None:
+    """Tell the user what to fix before revalidating AMP integrations."""
+    click.echo()
+    if token_invalid:
+        click.secho(
+            "  Check your CrewAI Platform Integration Token in AMP.",
+            fg="yellow",
+        )
+        return
+
+    failed_app_names = [_platform_app_name(app) for app in failed_apps]
+    click.secho(
+        "  Check the "
+        f"{', '.join(failed_app_names)} integration"
+        f"{'s' if len(failed_app_names) != 1 else ''} and your CrewAI "
+        "Platform Integration Token in AMP.",
+        fg="yellow",
+    )
+
+
+def _prompt_platform_revalidation_token() -> str:
+    """Prompt for an optional replacement token before the next validation pass."""
+    click.echo()
+    return str(
+        click.prompt(
+            click.style(
+                "  Press Enter to revalidate, or enter a replacement token",
+                fg="cyan",
+            ),
+            default="",
+            show_default=False,
+            hide_input=True,
+            prompt_suffix=click.style(" > ", fg="bright_white"),
+        )
+    ).strip()
+
+
+def _setup_platform_auth(agents: list[dict[str, Any]]) -> str | None:
+    """Get and validate AMP authentication for selected platform applications."""
+    apps = _platform_apps_from_agents(agents)
+    if not apps:
+        return None
+
+    click.echo()
+    try:
+        from crewai_tools.tools.crewai_platform_tools.integrations_client import (
+            ApplicationSelector,
+            client_for_selector,
+        )
+    except ImportError as error:
+        raise click.ClickException(
+            "Platform tools require the 'crewai-tools' package. "
+            "Install it with `uv add crewai-tools` or "
+            "`pip install 'crewai[tools]'`."
+        ) from error
+
+    token = os.environ.get("CREWAI_PLATFORM_INTEGRATION_TOKEN", "")
+    while True:
+        if not token:
+            token = _prompt_platform_token()
+        if not token:
+            click.secho(
+                "  A CrewAI Platform Integration Token is required to validate "
+                "the selected integrations.",
+                fg="yellow",
+            )
+            continue
+
+        os.environ["CREWAI_PLATFORM_INTEGRATION_TOKEN"] = token
+        failed_apps, token_invalid = _validate_platform_apps(
+            apps, ApplicationSelector, client_for_selector
+        )
+        if not failed_apps and not token_invalid:
+            _success("CrewAI Platform integration token set", bold=True)
+            _success(
+                "CrewAI Platform integrations connected: "
+                f"{', '.join(_platform_app_name(app) for app in apps)}"
+            )
+            return token
+
+        _show_platform_validation_guidance(failed_apps, token_invalid)
+        replacement_token = _prompt_platform_revalidation_token()
+        if replacement_token:
+            token = replacement_token
+            os.environ["CREWAI_PLATFORM_INTEGRATION_TOKEN"] = token
+
+
 # ── Main ────────────────────────────────────────────────────────
 
 
@@ -917,13 +1104,25 @@ def create_json_crew(
             default_llm=default_llm,
         )
 
-    # Create directories
+    platform_token = (
+        os.environ.get("CREWAI_PLATFORM_INTEGRATION_TOKEN")
+        if _platform_apps_from_agents(agents) and not dmn_mode
+        else None
+    )
+
+    # Create directories only after platform authentication succeeds.
     folder_path.mkdir(parents=True)
     (folder_path / "agents").mkdir()
     (folder_path / "tools").mkdir()
     (folder_path / "skills").mkdir()
     (folder_path / "knowledge").mkdir()
 
+    if platform_token:
+        os.environ["CREWAI_PLATFORM_INTEGRATION_TOKEN"] = platform_token
+        env_vars = load_env_vars(folder_path)
+        env_vars["CREWAI_PLATFORM_INTEGRATION_TOKEN"] = platform_token
+        write_env_file(folder_path, env_vars)
+
     for agent in agents:
         _write_jsonc(
             folder_path / "agents" / f"{agent['name']}.jsonc",

lib/cli/src/crewai_cli/platform_tools_catalog.py

@@ -0,0 +1,29 @@
+"""CrewAI AMP platform tools exposed by the crew-creation wizard."""
+
+from crewai_core.platform_apps import PLATFORM_APPS
+
+
+PLATFORM_TOOL_PREFIX = "platform:"
+
+_APP_DESCRIPTIONS: dict[str, str] = {
+    "asana": "Asana Integration",
+    "box": "Box Integration",
+    "clickup": "ClickUp Integration",
+    "github": "GitHub Integration",
+    "gmail": "Gmail Integration",
+    "google_calendar": "Google Calendar Integration",
+    "google_sheets": "Google Sheets Integration",
+    "hubspot": "HubSpot Integration",
+    "jira": "Jira Integration",
+    "linear": "Linear Integration",
+    "notion": "Notion Integration",
+    "salesforce": "Salesforce Integration",
+    "shopify": "Shopify Integration",
+    "slack": "Slack Integration",
+    "stripe": "Stripe Integration",
+    "zendesk": "Zendesk Integration",
+}
+
+PLATFORM_TOOLS: list[tuple[str, str]] = [
+    (f"{PLATFORM_TOOL_PREFIX}{app}", _APP_DESCRIPTIONS[app]) for app in PLATFORM_APPS
+]

lib/cli/src/crewai_cli/tui_picker.py

@@ -388,8 +388,9 @@ def pick_many(
         Sorted list of selected indices, or ``(indices, action_index)`` when
         ``action_indices`` is provided.
     """
-    click.echo()
-    click.secho(f"  {title}", fg="cyan")
+    if title:
+        click.echo()
+        click.secho(f"  {title}", fg="cyan")
 
     if _is_interactive():
         try:

lib/cli/tests/test_create_crew.py

@@ -7,6 +7,7 @@ from unittest import mock
 import pytest
 import tomli
 from click.testing import CliRunner
+from crewai_core.platform_apps import PLATFORM_APPS
 from packaging.requirements import Requirement
 from packaging.version import Version
 import crewai_cli.create_json_crew as json_crew
@@ -620,6 +621,52 @@ def test_json_wizard_tool_picker_lists_builtin_tools_across_categories(monkeypat
     }.isdisjoint(tool_names)
 
 
+def test_json_wizard_platform_tool_selection_stays_in_agent_tools(monkeypatch):
+    picker_calls = 0
+
+    def pick_many(title: str, labels: list[str], **kwargs):
+        nonlocal picker_calls
+        picker_calls += 1
+        if picker_calls == 1:
+            platform_row = next(
+                idx for idx, label in enumerate(labels) if "CrewAI Platform" in label
+            )
+            return [], platform_row
+
+        github = next(
+            idx
+            for idx, label in enumerate(labels)
+            if label.startswith("GitHub Integration")
+            and label.endswith("Platform: GitHubIntegration")
+        )
+        return [github], None
+
+    monkeypatch.setattr(json_crew, "pick_many", pick_many)
+    monkeypatch.setattr(
+        json_crew, "_prompt_text", lambda label, **kwargs: label.lower()
+    )
+    monkeypatch.setattr(json_crew, "_select_model", lambda: "openai/gpt-5.5")
+    monkeypatch.setattr(json_crew, "_confirm", lambda *_args, **_kwargs: False)
+
+    agent = json_crew._wizard_agent(agent_num=1, existing_names=[])
+
+    assert agent is not None
+    assert agent["tools"] == ["platform:github"]
+    assert '"tools": ["platform:github"]' in json_crew._agent_to_jsonc(agent)
+
+
+def test_json_wizard_platform_catalog_contains_every_supported_app():
+    platform_category = next(
+        tools
+        for category, tools in json_crew._TOOL_CATEGORIES
+        if category == "CrewAI Platform"
+    )
+
+    assert [name for name, _description in platform_category] == [
+        f"platform:{app}" for app in PLATFORM_APPS
+    ]
+
+
 def test_multi_picker_skips_separator_on_initial_cursor(monkeypatch):
     cursors: list[int] = []