google-agents-cli 1.4.2__tar.gz → 1.5.0__tar.gz

{google_agents_cli-1.4.2 → google_agents_cli-1.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: google-agents-cli
-Version: 1.4.2
+Version: 1.5.0
 Summary: Agents CLI — Agent Development Lifecycle toolchain for ADK
 Author-email: Google LLC <agents-cli-dev-pypi@google.com>
 Requires-Python: >=3.11
@@ -13,17 +13,22 @@ Requires-Dist: click>=8.1.8,<9
 Requires-Dist: PyYAML>=6.0.2,<7
 Requires-Dist: cookiecutter>=2.6.0,<3
 Requires-Dist: jinja2>=3.1.0
-Requires-Dist: google-cloud-aiplatform[evaluation]>=1.156.0,<2
+Requires-Dist: google-cloud-aiplatform[evaluation]>=1.165.0,<2
 Requires-Dist: google-cloud-resource-manager>=1.12.0
 Requires-Dist: google-auth[pyopenssl]>=2.47.0
+Requires-Dist: pyopenssl<26.2
 Requires-Dist: rich>=13.7.0
 Requires-Dist: backoff>=2.2.1
 Requires-Dist: requests>=2.31.0
 Requires-Dist: a2a-sdk>=1.0,<2
+Requires-Dist: protobuf>=5.29.5,<7
 Requires-Dist: tomlkit>=0.13.0,<1
 Requires-Dist: psutil>=5.9.0
 Requires-Dist: python-dotenv>=1.0.0
 Requires-Dist: pathspec>=0.12.1
+Requires-Dist: filelock>=3.12,<4
+Requires-Dist: packaging>=24
+Requires-Dist: pydantic>=2.10,<3
 Requires-Dist: ruff ; extra == "lint"
 Requires-Dist: ty ; extra == "lint"
 Requires-Dist: codespell ; extra == "lint"
@@ -111,7 +116,7 @@ See the [full tutorial](https://google.github.io/agents-cli/guide/quickstart-tut
 | Command | What it does |
 |---------|-------------|
 | `agents-cli setup` | Install CLI + skills to coding agents |
-| `agents-cli scaffold <name>` | Create a new agent project |
+| `agents-cli create <name>` | Create a new agent project |
 | `agents-cli eval run` | Run the agent over the eval dataset and grade the traces |
 | `agents-cli deploy` | Deploy to Google Cloud |
 | `agents-cli publish gemini-enterprise` | Register with Gemini Enterprise |
@@ -124,8 +129,8 @@ See the [full tutorial](https://google.github.io/agents-cli/guide/quickstart-tut
 | `agents-cli login` | Authenticate with Google Cloud or AI Studio |
 | `agents-cli login --status` | Show authentication status |
 | **Scaffold** | |
-| `agents-cli scaffold <name>` | Create a new agent project |
-| `agents-cli scaffold enhance` | Add deployment, CI/CD, or RAG to an existing project |
+| `agents-cli create <name>` | Create a new agent project |
+| `agents-cli scaffold enhance` | Add deployment or CI/CD to an existing project |
 | `agents-cli scaffold upgrade` | Upgrade project to a newer agents-cli version |
 | **Develop** | |
 | `agents-cli run "prompt"` | Run agent with a single prompt |
@@ -145,9 +150,6 @@ See the [full tutorial](https://google.github.io/agents-cli/guide/quickstart-tut
 | `agents-cli publish gemini-enterprise` | Register with Gemini Enterprise |
 | `agents-cli infra single-project` | Provision single-project infrastructure |
 | `agents-cli infra cicd` | Set up CI/CD pipeline + staging/prod infrastructure |
-| **Data** | |
-| `agents-cli infra datastore` | Provision datastore infrastructure for RAG |
-| `agents-cli data-ingestion` | Run data ingestion pipeline |
 | **Other** | |
 | `agents-cli info` | Show project config and CLI version |
 | `agents-cli update` | Force reinstall skills to all IDEs |

{google_agents_cli-1.4.2 → google_agents_cli-1.5.0}/README.md

@@ -76,7 +76,7 @@ See the [full tutorial](https://google.github.io/agents-cli/guide/quickstart-tut
 | Command | What it does |
 |---------|-------------|
 | `agents-cli setup` | Install CLI + skills to coding agents |
-| `agents-cli scaffold <name>` | Create a new agent project |
+| `agents-cli create <name>` | Create a new agent project |
 | `agents-cli eval run` | Run the agent over the eval dataset and grade the traces |
 | `agents-cli deploy` | Deploy to Google Cloud |
 | `agents-cli publish gemini-enterprise` | Register with Gemini Enterprise |
@@ -89,8 +89,8 @@ See the [full tutorial](https://google.github.io/agents-cli/guide/quickstart-tut
 | `agents-cli login` | Authenticate with Google Cloud or AI Studio |
 | `agents-cli login --status` | Show authentication status |
 | **Scaffold** | |
-| `agents-cli scaffold <name>` | Create a new agent project |
-| `agents-cli scaffold enhance` | Add deployment, CI/CD, or RAG to an existing project |
+| `agents-cli create <name>` | Create a new agent project |
+| `agents-cli scaffold enhance` | Add deployment or CI/CD to an existing project |
 | `agents-cli scaffold upgrade` | Upgrade project to a newer agents-cli version |
 | **Develop** | |
 | `agents-cli run "prompt"` | Run agent with a single prompt |
@@ -110,9 +110,6 @@ See the [full tutorial](https://google.github.io/agents-cli/guide/quickstart-tut
 | `agents-cli publish gemini-enterprise` | Register with Gemini Enterprise |
 | `agents-cli infra single-project` | Provision single-project infrastructure |
 | `agents-cli infra cicd` | Set up CI/CD pipeline + staging/prod infrastructure |
-| **Data** | |
-| `agents-cli infra datastore` | Provision datastore infrastructure for RAG |
-| `agents-cli data-ingestion` | Run data ingestion pipeline |
 | **Other** | |
 | `agents-cli info` | Show project config and CLI version |
 | `agents-cli update` | Force reinstall skills to all IDEs |

{google_agents_cli-1.4.2 → google_agents_cli-1.5.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "google-agents-cli"
-version = "1.4.2"
+version = "1.5.0"
 description = "Agents CLI — Agent Development Lifecycle toolchain for ADK"
 readme = "README.md"
 license = "Apache-2.0"
@@ -16,17 +16,27 @@ dependencies = [
   "PyYAML>=6.0.2,<7",
   "cookiecutter>=2.6.0,<3",
   "jinja2>=3.1.0",
-  "google-cloud-aiplatform[evaluation]>=1.156.0,<2",
+  "google-cloud-aiplatform[evaluation]>=1.165.0,<2",
   "google-cloud-resource-manager>=1.12.0",
   "google-auth[pyopenssl]>=2.47.0",
+  # pyOpenSSL 26.2 forbids mutating a used SSL Context; urllib3 does it per
+  # connection under google-auth's mTLS shim (urllib3#5107). Lift when fixed.
+  "pyopenssl<26.2",
   "rich>=13.7.0",
   "backoff>=2.2.1",
   "requests>=2.31.0",
   "a2a-sdk>=1.0,<2",
+  # Pin the a2a-sdk (>=5.29.5) .. aiplatform (<7) window so pip won't chase
+  # protobuf 7 and backtrack into old google-api-core (protobuf<5).
+  "protobuf>=5.29.5,<7",
   "tomlkit>=0.13.0,<1",
   "psutil>=5.9.0",
   "python-dotenv>=1.0.0",
   "pathspec>=0.12.1",
+  "filelock>=3.12,<4",
+  "packaging>=24",
+  # 2.10+: earlier versions emit `enum` beside `const`, which the schema sync test sees.
+  "pydantic>=2.10,<3",
 ]
 
 [project.urls]
@@ -53,7 +63,6 @@ include = [
   "src/google/agents/cli/scaffold/deployment_targets/",
   "src/google/agents/cli/scaffold/resources/",
   "src/google/agents/cli/scaffold/sample_data/",
-  "skills/",
 ]
 
 [project.optional-dependencies]
@@ -79,16 +88,27 @@ dev = [
     "pytest-rerunfailures>=15.0",
     "pytest-xdist>=3.6.1",
     "pytest-cov>=4.1.0",
+    "jsonschema>=4.20",
 ]
 
 [tool.ruff]
 line-length = 90
 target-version = "py311"
-include = ["src/google/agents/cli/**/*.py", "tests/**/*.py", "tools/**/*.py"]
+include = [
+  "src/google/agents/cli/**/*.py",
+  "tests/**/*.py",
+  "tools/**/*.py",
+  # First-party extensions ship real code; lint them like the rest.
+  "extensions/**/*.py",
+]
 exclude = [
     "src/google/agents/cli/scaffold/agents",
     "src/google/agents/cli/scaffold/base_templates",
     "src/google/agents/cli/scaffold/deployment_targets",
+    # Generated-project sources, linted by the project's own config (a
+    # different line length, and no `google` namespace on disk), not this one.
+    "extensions/*/template",
+    "src/google/agents/cli/skills/data",
     "tests/cicd/scripts",
 ]
 
@@ -111,10 +131,10 @@ ignore = ["E501", "C901", "RUF001", "UP036", "RUF067", "RUF069"]
 
 [tool.ruff.lint.per-file-ignores]
 "tests/**/*.py" = ["PLR0917"]
-"src/google/agents/cli/_output.py" = ["TID251"]
 
 [tool.ruff.lint.flake8-tidy-imports.banned-api]
 "rich.console.Console" = { msg = "Use `google.agents.cli._output.Console` instead to ensure project-wide defaults (soft_wrap=True) are applied." }
+"agentplatform.Client" = { msg = "Use `google.agents.cli._agent_platform.AgentPlatformClient` instead, so the client retries throttled requests." }
 
 [tool.ruff.lint.pylint]
 max-positional-args = 5
@@ -136,6 +156,7 @@ exclude = [
     "src/google/agents/cli/scaffold/agents/**",
     "src/google/agents/cli/scaffold/base_templates/**",
     "src/google/agents/cli/scaffold/deployment_targets/**",
+    "src/google/agents/cli/skills/data/**",
     "tests/cicd/scripts/**",
 ]
 

{google_agents_cli-1.4.2 → google_agents_cli-1.5.0}/src/google/agents/cli/__init__.py

@@ -16,7 +16,11 @@
 
 import importlib.metadata
 
+# Reported when the CLI runs from a source checkout rather than an installed
+# distribution. Version checks treat it as "unknown, don't block".
+DEV_VERSION = "0.0.0-dev"
+
 try:
     __version__ = importlib.metadata.version("google-agents-cli")
 except importlib.metadata.PackageNotFoundError:
-    __version__ = "0.0.0-dev"
+    __version__ = DEV_VERSION

{google_agents_cli-1.4.2 → google_agents_cli-1.5.0}/src/google/agents/cli/_adk_client.py

@@ -71,7 +71,10 @@ def fetch_app_info(
     resp = requests.get(url, headers=headers, timeout=_APP_INFO_TIMEOUT)
     resp.raise_for_status()
     payload = resp.json()
-    return payload.get("rootAgentName"), payload.get("agents") or {}
+    # Accept both camelCase and snake_case for cross language compatibility
+    root_agent_name = payload.get("rootAgentName", payload.get("root_agent_name"))
+    agents = payload.get("agents") or {}
+    return root_agent_name, agents
 
 
 def run_sse(
@@ -91,10 +94,10 @@ def run_sse(
     """
     run_url = f"{base_url}/run_sse"
     payload = {
-        "app_name": app_name,
-        "user_id": user_id,
-        "session_id": session_id,
-        "new_message": user_message,
+        "appName": app_name,
+        "userId": user_id,
+        "sessionId": session_id,
+        "newMessage": user_message,
     }
 
     with requests.post(

google_agents_cli-1.5.0/src/google/agents/cli/_agent_platform.py

@@ -0,0 +1,66 @@
+# Copyright 2026 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Shared construction of the Agent Platform SDK client."""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any
+
+if TYPE_CHECKING:
+    import agentplatform
+
+# Retry options applied to every Agent Platform client the CLI builds. Leaving
+# http_status_codes unset keeps the SDK's default retryable set (408/429/500/502/503/504);
+# waits are roughly 1s, 2s, 4s, 8s (full-jittered).
+RETRY_OPTIONS: dict[str, Any] = {
+    "attempts": 5,
+    "initial_delay": 1.0,
+}
+
+
+class AgentPlatformClient:
+    """Agent Platform client configured with CLI-wide defaults (e.g. retries on transient errors).
+
+    Retries are opt-in in the underlying SDK, so constructing ``agentplatform.Client``
+    directly runs without them. A ruff rule enforces using this wrapper instead.
+
+    Args:
+        project: GCP project ID, or None to let the SDK resolve it.
+        location: API location (e.g. ``us-east1``), or None.
+        api_version: Optional API version override (e.g. ``v1beta1``).
+    """
+
+    def __init__(
+        self,
+        *,
+        project: str | None = None,
+        location: str | None = None,
+        api_version: str | None = None,
+    ) -> None:
+        # Lazy: agentplatform is expensive to import, this module is not.
+        import agentplatform
+
+        http_options: dict[str, Any] = {"retry_options": RETRY_OPTIONS}
+        if api_version:
+            http_options["api_version"] = api_version
+
+        self._client: agentplatform.Client = agentplatform.Client(  # noqa: TID251
+            project=project,
+            location=location,
+            http_options=http_options,
+        )
+
+    def __getattr__(self, name: str) -> Any:
+        return getattr(self._client, name)

{google_agents_cli-1.4.2 → google_agents_cli-1.5.0}/src/google/agents/cli/_click.py

@@ -50,6 +50,7 @@ class LazyGroup(click.Group):
         self._lazy_commands: dict[str, tuple[str, str]] = {}
         # name -> experiment label
         self._experiment_gates: dict[str, str] = {}
+        self._overrides: dict[str, click.Command] = {}
 
     def add_lazy_command(
         self,
@@ -81,12 +82,20 @@ class LazyGroup(click.Group):
         return bool(resolve_experiment(label))
 
     def list_commands(self, ctx: click.Context) -> list[str]:
-        names = set(super().list_commands(ctx)) | set(self._lazy_commands)
+        names = (
+            set(super().list_commands(ctx))
+            | set(self._lazy_commands)
+            | set(self._overrides)
+        )
         return sorted(filter(self._is_visible, names))
 
     def get_command(self, ctx: click.Context, cmd_name: str) -> click.Command | None:
+        # Overrides are consulted only after the visibility check, so an installed
+        # extension cannot expose a command that is gated off.
         if not self._is_visible(cmd_name):
             return None
+        if cmd_name in self._overrides:
+            return self._overrides[cmd_name]
         if cmd_name in self._lazy_commands and cmd_name not in self.commands:
             import_path, _ = self._lazy_commands[cmd_name]
             module_path, attr = import_path.split(":")
@@ -98,6 +107,9 @@ class LazyGroup(click.Group):
     def format_commands(self, ctx: click.Context, formatter: click.HelpFormatter) -> None:
         rows: list[tuple[str, str]] = []
         for name in self.list_commands(ctx):
+            if name in self._overrides:
+                rows.append((name, self._overrides[name].get_short_help_str(limit=1000)))
+                continue
             if name in self.commands:
                 # Don't truncate — Click's default of 45 would cut our docstring summaries.
                 rows.append((name, self.commands[name].get_short_help_str(limit=1000)))

{google_agents_cli-1.4.2 → google_agents_cli-1.5.0}/src/google/agents/cli/_output.py

@@ -19,7 +19,7 @@ import sys
 from enum import IntEnum
 from typing import Any
 
-from rich.console import Console as _RichConsole
+from rich.console import Console as _RichConsole  # noqa: TID251
 
 
 class ExitCode(IntEnum):

{google_agents_cli-1.4.2 → google_agents_cli-1.5.0}/src/google/agents/cli/_project.py

@@ -18,7 +18,9 @@ from __future__ import annotations
 
 import logging
 import os
+import re
 import tomllib
+from collections.abc import Mapping
 from dataclasses import dataclass
 from pathlib import Path
 from typing import Any
@@ -56,8 +58,15 @@ class ProjectConfig:
         }
 
     @classmethod
-    def from_dict(cls, data: dict[str, Any]) -> ProjectConfig:
+    def from_dict(
+        cls,
+        data: Mapping[str, Any] | Any,
+        filename: str = "agents-cli-manifest.yaml",
+    ) -> ProjectConfig:
         """Create a ProjectConfig from a raw manifest dictionary."""
+        if not isinstance(data, Mapping):
+            raise click.ClickException(f"malformed {filename}")
+
         cfg = cls()
         cfg.project_name = data.get("name", cfg.project_name)
         cfg.agent_directory = data.get("agent_directory", cfg.agent_directory)
@@ -68,7 +77,11 @@ class ProjectConfig:
         )
         cfg.language = data.get("language", cfg.language)
 
-        create_params = data.get("create_params", {})
+        create_params = data.get("create_params")
+        if create_params is None:
+            create_params = {}
+        elif not isinstance(create_params, Mapping):
+            raise click.ClickException(f"malformed create_params in {filename}")
 
         cfg.session_type = create_params.get("session_type", cfg.session_type)
         cfg.cicd_runner = create_params.get("cicd_runner", cfg.cicd_runner)
@@ -103,6 +116,34 @@ def _warn_legacy_config() -> None:
         _WARNED_LEGACY_CONFIG = True
 
 
+def _read_project_config_from_manifest(manifest_path: Path) -> ProjectConfig:
+    """Read project configuration from an agents-cli-manifest.yaml file."""
+    with open(manifest_path, encoding="utf-8") as f:
+        data = yaml.safe_load(f)
+    if data is None:
+        data = {}
+    return ProjectConfig.from_dict(data, filename=manifest_path.name)
+
+
+def _read_project_config_from_pyproject(pyproject_path: Path) -> ProjectConfig:
+    """Read project configuration from a legacy pyproject.toml file."""
+    with open(pyproject_path, "rb") as f:
+        pyproj_data = tomllib.load(f)
+    tool_section = pyproj_data.get("tool", {})
+    if not isinstance(tool_section, Mapping) or "agents-cli" not in tool_section:
+        return ProjectConfig()
+    _warn_legacy_config()
+    data = tool_section["agents-cli"]
+    if data is None:
+        data = {}
+    elif isinstance(data, Mapping):
+        data = dict(data)
+        project_section = pyproj_data.get("project", {})
+        if isinstance(project_section, Mapping):
+            data["name"] = project_section.get("name", "")
+    return ProjectConfig.from_dict(data, filename=pyproject_path.name)
+
+
 def read_project_config(project_dir: str | None = None) -> ProjectConfig:
     """Read project metadata from agents-cli-manifest.yaml.
 
@@ -120,27 +161,13 @@ def read_project_config(project_dir: str | None = None) -> ProjectConfig:
     pyproject_path = root / "pyproject.toml"
 
     if manifest_path.exists():
-        # Primary: read from manifest
-        with open(manifest_path, encoding="utf-8") as f:
-            data = yaml.safe_load(f) or {}
+        return _read_project_config_from_manifest(manifest_path)
     elif pyproject_path.exists():
-        # Fallback: read from pyproject.toml
-        with open(pyproject_path, "rb") as f:
-            pyproj_data = tomllib.load(f)
-        if not pyproj_data.get("tool", {}).get("agents-cli"):
-            return ProjectConfig()
-        _warn_legacy_config()
-        data = pyproj_data["tool"]["agents-cli"]
-        # Read project name from [project]
-        project_section = pyproj_data.get("project", {})
-        project_name = project_section.get("name", "")
-        data["name"] = project_name
+        return _read_project_config_from_pyproject(pyproject_path)
     else:
-        # If neither works, return a default project config
+        # If neither exists, return a default project config
         return ProjectConfig()
 
-    return ProjectConfig.from_dict(data)
-
 
 def _parse_version(v: str) -> tuple[int, ...]:
     """Parse a dotted numeric version into a comparable tuple.
@@ -207,7 +234,8 @@ def _find_legacy_project_root(start_dir: Path) -> Path | None:
             try:
                 with open(pyproject_path, "rb") as f:
                     data = tomllib.load(f)
-                if "tool" in data and "agents-cli" in data["tool"]:
+                tool_data = data.get("tool")
+                if isinstance(tool_data, Mapping) and "agents-cli" in tool_data:
                     return parent
             except Exception:
                 pass
@@ -334,3 +362,24 @@ def find_project_config(project_dir: Path | None = None) -> ProjectConfig | None
         return None
 
     return read_project_config(str(project_root_dir))
+
+
+def root_agent_name(project_name: str) -> str:
+    """The ADK agent name the scaffolded template gives a project's root agent.
+
+    Single definition on purpose. The scaffold bakes this into
+    ``Agent(name=...)``, and it then travels out in telemetry as the OpenTelemetry
+    ``gen_ai.agent.name`` attribute -- which is what an observability backend
+    filters an agent's traces on. Deriving it from the project name in one
+    place is what lets agents-cli know the value without parsing the
+    generated ``agent.py``.
+
+    Coerced to a valid Python identifier, since ADK agent names must be:
+    ``my-agent`` becomes ``my_agent``. Falls back to ``root_agent`` (the
+    historical literal) when the project name has nothing usable in it.
+    """
+    candidate = re.sub(r"\W+", "_", project_name).strip("_").lower()
+    if not candidate:
+        return "root_agent"
+    # A leading digit is legal in a project name but not in an identifier.
+    return f"agent_{candidate}" if candidate[0].isdigit() else candidate

{google_agents_cli-1.4.2 → google_agents_cli-1.5.0}/src/google/agents/cli/_remote.py

@@ -38,13 +38,14 @@ def is_agent_runtime_url(url: str) -> bool:
     return _AGENT_ENGINE_URL_FRAGMENT in url and _REASONING_ENGINE_PATH in url
 
 
-def is_raw_agent_runtime_url(url: str) -> bool:
-    """``True`` for a bare Agent Runtime resource URL that still needs its
-    ``/api`` passthrough path built.
+def is_legacy_agent_runtime_url(url: str) -> bool:
+    """``True`` for a bare, non-passthrough Agent Runtime resource URL.
+
+    This URL can only be used for legacy ``:streamQuery`` endpoints, not the
+    ``/api/`` passthrough API.
 
     A URL already containing ``/api`` (the deployed APP_URL form served by the
-    container) or any non-Agent-Runtime URL returns ``False`` — those are used
-    as-is with ``/a2a/<app>`` (a2a) or ``/run_sse`` (adk) appended.
+    container) or any non-Agent-Runtime URL returns ``False``.
     """
     return is_agent_runtime_url(url) and "/api" not in url
 
@@ -69,6 +70,15 @@ def validate_agent_runtime_url(url: str) -> None:
     )
 
 
+def build_agent_runtime_passthrough_url(location: str, runtime_resource: str) -> str:
+    """Base all clients can target. ``runtime_resource`` is the full
+    ``projects/<num>/locations/<loc>/reasoningEngines/<id>`` resource name."""
+    return (
+        f"https://{location}-aiplatform.googleapis.com/reasoningEngines/v1/"
+        f"{runtime_resource}/api"
+    )
+
+
 def parse_agent_runtime_service_url(service_url: str) -> tuple[str, str]:
     """Split an Agent Runtime service URL into (location, runtime_resource).
 

{google_agents_cli-1.4.2 → google_agents_cli-1.5.0}/src/google/agents/cli/_runner.py

@@ -19,12 +19,19 @@ import os
 import shlex
 import subprocess
 import sys
+from collections.abc import Sequence
 from pathlib import Path
 
 import click
 
 from google.agents.cli import _tools
 
+# Set for an extension's command so any re-entry into `agents-cli <cmd>` runs the
+# built-in instead of recursing back into the override.
+DISABLE_OVERRIDES_ENV = "AGENTS_CLI_DISABLE_OVERRIDES"
+# Exported so an extension's scripts can find sibling resources (templates etc.).
+EXTENSION_DIR_ENV = "AGENTS_CLI_EXTENSION_DIR"
+
 
 def redact_cmd(args: list[str]) -> str:
     """Mask sensitive information in command arguments and return joined string.
@@ -173,6 +180,48 @@ def run(
     return result
 
 
+def _looks_like_path(token: str) -> bool:
+    """A `run:` token the author wrote as a path, e.g. `scripts/run.py`."""
+    return "/" in token or os.sep in token
+
+
+def run_extension_command(
+    run_vector: Sequence[str],
+    extra_args: list[str],
+    *,
+    cwd: Path,
+    extension_root: Path,
+) -> int:
+    """Run an extension's declared `run:` vector with the user's argv appended.
+
+    Differs from `run` in ways an override needs: the vector is extension-supplied
+    and passed through verbatim (no `require_tool` resolution), the command is
+    not echoed, and the child's exit code is returned rather than raised, so the
+    override exits like the command it replaced.
+
+    Tokens that exist as paths under `extension_root` are made absolute, so a
+    vendored script is found regardless of cwd.
+    """
+    # Only tokens written as paths. Resolving every token would rewrite an
+    # ordinary argument that happens to name a file in the extension, e.g.
+    # `run: ["make", "build"]` in an extension that also ships `build/`.
+    resolved_vector = [
+        str((extension_root / tok).resolve())
+        if _looks_like_path(tok) and (extension_root / tok).exists()
+        else tok
+        for tok in run_vector
+    ]
+    result = run(
+        resolved_vector + list(extra_args),
+        cwd=cwd,
+        env={DISABLE_OVERRIDES_ENV: "1", EXTENSION_DIR_ENV: str(extension_root)},
+        print_cmd=False,
+        check=False,
+        resolve_executable=False,
+    )
+    return result.returncode
+
+
 def run_resolved(
     args: list[str], *, resolve_executable: bool = True, **kwargs
 ) -> subprocess.CompletedProcess:

{google_agents_cli-1.4.2 → google_agents_cli-1.5.0}/src/google/agents/cli/_tools.py

@@ -151,6 +151,10 @@ def require_tool(name: str, install_hint: str = "") -> str:
     return path
 
 
+# Where `agents-cli setup` fetches the bundled skills from.
+DEFAULT_SKILLS_SOURCE = "https://github.com/google/agents-cli"
+
+
 def run_npx_skills(args: list[str], spinner_msg: str):
     """Run an npx skills command, streaming output in real-time.
 
@@ -164,7 +168,7 @@ def run_npx_skills(args: list[str], spinner_msg: str):
     from google.agents.cli._skills_check import SKILLS_NPX_PACKAGE
 
     full_args = ["npx", "-y", SKILLS_NPX_PACKAGE, *args]
-    click.secho(f"  \u25b8 {shlex.join(full_args)}", fg="cyan", dim=True)
+    click.secho(f"  ▸ {shlex.join(full_args)}", fg="cyan", dim=True)
 
     try:
         run_resolved(full_args, check=True, encoding="utf-8", errors="replace")

{google_agents_cli-1.4.2 → google_agents_cli-1.5.0}/src/google/agents/cli/_trust.py

@@ -24,7 +24,7 @@ def require_confirmation(message: str):
 
     In interactive mode (-i), the user is prompted to confirm the action.
     In auto-approve mode (-y) or strict programmatic mode (no flags), proceeds silently.
-    The decorated function receives 'yes' and 'interactive' parameters.
+    The decorated function receives an 'auto_approve' parameter.
 
     Args:
         message: Confirmation prompt shown to the user.
@@ -42,21 +42,24 @@ def require_confirmation(message: str):
             "-y",
             "--yes",
             "--auto-approve",
+            "auto_approve",
             is_flag=True,
             default=False,
             help="Skip confirmation prompt.",
         )
         @functools.wraps(f)
-        def wrapper(*args, interactive=False, yes=False, **kwargs):
-            if interactive and not yes:
+        def wrapper(*args, interactive=False, auto_approve=False, **kwargs):
+            if interactive and not auto_approve:
                 click.echo()
                 if not click.confirm(f"  {message}", default=False):
                     click.echo()
                     click.secho("  Aborted.", fg="yellow")
                     return
                 click.echo()
-            # In strict programmatic mode (no -i, no -y): auto-proceed silently
-            return f(*args, yes=yes, interactive=interactive, **kwargs)
+            # In strict programmatic mode (no -i, no -y): auto-proceed silently.
+            # `interactive` is not passed on: the prompt happens here, and no
+            # decorated command has ever read it.
+            return f(*args, auto_approve=auto_approve, **kwargs)
 
         return wrapper