agent-starter-pack 0.18.1__py3-none-any.whl → 0.19.0__py3-none-any.whl

agent_starter_pack/agents/adk_a2a_base/tests/integration/test_agent.py

@@ -0,0 +1,58 @@
+# Copyright 2025 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
+#
+#     http://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.
+
+# mypy: disable-error-code="union-attr"
+from google.adk.agents.run_config import RunConfig, StreamingMode
+from google.adk.runners import Runner
+from google.adk.sessions import InMemorySessionService
+from google.genai import types
+
+from {{cookiecutter.agent_directory}}.agent import root_agent
+
+
+def test_agent_stream() -> None:
+    """
+    Integration test for the agent stream functionality.
+    Tests that the agent returns valid streaming responses.
+    """
+
+    session_service = InMemorySessionService()
+
+    session = session_service.create_session_sync(user_id="test_user", app_name="test")
+    runner = Runner(agent=root_agent, session_service=session_service, app_name="test")
+
+    message = types.Content(
+        role="user", parts=[types.Part.from_text(text="Why is the sky blue?")]
+    )
+
+    events = list(
+        runner.run(
+            new_message=message,
+            user_id="test_user",
+            session_id=session.id,
+            run_config=RunConfig(streaming_mode=StreamingMode.SSE),
+        )
+    )
+    assert len(events) > 0, "Expected at least one message"
+
+    has_text_content = False
+    for event in events:
+        if (
+            event.content
+            and event.content.parts
+            and any(part.text for part in event.content.parts)
+        ):
+            has_text_content = True
+            break
+    assert has_text_content, "Expected at least one message with text content"

agent_starter_pack/base_template/.gitignore

