google-agents-cli 1.11.0__tar.gz → 1.12.0__tar.gz

{google_agents_cli-1.11.0 → google_agents_cli-1.12.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: google-agents-cli
-Version: 1.11.0
+Version: 1.12.0
 Summary: Agents CLI — Agent Development Lifecycle toolchain for ADK
 Author-email: Google LLC <agents-cli-dev-pypi@google.com>
 Requires-Python: >=3.11
@@ -117,7 +117,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 create <name> -y` | Create a new agent project with defaults (`adk` template, `agent_runtime` target) |
+| `agents-cli create <name> -y` | Create a new agent project with defaults (`adk_python` template, `agent_runtime` target) |
 | `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` | Register with Gemini |
@@ -130,7 +130,7 @@ 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 create <name> -y` | Create a new agent project with defaults (`adk` template, `agent_runtime` target) |
+| `agents-cli create <name> -y` | Create a new agent project with defaults (`adk_python` template, `agent_runtime` target) |
 | `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** | |

{google_agents_cli-1.11.0 → google_agents_cli-1.12.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 create <name> -y` | Create a new agent project with defaults (`adk` template, `agent_runtime` target) |
+| `agents-cli create <name> -y` | Create a new agent project with defaults (`adk_python` template, `agent_runtime` target) |
 | `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` | Register with Gemini |
@@ -89,7 +89,7 @@ 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 create <name> -y` | Create a new agent project with defaults (`adk` template, `agent_runtime` target) |
+| `agents-cli create <name> -y` | Create a new agent project with defaults (`adk_python` template, `agent_runtime` target) |
 | `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** | |

{google_agents_cli-1.11.0 → google_agents_cli-1.12.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "google-agents-cli"
-version = "1.11.0"
+version = "1.12.0"
 description = "Agents CLI — Agent Development Lifecycle toolchain for ADK"
 readme = "README.md"
 license = "Apache-2.0"

{google_agents_cli-1.11.0 → google_agents_cli-1.12.0}/src/google/agents/cli/_project.py

@@ -22,7 +22,7 @@ import re
 import tomllib
 from collections.abc import Mapping
 from dataclasses import dataclass
-from pathlib import Path
+from pathlib import Path, PurePosixPath
 from typing import Any
 
 import click
@@ -32,6 +32,9 @@ import yaml
 # ADK; new projects get the value from their template.
 DEFAULT_FRAMEWORK = "google-adk"
 
+# Base template used when a project does not name one. `adk` is an alias for it.
+DEFAULT_BASE_TEMPLATE = "adk_python"
+
 # Values of create_params.agent_runtime.identity_default.
 AGENT_IDENTITY = "agent_identity"
 SERVICE_ACCOUNT = "service_account"
@@ -47,10 +50,20 @@ NESTED_CREATE_PARAMS = {
 # sit under a "create a project first:" line.
 CREATE_PROJECT_HINT = (
     "    agents-cli create my-agent -i    # choose options in prompts\n"
-    "    agents-cli create my-agent -y    # accept the defaults (adk template, agent_runtime target)"
+    "    agents-cli create my-agent -y    # accept the defaults (adk_python template, agent_runtime target)"
 )
 
 
+def agent_package_name(agent_directory: str) -> str:
+    """Return the package name (basename) of ``agent_directory``."""
+    return PurePosixPath(agent_directory).name
+
+
+def agents_root(agent_directory: str) -> str:
+    """Return the parent of ``agent_directory``, ``.`` for a top-level one."""
+    return PurePosixPath(agent_directory).parent.as_posix()
+
+
 @dataclass
 class ProjectConfig:
     """Configuration derived from agents-cli-manifest.yaml."""
@@ -60,9 +73,11 @@ class ProjectConfig:
     agent_directory: str = "app"
     is_a2a: bool = False
     region: str = "us-east1"
-    base_template: str = "adk"
+    base_template: str = DEFAULT_BASE_TEMPLATE
     acli_version: str = ""
-    language: str = "python"
+    # The manifest's language as written; None when it has no language key.
+    # Read `language` unless you need to tell "unset" apart from "python".
+    raw_language: str | None = None
     framework: str = DEFAULT_FRAMEWORK
     session_type: str = "none"
     cicd_runner: str = "skip"
@@ -73,6 +88,10 @@ class ProjectConfig:
     # name"; see resolve_root_agent_name.
     root_agent_name: str = ""
 
+    @property
+    def language(self) -> str:
+        return self.raw_language or "python"
+
     @property
     def create_params(self) -> dict[str, Any]:
         return {
@@ -104,7 +123,7 @@ class ProjectConfig:
         cfg.acli_version = (
             data.get("acli_version") or data.get("version") or cfg.acli_version
         )
-        cfg.language = data.get("language", cfg.language)
+        cfg.raw_language = data.get("language")
         cfg.framework = data.get("framework", cfg.framework)
 
         create_params = data.get("create_params")

{google_agents_cli-1.11.0 → google_agents_cli-1.12.0}/src/google/agents/cli/_skills_check.py

@@ -18,6 +18,7 @@ from __future__ import annotations
 
 import logging
 import os
+import subprocess
 import time
 from pathlib import Path
 
@@ -60,16 +61,70 @@ def _parse_skill_version(skill_md: Path) -> str | None:
     return str(version) if version else None
 
 
-def _find_installed_skills() -> dict[str, str]:
+def list_skills_all_scopes() -> list[dict]:
+    """Return ``npx skills list --json`` entries for project and global scope.
+
+    ``skills list`` without ``-g`` only reports project-scoped skills and
+    ``-g`` only reports global ones, so both are queried and merged. Entries
+    that share a path are reported once: run from the home directory, the
+    project store (``~/.agents/skills``) is also the global store.
+
+    Raises ``subprocess.CalledProcessError`` if the project query exits
+    non-zero, or ``ValueError`` if its output is not a JSON list. If only the
+    global query fails, the project entries are returned and a warning is
+    logged.
+    """
+    import json
+
+    from google.agents.cli._runner import run_resolved
+
+    entries: list[dict] = []
+    seen_paths: set[str] = set()
+    # Sequential on purpose: concurrent `npx -y` runs race on the shared npm
+    # cache when the package isn't downloaded yet.
+    for scope_args in ([], ["-g"]):
+        cmd = ["npx", "-y", SKILLS_NPX_PACKAGE, "list", *scope_args, "--json"]
+        try:
+            proc = run_resolved(
+                cmd,
+                capture_output=True,
+                text=True,
+                encoding="utf-8",
+                errors="replace",
+                timeout=15,
+            )
+            proc.check_returncode()
+            data = json.loads(proc.stdout)
+            if not isinstance(data, list):
+                raise ValueError(f"expected a JSON list, got {type(data).__name__}")
+        except (subprocess.SubprocessError, ValueError) as e:
+            if not scope_args:
+                raise
+            logging.warning(
+                "Could not list global skills; using project skills only: %s", e
+            )
+            continue
+        for entry in data:
+            path = entry.get("path") if isinstance(entry, dict) else None
+            if path in seen_paths:
+                continue
+            if path:
+                seen_paths.add(path)
+            entries.append(entry)
+    return entries
+
+
+def _find_installed_skills() -> dict[str, str] | None:
     """Return ``{skill_name: version}`` for every installed agents-cli skill.
 
     Fast path (~8 ms): scan ``~/.agents/skills/google-agents-cli-*/SKILL.md``
-    directly.  Falls back to ``npx skills list --json`` (~400 ms+) if
+    directly.  Falls back to ``npx skills list [-g] --json`` (~800 ms+) if
     the well-known directory is empty or missing, which is more robust
     when skills are installed to a non-default location.
-    """
-    import json
 
+    Returns ``None`` if the npx query fails, so callers can tell "no skills
+    installed" apart from "could not check".
+    """
     result: dict[str, str] = {}
 
     # Fast path: well-known global install location
@@ -87,25 +142,15 @@ def _find_installed_skills() -> dict[str, str]:
 
     # Slow path: ask npx skills for actual install locations
     try:
-        from google.agents.cli._runner import run_resolved
-
-        proc = run_resolved(
-            ["npx", "-y", SKILLS_NPX_PACKAGE, "list", "--json"],
-            capture_output=True,
-            text=True,
-            encoding="utf-8",
-            errors="replace",
-            timeout=15,
-        )
-        if proc.returncode != 0:
-            return {}
-        entries = json.loads(proc.stdout)
+        entries = list_skills_all_scopes()
+    except subprocess.CalledProcessError:
+        return None
     except Exception as e:
         # Broad by design: this freshness check runs on every CLI invocation and
-        # must never abort a user's command, so any failure degrades to "no skills
-        # found" rather than propagating.
+        # must never abort a user's command, so any failure degrades to "could
+        # not check" rather than propagating.
         logging.warning("Could not query installed skills via npx: %s", e)
-        return {}
+        return None
 
     for entry in entries:
         if not isinstance(entry, dict):
@@ -131,26 +176,16 @@ def get_installed_skills() -> list[dict] | None:
 
     Returns None if the query fails.
     """
-    import json
-
     try:
-        from google.agents.cli._runner import run_resolved
-
-        result = run_resolved(
-            ["npx", "-y", SKILLS_NPX_PACKAGE, "list", "--json"],
-            capture_output=True,
-            text=True,
-            timeout=15,
-        )
-        if result.returncode != 0:
-            logging.warning(
-                "npx skills list failed (exit %d): %s",
-                result.returncode,
-                result.stderr.strip(),
-            )
-            return None
-        skills = json.loads(result.stdout)
+        skills = list_skills_all_scopes()
         return [s for s in skills if s.get("name", "").startswith("google-agents-cli-")]
+    except subprocess.CalledProcessError as e:
+        logging.warning(
+            "npx skills list failed (exit %d): %s",
+            e.returncode,
+            (e.stderr or "").strip(),
+        )
+        return None
     except Exception as e:
         logging.warning("Could not query installed skills: %s", e)
         return None
@@ -230,13 +265,16 @@ def check_skills_version() -> None:
         return
 
     installed = _find_installed_skills()
+    if installed is None:
+        # The query failed: don't record the stamp, so the next command retries.
+        return
+
+    _record_skills_check()
     if not installed:
         return
 
     from google.agents.cli import __version__
 
-    _record_skills_check()
-
     mismatched = {name: ver for name, ver in installed.items() if ver != __version__}
     if not mismatched:
         return

{google_agents_cli-1.11.0 → google_agents_cli-1.12.0}/src/google/agents/cli/data/_recipe.py

@@ -14,16 +14,16 @@
 
 """Shared redirect message for the removed RAG datastore/ingestion commands."""
 
-# RAG moved out of the built-in templates into clone-and-study samples. Datastore
-# provisioning and data ingestion now live in each sample's own Makefile, so these
-# CLI commands are tombstoned with an actionable pointer to the samples.
+# RAG moved out of the built-in templates into clone-and-study recipes. Datastore
+# provisioning and data ingestion now live in each recipe's own Makefile, so these
+# CLI commands are tombstoned with an actionable pointer to the recipes.
 RAG_RECIPE_MESSAGE = (
     "RAG is now a clone-and-study recipe — this command has been removed.\n\n"
-    "Datastore provisioning and data ingestion live in each sample's own Makefile\n"
+    "Datastore provisioning and data ingestion live in each recipe's own Makefile\n"
     "(e.g. `make setup-infra`, `make data-ingestion`). Start from one of:\n"
     "  - rag-vector-search  Vector Search in Gemini platform + KFP ingestion pipeline\n"
     "  - rag-agent-search   Search in Gemini platform + managed GCS data connector\n"
-    "under core/ in https://github.com/google/adk-samples\n\n"
-    "See the agents-cli workflow skill (Phase 1: Study Reference Samples) for the\n"
+    "under core/ in https://github.com/google/adk-recipes\n\n"
+    "See the agents-cli workflow skill (Phase 1: Study Reference Recipes) for the\n"
     "clone-and-study steps."
 )

google_agents_cli-1.12.0/src/google/agents/cli/deploy/_agent_identity.py

@@ -0,0 +1,51 @@
+# 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.
+
+"""Agent Identity role grants."""
+
+from __future__ import annotations
+
+import click
+from google.cloud import resourcemanager_v3
+from google.iam.v1 import iam_policy_pb2, policy_pb2
+
+AGENT_IDENTITY_ROLES = (
+    "roles/aiplatform.user",
+    "roles/serviceusage.serviceUsageConsumer",
+    "roles/browser",
+    "roles/cloudapiregistry.viewer",
+    "roles/logging.logWriter",
+    "roles/monitoring.metricWriter",
+)
+
+
+def grant_roles_to_principal(project: str, principal: str) -> None:
+    """Grant `AGENT_IDENTITY_ROLES` to `principal` on `project`.
+
+    `principal` is a full IAM member string, e.g.
+    `principal://agents.global.org-123.system.id.goog/resources/...`.
+    """
+    click.echo(f"🔐 Granting IAM roles to: {principal}")
+    proj_client = resourcemanager_v3.ProjectsClient()
+    policy = proj_client.get_iam_policy(
+        request=iam_policy_pb2.GetIamPolicyRequest(resource=f"projects/{project}")
+    )
+    for role in AGENT_IDENTITY_ROLES:
+        policy.bindings.append(policy_pb2.Binding(role=role, members=[principal]))
+    proj_client.set_iam_policy(
+        request=iam_policy_pb2.SetIamPolicyRequest(
+            resource=f"projects/{project}", policy=policy
+        )
+    )
+    click.echo("  ✅ Agent identity ready")