@@ -189,7 +189,7 @@ Thumbs.db
 .persist_vector_store
 tests/load_test/.results/*.html
 tests/load_test/.results/*.csv
-locust_env
+.locust_env
 my_env.tfvars
 .streamlit_chats
 .saved_chats

agent_starter_pack/base_template/Makefile

@@ -161,6 +161,9 @@ playground-dev:
 deploy:
 {%- if cookiecutter.deployment_target == 'cloud_run' %}
 	PROJECT_ID=$$(gcloud config get-value project) && \
+{%- if cookiecutter.is_adk_a2a %}
+	PROJECT_NUMBER=$$(gcloud projects describe $$PROJECT_ID --format="value(projectNumber)") && \
+{%- endif %}
 	gcloud beta run deploy {{cookiecutter.project_name}} \
 		--source . \
 		--memory "4Gi" \
@@ -169,14 +172,16 @@ deploy:
 		--no-allow-unauthenticated \
 		--no-cpu-throttling \
 		--labels "{% if cookiecutter.is_adk %}created-by=adk{% if cookiecutter.agent_garden %},{% endif %}{% endif %}{% if cookiecutter.agent_garden %}deployed-with=agent-garden{% if cookiecutter.agent_sample_id %},vertex-agent-sample-id={{cookiecutter.agent_sample_id}},vertex-agent-sample-publisher={{cookiecutter.agent_sample_publisher}}{% endif %}{% endif %}" \
+		--update-build-env-vars "AGENT_VERSION=$(shell awk -F'"' '/^version = / {print $$2}' pyproject.toml || echo '0.0.0')" \
 		--set-env-vars \
-		"COMMIT_SHA=$(shell git rev-parse HEAD){%- if cookiecutter.data_ingestion %}{%- if cookiecutter.datastore_type == "vertex_ai_search" %},DATA_STORE_ID={{cookiecutter.project_name}}-datastore,DATA_STORE_REGION=us{%- elif cookiecutter.datastore_type == "vertex_ai_vector_search" %},VECTOR_SEARCH_INDEX={{cookiecutter.project_name}}-vector-search,VECTOR_SEARCH_INDEX_ENDPOINT={{cookiecutter.project_name}}-vector-search-endpoint,VECTOR_SEARCH_BUCKET=$$PROJECT_ID-{{cookiecutter.project_name}}-vs{%- endif %}{%- endif %}" \
+		"COMMIT_SHA=$(shell git rev-parse HEAD){%- if cookiecutter.is_adk_a2a %},APP_URL=https://{{cookiecutter.project_name}}-$$PROJECT_NUMBER.us-central1.run.app{%- endif %}{%- if cookiecutter.data_ingestion %}{%- if cookiecutter.datastore_type == "vertex_ai_search" %},DATA_STORE_ID={{cookiecutter.project_name}}-datastore,DATA_STORE_REGION=us{%- elif cookiecutter.datastore_type == "vertex_ai_vector_search" %},VECTOR_SEARCH_INDEX={{cookiecutter.project_name}}-vector-search,VECTOR_SEARCH_INDEX_ENDPOINT={{cookiecutter.project_name}}-vector-search-endpoint,VECTOR_SEARCH_BUCKET=$$PROJECT_ID-{{cookiecutter.project_name}}-vs{%- endif %}{%- endif %}" \
 		$(if $(IAP),--iap) \
 		$(if $(PORT),--port=$(PORT))
 {%- elif cookiecutter.deployment_target == 'agent_engine' %}
 	# Export dependencies to requirements file using uv export.
-	uv export --no-hashes --no-header --no-dev --no-emit-project --no-annotate > .requirements.txt 2>/dev/null || \
-	uv export --no-hashes --no-header --no-dev --no-emit-project > .requirements.txt && uv run {{cookiecutter.agent_directory}}/agent_engine_app.py
+	(uv export --no-hashes --no-header --no-dev --no-emit-project --no-annotate > .requirements.txt 2>/dev/null || \
+	uv export --no-hashes --no-header --no-dev --no-emit-project > .requirements.txt) && \
+	uv run -m {{cookiecutter.agent_directory}}.agent_engine_app
 {%- endif %}
 
 # Alias for 'make deploy' for backward compatibility
@@ -238,13 +243,8 @@ lint:
 # ==============================================================================
 
 # Register the deployed agent to Gemini Enterprise
-# Usage: make register-gemini-enterprise GEMINI_ENTERPRISE_APP_ID=projects/{project_number}/locations/{location}/collections/{collection}/engines/{engine_id} [AGENT_ENGINE_ID=<id>]  # Defaults to deployment_metadata.json
+# Usage: ID="projects/.../engines/xxx" make register-gemini-enterprise
+# Optional env vars: GEMINI_DISPLAY_NAME, GEMINI_DESCRIPTION, GEMINI_TOOL_DESCRIPTION, AGENT_ENGINE_ID
 register-gemini-enterprise:
-	uvx --from agent-starter-pack agent-starter-pack-register-gemini-enterprise \
-		$(if $(GEMINI_ENTERPRISE_APP_ID),--gemini-enterprise-app-id="$(GEMINI_ENTERPRISE_APP_ID)",) \
-		$(if $(AGENT_ENGINE_ID),--agent-engine-id="$(AGENT_ENGINE_ID)",) \
-		$(if $(GEMINI_DISPLAY_NAME),--display-name="$(GEMINI_DISPLAY_NAME)",) \
-		$(if $(GEMINI_DESCRIPTION),--description="$(GEMINI_DESCRIPTION)",) \
-		$(if $(GEMINI_TOOL_DESCRIPTION),--tool-description="$(GEMINI_TOOL_DESCRIPTION)",) \
-		$(if $(GEMINI_AUTHORIZATION_ID),--authorization-id="$(GEMINI_AUTHORIZATION_ID)",)
+	uvx --from agent-starter-pack agent-starter-pack-register-gemini-enterprise
 {%- endif %}

agent_starter_pack/base_template/README.md

@@ -72,7 +72,7 @@ make install && make playground
 | `make build-frontend` | Build the frontend for production |
 {%- endif %}
 {%- if cookiecutter.is_adk %}
-| `make register-gemini-enterprise` | Register deployed agent to Gemini Enterprise (see Makefile for parameters) |
+| `make register-gemini-enterprise` | Register deployed agent to Gemini Enterprise ([docs](https://googlecloudplatform.github.io/agent-starter-pack/cli/register_gemini_enterprise.html)) |
 {%- endif %}
 {%- endif %}
 | `make test`          | Run unit and integration tests                                                              |

agent_starter_pack/base_template/{% if cookiecutter.cicd_runner == 'github_actions' %}.github{% else %}unused_github{% endif %}/workflows/deploy-to-prod.yaml

@@ -69,6 +69,14 @@ jobs:
         run: |
           pip install uv==0.8.13
           uv sync --locked
+{%- if cookiecutter.is_adk_a2a %}
+
+      - name: Extract version from pyproject.toml
+        id: extract-version
+        run: |
+          VERSION=$(awk -F'"' '/^version = / {print $2}' pyproject.toml || echo '0.0.0')
+          echo "version=${VERSION}" >> $GITHUB_OUTPUT
+{%- endif %}
 {%- endif %}
 
 {%- if cookiecutter.data_ingestion %}
@@ -108,10 +116,10 @@ jobs:
       - name: Deploy to Production (Agent Engine)
         run: |
           uv export --no-hashes --no-sources --no-header --no-dev --no-emit-project --no-annotate --locked > .requirements.txt
-          uv run {{cookiecutter.agent_directory}}/agent_engine_app.py \
+          uv run -m {{cookiecutter.agent_directory}}.agent_engine_app \
             --project {% raw %}${{ vars.PROD_PROJECT_ID }}{% endraw %} \
             --location {% raw %}${{ vars.REGION }}{% endraw %} \
             --artifacts-bucket-name {% raw %}${{ vars.LOGS_BUCKET_NAME_PROD }}{% endraw %} \
-            --set-env-vars="COMMIT_SHA={% raw %}${{ github.sha }}{% endraw %}{%- if cookiecutter.data_ingestion %}{%- if cookiecutter.datastore_type == "vertex_ai_search" %},DATA_STORE_ID={% raw %}${{ vars.DATA_STORE_ID_PROD }}{% endraw %},DATA_STORE_REGION={% raw %}${{ vars.DATA_STORE_REGION }}{% endraw %}{%- elif cookiecutter.datastore_type == "vertex_ai_vector_search" %},VECTOR_SEARCH_INDEX={% raw %}${{ vars.VECTOR_SEARCH_INDEX_PROD }}{% endraw %},VECTOR_SEARCH_INDEX_ENDPOINT={% raw %}${{ vars.VECTOR_SEARCH_INDEX_ENDPOINT_PROD }}{% endraw %},VECTOR_SEARCH_BUCKET={% raw %}${{ vars.VECTOR_SEARCH_BUCKET_PROD }}{% endraw %}{%- endif %}{%- endif %}"
+            --set-env-vars="COMMIT_SHA={% raw %}${{ github.sha }}{% endraw %}{%- if cookiecutter.is_adk_a2a %},AGENT_VERSION={% raw %}${{ steps.extract-version.outputs.version }}{% endraw %}{%- endif %}{%- if cookiecutter.data_ingestion %}{%- if cookiecutter.datastore_type == "vertex_ai_search" %},DATA_STORE_ID={% raw %}${{ vars.DATA_STORE_ID_PROD }}{% endraw %},DATA_STORE_REGION={% raw %}${{ vars.DATA_STORE_REGION }}{% endraw %}{%- elif cookiecutter.datastore_type == "vertex_ai_vector_search" %},VECTOR_SEARCH_INDEX={% raw %}${{ vars.VECTOR_SEARCH_INDEX_PROD }}{% endraw %},VECTOR_SEARCH_INDEX_ENDPOINT={% raw %}${{ vars.VECTOR_SEARCH_INDEX_ENDPOINT_PROD }}{% endraw %},VECTOR_SEARCH_BUCKET={% raw %}${{ vars.VECTOR_SEARCH_BUCKET_PROD }}{% endraw %}{%- endif %}{%- endif %}"
 {%- endif %}
 

agent_starter_pack/base_template/{% if cookiecutter.cicd_runner == 'github_actions' %}.github{% else %}unused_github{% endif %}/workflows/staging.yaml

@@ -81,11 +81,23 @@ jobs:
       - name: Configure Docker for Artifact Registry
         run: |
           gcloud auth configure-docker {% raw %}${{ vars.REGION }}{% endraw %}-docker.pkg.dev --quiet
-          
+{%- if cookiecutter.is_adk_a2a %}
+
+      - name: Extract version from pyproject.toml
+        id: extract-version
+        run: |
+          VERSION=$(awk -F'"' '/^version = / {print $2}' pyproject.toml || echo '0.0.0')
+          echo "version=${VERSION}" >> $GITHUB_OUTPUT
+{%- endif %}
+
       - name: Build and Push Docker Image
         run: |
           docker build -t {% raw %}${{ vars.REGION }}{% endraw %}-docker.pkg.dev/{% raw %}${{ vars.CICD_PROJECT_ID }}{% endraw %}/{% raw %}${{ vars.ARTIFACT_REGISTRY_REPO_NAME }}{% endraw %}/{% raw %}${{ vars.CONTAINER_NAME }}{% endraw %} \
-            --build-arg COMMIT_SHA={% raw %}${{ github.sha }}{% endraw %} .
+            --build-arg COMMIT_SHA={% raw %}${{ github.sha }}{% endraw %} \
+{%- if cookiecutter.is_adk_a2a %}
+            --build-arg AGENT_VERSION={% raw %}${{ steps.extract-version.outputs.version }}{% endraw %} \
+{%- endif %}
+            .
           docker push {% raw %}${{ vars.REGION }}{% endraw %}-docker.pkg.dev/{% raw %}${{ vars.CICD_PROJECT_ID }}{% endraw %}/{% raw %}${{ vars.ARTIFACT_REGISTRY_REPO_NAME }}{% endraw %}/{% raw %}${{ vars.CONTAINER_NAME }}{% endraw %}
 
       - name: Deploy to Staging (Cloud Run)
@@ -115,15 +127,24 @@ jobs:
         run: |
           pip install uv==0.8.13
           uv sync --locked
+{%- if cookiecutter.is_adk_a2a %}
+
+      - name: Extract version from pyproject.toml
+        id: extract-version
+        run: |
+          VERSION=$(awk -F'"' '/^version = / {print $2}' pyproject.toml || echo '0.0.0')
+          echo "version=${VERSION}" >> $GITHUB_OUTPUT
+          echo "Extracted version: ${VERSION}"
+{%- endif %}
 
       - name: Deploy to Staging (Agent Engine)
         run: |
           uv export --no-hashes --no-sources --no-header --no-dev --no-emit-project --no-annotate --locked > .requirements.txt
-          uv run {{cookiecutter.agent_directory}}/agent_engine_app.py \
+          uv run -m {{cookiecutter.agent_directory}}.agent_engine_app \
             --project {% raw %}${{ vars.STAGING_PROJECT_ID }}{% endraw %} \
             --location {% raw %}${{ vars.REGION }}{% endraw %} \
             --artifacts-bucket-name {% raw %}${{ vars.LOGS_BUCKET_NAME_STAGING }}{% endraw %} \
-            --set-env-vars="COMMIT_SHA={% raw %}${{ github.sha }}{% endraw %}{%- if cookiecutter.data_ingestion %}{%- if cookiecutter.datastore_type == "vertex_ai_search" %},DATA_STORE_ID={% raw %}${{ vars.DATA_STORE_ID_STAGING }}{% endraw %},DATA_STORE_REGION={% raw %}${{ vars.DATA_STORE_REGION }}{% endraw %}{%- elif cookiecutter.datastore_type == "vertex_ai_vector_search" %},VECTOR_SEARCH_INDEX={% raw %}${{ vars.VECTOR_SEARCH_INDEX_STAGING }}{% endraw %},VECTOR_SEARCH_INDEX_ENDPOINT={% raw %}${{ vars.VECTOR_SEARCH_INDEX_ENDPOINT_STAGING }}{% endraw %},VECTOR_SEARCH_BUCKET={% raw %}${{ vars.VECTOR_SEARCH_BUCKET_STAGING }}{% endraw %}{%- endif %}{%- endif %}"
+            --set-env-vars="COMMIT_SHA={% raw %}${{ github.sha }}{% endraw %}{%- if cookiecutter.is_adk_a2a %},AGENT_VERSION={% raw %}${{ steps.extract-version.outputs.version }}{% endraw %}{%- endif %}{%- if cookiecutter.data_ingestion %}{%- if cookiecutter.datastore_type == "vertex_ai_search" %},DATA_STORE_ID={% raw %}${{ vars.DATA_STORE_ID_STAGING }}{% endraw %},DATA_STORE_REGION={% raw %}${{ vars.DATA_STORE_REGION }}{% endraw %}{%- elif cookiecutter.datastore_type == "vertex_ai_vector_search" %},VECTOR_SEARCH_INDEX={% raw %}${{ vars.VECTOR_SEARCH_INDEX_STAGING }}{% endraw %},VECTOR_SEARCH_INDEX_ENDPOINT={% raw %}${{ vars.VECTOR_SEARCH_INDEX_ENDPOINT_STAGING }}{% endraw %},VECTOR_SEARCH_BUCKET={% raw %}${{ vars.VECTOR_SEARCH_BUCKET_STAGING }}{% endraw %}{%- endif %}{%- endif %}"
 
       - name: Fetch Auth Token
         id: fetch-token
@@ -174,7 +195,7 @@ jobs:
 {%- elif cookiecutter.deployment_target == 'cloud_run' %}
           export _ID_TOKEN="{% raw %}${{ steps.fetch-token.outputs._id_token }}{% endraw %}"
           export _STAGING_URL="{% raw %}${{ steps.fetch-url.outputs._staging_url }}{% endraw %}"
-          pip install locust==2.31.1
+          pip install locust==2.31.1{%- if cookiecutter.is_adk_a2a %} a2a-sdk~=0.3.9{%- endif %}
           locust -f tests/load_test/load_test.py \
           --headless \
           -H ${_STAGING_URL} \

agent_starter_pack/base_template/{% if cookiecutter.cicd_runner == 'google_cloud_build' %}.cloudbuild{% else %}unused_.cloudbuild{% endif %}/deploy-to-prod.yaml

@@ -42,7 +42,7 @@ steps:
 {%- endif %}
 {%- if cookiecutter.deployment_target == 'cloud_run' %}
    
-  - name: "gcr.io/cloud-builders/gcloud"
+  - name: "gcr.io/cloud-builders/gcloud-slim"
     id: trigger-deployment
     entrypoint: gcloud
     args:
@@ -57,6 +57,18 @@ steps:
       - $_PROD_PROJECT_ID
 
 {%- elif cookiecutter.deployment_target == 'agent_engine' %}
+{%- if cookiecutter.is_adk_a2a %}
+  # Extract version from pyproject.toml
+  - name: "gcr.io/cloud-builders/gcloud-slim"
+    id: extract-version
+    entrypoint: /bin/bash
+    args:
+      - "-c"
+      - |
+        VERSION=$(awk -F'"' '/^version = / {print $$2}' pyproject.toml || echo '0.0.0')
+        echo "$${VERSION}" > /workspace/agent_version.txt
+
+{%- endif %}
   - name: "python:3.12-slim"
     id: install-dependencies
     entrypoint: /bin/bash
@@ -73,12 +85,15 @@ steps:
     args:
       - "-c"
       - |
+{%- if cookiecutter.is_adk_a2a %}
+        AGENT_VERSION=$(cat /workspace/agent_version.txt || echo '0.0.0')
+{%- endif %}
         uv export --no-hashes --no-sources --no-header --no-dev --no-emit-project --no-annotate --locked > .requirements.txt
-        uv run {{cookiecutter.agent_directory}}/agent_engine_app.py \
+        uv run -m {{cookiecutter.agent_directory}}.agent_engine_app \
           --project ${_PROD_PROJECT_ID} \
           --location ${_REGION} \
           --artifacts-bucket-name ${_LOGS_BUCKET_NAME_PROD} \
-          --set-env-vars="COMMIT_SHA=${COMMIT_SHA}{%- if cookiecutter.data_ingestion %}{%- if cookiecutter.datastore_type == "vertex_ai_search" %},DATA_STORE_ID=${_DATA_STORE_ID_PROD},DATA_STORE_REGION=${_DATA_STORE_REGION}{%- elif cookiecutter.datastore_type == "vertex_ai_vector_search" %},VECTOR_SEARCH_INDEX=${_VECTOR_SEARCH_INDEX_PROD},VECTOR_SEARCH_INDEX_ENDPOINT=${_VECTOR_SEARCH_INDEX_ENDPOINT_PROD},VECTOR_SEARCH_BUCKET=${_VECTOR_SEARCH_BUCKET_PROD}{%- endif %}{%- endif %}"
+          --set-env-vars="COMMIT_SHA=${COMMIT_SHA}{%- if cookiecutter.is_adk_a2a %},AGENT_VERSION=$${AGENT_VERSION}{%- endif %}{%- if cookiecutter.data_ingestion %}{%- if cookiecutter.datastore_type == "vertex_ai_search" %},DATA_STORE_ID=${_DATA_STORE_ID_PROD},DATA_STORE_REGION=${_DATA_STORE_REGION}{%- elif cookiecutter.datastore_type == "vertex_ai_vector_search" %},VECTOR_SEARCH_INDEX=${_VECTOR_SEARCH_INDEX_PROD},VECTOR_SEARCH_INDEX_ENDPOINT=${_VECTOR_SEARCH_INDEX_ENDPOINT_PROD},VECTOR_SEARCH_BUCKET=${_VECTOR_SEARCH_BUCKET_PROD}{%- endif %}{%- endif %}"
     env:
       - 'PATH=/usr/local/bin:/usr/bin:~/.local/bin'
 {%- endif %}

agent_starter_pack/base_template/{% if cookiecutter.cicd_runner == 'google_cloud_build' %}.cloudbuild{% else %}unused_.cloudbuild{% endif %}/staging.yaml

@@ -39,6 +39,18 @@ steps:
       - 'PATH=/usr/local/bin:/usr/bin:~/.local/bin'
 {%- endif %}
 {%- if cookiecutter.deployment_target == 'cloud_run' %}
+{%- if cookiecutter.is_adk_a2a %}
+  # Extract version from pyproject.toml
+  - name: "gcr.io/cloud-builders/gcloud-slim"
+    id: extract-version
+    entrypoint: /bin/bash
+    args:
+      - "-c"
+      - |
+        VERSION=$(awk -F'"' '/^version = / {print $$2}' pyproject.toml || echo '0.0.0')
+        echo "$${VERSION}" > /workspace/agent_version.txt
+
+{%- endif %}
   # Build and Push
   - name: "gcr.io/cloud-builders/docker"
     args:
@@ -48,6 +60,10 @@ steps:
         "$_REGION-docker.pkg.dev/$PROJECT_ID/$_ARTIFACT_REGISTRY_REPO_NAME/$_CONTAINER_NAME",
         "--build-arg",
         "COMMIT_SHA=$COMMIT_SHA",
+{%- if cookiecutter.is_adk_a2a %}
+        "--build-arg",
+        "AGENT_VERSION=$(cat /workspace/agent_version.txt || echo '0.0.0')",
+{%- endif %}
         ".",
       ]
   - name: "gcr.io/cloud-builders/docker"
@@ -91,6 +107,18 @@ steps:
       - |
         echo $(gcloud auth print-identity-token -q) > id_token.txt
 {%- elif cookiecutter.deployment_target == 'agent_engine' %}
+{%- if cookiecutter.is_adk_a2a %}
+  # Extract version from pyproject.toml
+  - name: "gcr.io/cloud-builders/gcloud-slim"
+    id: extract-version
+    entrypoint: /bin/bash
+    args:
+      - "-c"
+      - |
+        VERSION=$(awk -F'"' '/^version = / {print $$2}' pyproject.toml || echo '0.0.0')
+        echo "$${VERSION}" > /workspace/agent_version.txt
+
+{%- endif %}
   - name: "python:3.12-slim"
     id: install-dependencies
     entrypoint: /bin/bash
@@ -107,12 +135,15 @@ steps:
     args:
       - "-c"
       - |
+{%- if cookiecutter.is_adk_a2a %}
+        AGENT_VERSION=$(cat /workspace/agent_version.txt || echo '0.0.0')
+{%- endif %}
         uv export --no-hashes --no-sources --no-header --no-dev --no-emit-project --no-annotate --locked > .requirements.txt
-        uv run {{cookiecutter.agent_directory}}/agent_engine_app.py \
+        uv run -m {{cookiecutter.agent_directory}}.agent_engine_app \
           --project ${_STAGING_PROJECT_ID} \
           --location ${_REGION} \
           --artifacts-bucket-name ${_LOGS_BUCKET_NAME_STAGING} \
-          --set-env-vars="COMMIT_SHA=${COMMIT_SHA}{%- if cookiecutter.data_ingestion %}{%- if cookiecutter.datastore_type == "vertex_ai_search" %},DATA_STORE_ID=${_DATA_STORE_ID_STAGING},DATA_STORE_REGION=${_DATA_STORE_REGION}{%- elif cookiecutter.datastore_type == "vertex_ai_vector_search" %},VECTOR_SEARCH_INDEX=${_VECTOR_SEARCH_INDEX_STAGING},VECTOR_SEARCH_INDEX_ENDPOINT=${_VECTOR_SEARCH_INDEX_ENDPOINT_STAGING},VECTOR_SEARCH_BUCKET=${_VECTOR_SEARCH_BUCKET_STAGING}{%- endif %}{%- endif %}"
+          --set-env-vars="COMMIT_SHA=${COMMIT_SHA}{%- if cookiecutter.is_adk_a2a %},AGENT_VERSION=$${AGENT_VERSION}{%- endif %}{%- if cookiecutter.data_ingestion %}{%- if cookiecutter.datastore_type == "vertex_ai_search" %},DATA_STORE_ID=${_DATA_STORE_ID_STAGING},DATA_STORE_REGION=${_DATA_STORE_REGION}{%- elif cookiecutter.datastore_type == "vertex_ai_vector_search" %},VECTOR_SEARCH_INDEX=${_VECTOR_SEARCH_INDEX_STAGING},VECTOR_SEARCH_INDEX_ENDPOINT=${_VECTOR_SEARCH_INDEX_ENDPOINT_STAGING},VECTOR_SEARCH_BUCKET=${_VECTOR_SEARCH_BUCKET_STAGING}{%- endif %}{%- endif %}"
     env:
       - 'PATH=/usr/local/bin:/usr/bin:~/.local/bin'
 
@@ -175,7 +206,7 @@ steps:
       - |
         export _ID_TOKEN=$(cat id_token.txt)
         export _STAGING_URL=$(cat staging_url.txt)
-        pip install locust==2.31.1 --user
+        pip install locust==2.31.1{%- if cookiecutter.is_adk_a2a %} a2a-sdk~=0.3.9{%- endif %} --user
         locust -f tests/load_test/load_test.py \
         --headless \
         -H $$_STAGING_URL \

agent_starter_pack/cli/utils/cicd.py

@@ -103,9 +103,10 @@ def create_github_connection(
     """
     console.print("\n🔗 Creating GitHub connection...")
 
-    # First, ensure Cloud Build API is enabled
-    console.print("🔧 Ensuring Cloud Build API is enabled...")
+    # First, ensure required APIs are enabled
+    console.print("🔧 Ensuring required APIs are enabled...")
     try:
+        # Enable Cloud Build API
         run_command(
             [
                 "gcloud",
@@ -120,13 +121,28 @@ def create_github_connection(
         )
         console.print("✅ Cloud Build API enabled")
 
-        # Wait for the API to fully initialize and create the service account
+        # Enable Secret Manager API
+        run_command(
+            [
+                "gcloud",
+                "services",
+                "enable",
+                "secretmanager.googleapis.com",
+                "--project",
+                project_id,
+            ],
+            capture_output=True,
+            check=False,  # Don't fail if already enabled
+        )
+        console.print("✅ Secret Manager API enabled")
+
+        # Wait for the APIs to fully initialize and create the service account
         console.print(
             "⏳ Waiting for Cloud Build service account to be created (this typically takes 5-10 seconds)..."
         )
         time.sleep(10)
     except subprocess.CalledProcessError as e:
-        console.print(f"⚠️ Could not enable Cloud Build API: {e}", style="yellow")
+        console.print(f"⚠️ Could not enable required APIs: {e}", style="yellow")
 
     # Get the Cloud Build service account and grant permissions with retry logic
     try:

agent_starter_pack/cli/utils/register_gemini_enterprise.py

@@ -15,12 +15,12 @@
 
 """Utility to register an Agent Engine to Gemini Enterprise."""
 
-import argparse
 import json
 import os
 import sys
 from pathlib import Path
 
+import click
 import requests
 import vertexai
 from google.auth import default
@@ -53,7 +53,7 @@ def get_agent_engine_id(
             "Please provide --agent-engine-id or deploy your agent first."
         )
 
-    with open(metadata_path) as f:
+    with open(metadata_path, encoding="utf-8") as f:
         metadata = json.load(f)
         return metadata["remote_agent_engine_id"]
 
@@ -302,104 +302,99 @@ def register_agent(
         raise
 
 
-def main() -> None:
-    """Main entry point for CLI."""
-    parser = argparse.ArgumentParser(
-        description="Register an Agent Engine to Gemini Enterprise"
-    )
-    parser.add_argument(
-        "--agent-engine-id",
-        help="Agent Engine resource name (e.g., projects/.../reasoningEngines/...). "
-        "If not provided, reads from deployment_metadata.json",
-    )
-    parser.add_argument(
-        "--metadata-file",
-        default="deployment_metadata.json",
-        help="Path to deployment metadata file (default: deployment_metadata.json)",
-    )
-    parser.add_argument(
-        "--gemini-enterprise-app-id",
-        help="Gemini Enterprise app full resource name "
-        "(e.g., projects/{project_number}/locations/{location}/collections/{collection}/engines/{engine_id}). "
-        "Can also be set via GEMINI_ENTERPRISE_APP_ID env var",
-    )
-    parser.add_argument(
-        "--display-name",
-        help="Display name for the agent. Can also be set via GEMINI_DISPLAY_NAME env var",
-    )
-    parser.add_argument(
-        "--description",
-        help="Description of the agent. Can also be set via GEMINI_DESCRIPTION env var",
-    )
-    parser.add_argument(
-        "--tool-description",
-        help="Description of what the tool does. Can also be set via GEMINI_TOOL_DESCRIPTION env var",
-    )
-    parser.add_argument(
-        "--project-id",
-        help="GCP project ID (extracted from agent-engine-id if not provided). "
-        "Can also be set via GOOGLE_CLOUD_PROJECT env var",
-    )
-    parser.add_argument(
-        "--authorization-id",
-        help="OAuth authorization resource name "
-        "(e.g., projects/{project_number}/locations/global/authorizations/{auth_id}). "
-        "Can also be set via GEMINI_AUTHORIZATION_ID env var",
-    )
-
-    args = parser.parse_args()
-
+@click.command()
+@click.option(
+    "--agent-engine-id",
+    envvar="AGENT_ENGINE_ID",
+    help="Agent Engine resource name (e.g., projects/.../reasoningEngines/...). "
+    "If not provided, reads from deployment_metadata.json.",
+)
+@click.option(
+    "--metadata-file",
+    default="deployment_metadata.json",
+    help="Path to deployment metadata file (default: deployment_metadata.json).",
+)
+@click.option(
+    "--gemini-enterprise-app-id",
+    help="Gemini Enterprise app full resource name "
+    "(e.g., projects/{project_number}/locations/{location}/collections/{collection}/engines/{engine_id}). "
+    "Can also be set via ID or GEMINI_ENTERPRISE_APP_ID env var.",
+)
+@click.option(
+    "--display-name",
+    envvar="GEMINI_DISPLAY_NAME",
+    help="Display name for the agent.",
+)
+@click.option(
+    "--description",
+    envvar="GEMINI_DESCRIPTION",
+    help="Description of the agent.",
+)
+@click.option(
+    "--tool-description",
+    envvar="GEMINI_TOOL_DESCRIPTION",
+    help="Description of what the tool does.",
+)
+@click.option(
+    "--project-id",
+    envvar="GOOGLE_CLOUD_PROJECT",
+    help="GCP project ID (extracted from agent-engine-id if not provided).",
+)
+@click.option(
+    "--authorization-id",
+    envvar="GEMINI_AUTHORIZATION_ID",
+    help="OAuth authorization resource name "
+    "(e.g., projects/{project_number}/locations/global/authorizations/{auth_id}).",
+)
+def main(
+    agent_engine_id: str | None,
+    metadata_file: str,
+    gemini_enterprise_app_id: str | None,
+    display_name: str | None,
+    description: str | None,
+    tool_description: str | None,
+    project_id: str | None,
+    authorization_id: str | None,
+) -> None:
+    """Register an Agent Engine to Gemini Enterprise."""
     # Get agent engine ID
     try:
-        agent_engine_id = get_agent_engine_id(args.agent_engine_id, args.metadata_file)
+        resolved_agent_engine_id = get_agent_engine_id(agent_engine_id, metadata_file)
     except ValueError as e:
-        print(f"Error: {e}", file=sys.stderr)
-        sys.exit(1)
+        raise click.ClickException(str(e)) from e
 
     # Auto-detect display_name and description from Agent Engine
-    auto_display_name, auto_description = get_agent_engine_metadata(agent_engine_id)
+    auto_display_name, auto_description = get_agent_engine_metadata(
+        resolved_agent_engine_id
+    )
 
-    gemini_enterprise_app_id = args.gemini_enterprise_app_id or os.getenv(
-        "GEMINI_ENTERPRISE_APP_ID"
+    # Handle gemini_enterprise_app_id with fallback to ID env var
+    resolved_gemini_enterprise_app_id = (
+        gemini_enterprise_app_id
+        or os.getenv("ID")
+        or os.getenv("GEMINI_ENTERPRISE_APP_ID")
     )
-    if not gemini_enterprise_app_id:
-        print(
-            "Error: --gemini-enterprise-app-id or GEMINI_ENTERPRISE_APP_ID env var required",
-            file=sys.stderr,
+    if not resolved_gemini_enterprise_app_id:
+        raise click.ClickException(
+            "Error: --gemini-enterprise-app-id or ID/GEMINI_ENTERPRISE_APP_ID env var required"
         )
-        sys.exit(1)
 
-    display_name = (
-        args.display_name
-        or os.getenv("GEMINI_DISPLAY_NAME")
-        or auto_display_name
-        or "My Agent"
-    )
-    description = (
-        args.description
-        or os.getenv("GEMINI_DESCRIPTION")
-        or auto_description
-        or "AI Agent"
-    )
-    tool_description = (
-        args.tool_description or os.getenv("GEMINI_TOOL_DESCRIPTION") or description
-    )
-    project_id = args.project_id or os.getenv("GOOGLE_CLOUD_PROJECT")
-    authorization_id = args.authorization_id or os.getenv("GEMINI_AUTHORIZATION_ID")
+    resolved_display_name = display_name or auto_display_name or "My Agent"
+    resolved_description = description or auto_description or "AI Agent"
+    resolved_tool_description = tool_description or resolved_description
 
     try:
         register_agent(
-            agent_engine_id=agent_engine_id,
-            gemini_enterprise_app_id=gemini_enterprise_app_id,
-            display_name=display_name,
-            description=description,
-            tool_description=tool_description,
+            agent_engine_id=resolved_agent_engine_id,
+            gemini_enterprise_app_id=resolved_gemini_enterprise_app_id,
+            display_name=resolved_display_name,
+            description=resolved_description,
+            tool_description=resolved_tool_description,
             project_id=project_id,
             authorization_id=authorization_id,
         )
     except Exception as e:
-        print(f"Error during registration: {e}", file=sys.stderr)
-        sys.exit(1)
+        raise click.ClickException(f"Error during registration: {e}") from e
 
 
 if __name__ == "__main__":

agent_starter_pack/cli/utils/template.py

@@ -112,6 +112,7 @@ def get_available_agents(deployment_target: str | None = None) -> dict:
     # Define priority agents that should appear first
     PRIORITY_AGENTS = [
         "adk_base",
+        "adk_a2a_base",
         "adk_live",
         "agentic_rag",
         "langgraph_base_react",
@@ -738,6 +739,7 @@ def process_template(
                 "tags": tags,
                 "is_adk": "adk" in tags,
                 "is_adk_live": "adk_live" in tags,
+                "is_adk_a2a": "a2a" in tags,
                 "deployment_target": deployment_target or "",
                 "cicd_runner": cicd_runner or "google_cloud_build",
                 "session_type": session_type or "",