agent-starter-pack 0.18.2__py3-none-any.whl → 0.21.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/agents/adk_base/app/__init__.py

@@ -12,6 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from .agent import root_agent
+from .agent import app
 
-__all__ = ["root_agent"]
+__all__ = ["app"]

agent_starter_pack/agents/adk_base/app/agent.py

@@ -18,6 +18,7 @@ from zoneinfo import ZoneInfo
 
 import google.auth
 from google.adk.agents import Agent
+from google.adk.apps.app import App
 
 _, project_id = google.auth.default()
 os.environ.setdefault("GOOGLE_CLOUD_PROJECT", project_id)
@@ -64,3 +65,5 @@ root_agent = Agent(
     instruction="You are a helpful AI assistant designed to provide accurate and useful information.",
     tools=[get_weather, get_current_time],
 )
+
+app = App(root_agent=root_agent, name="app")

agent_starter_pack/agents/adk_base/notebooks/adk_app_testing.ipynb

@@ -16,7 +16,9 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "## Install dependencies"
+    "## Set Up Your Environment\n",
+    "\n",
+    "> **Note:** For best results, use the same `.venv` created for local development with `uv` to ensure dependency compatibility and avoid environment-related issues."
    ]
   },
   {
@@ -25,7 +27,11 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "!pip install google-cloud-aiplatform --upgrade"
+    "# Uncomment the following lines if you're not using the virtual environment created by uv\n",
+    "# import sys\n",
+    "\n",
+    "# sys.path.append(\"../\")\n",
+    "# !pip install google-cloud-aiplatform a2a-sdk --upgrade"
    ]
   },
   {
@@ -123,16 +129,7 @@
    "execution_count": null,
    "metadata": {},
    "outputs": [],
-   "source": [
-    "remote_agent_engine.register_feedback(\n",
-    "    feedback={\n",
-    "        \"score\": 5,\n",
-    "        \"text\": \"Great response!\",\n",
-    "        \"invocation_id\": \"test-invocation-123\",\n",
-    "        \"user_id\": \"test\",\n",
-    "    }\n",
-    ")"
-   ]
+   "source": "remote_agent_engine.register_feedback(\n    feedback={\n        \"score\": 5,\n        \"text\": \"Great response!\",\n        \"user_id\": \"test-user-123\",\n        \"session_id\": \"test-session-123\",\n    }\n)"
   },
   {
    "cell_type": "markdown",
@@ -154,21 +151,9 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "# Uncomment the following lines if you're not using the virtual environment created by uv\n",
-    "# import sys\n",
-    "# sys.path.append(\"../\")"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "from app.agent import root_agent\n",
-    "from app.agent_engine_app import AgentEngineApp\n",
+    "from app.agent_engine_app import agent_engine\n",
     "\n",
-    "agent_engine = AgentEngineApp(agent=root_agent)"
+    "agent_engine.set_up()"
    ]
   },
   {
@@ -360,7 +345,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "myagent-1758791726",
+   "display_name": "myagent-1762384391",
    "language": "python",
    "name": "python3"
   },
@@ -379,4 +364,4 @@
  },
  "nbformat": 4,
  "nbformat_minor": 2
-}
+}

agent_starter_pack/agents/adk_live/app/__init__.py

@@ -0,0 +1,17 @@
+# 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.
+
+from .agent import app
+
+__all__ = ["app"]

agent_starter_pack/agents/adk_live/app/agent.py

@@ -17,6 +17,7 @@ import os
 import google.auth
 import vertexai
 from google.adk.agents import Agent
+from google.adk.apps.app import App
 
 _, project_id = google.auth.default()
 os.environ.setdefault("GOOGLE_CLOUD_PROJECT", project_id)
@@ -46,3 +47,5 @@ root_agent = Agent(
     instruction="You are a helpful AI assistant designed to provide accurate and useful information.",
     tools=[get_weather],
 )
+
+app = App(root_agent=root_agent, name="app")

agent_starter_pack/agents/agentic_rag/app/__init__.py

@@ -12,6 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from .agent import root_agent
+from .agent import app
 
-__all__ = ["root_agent"]
+__all__ = ["app"]

agent_starter_pack/agents/agentic_rag/app/agent.py

@@ -18,6 +18,7 @@ import os
 import google
 import vertexai
 from google.adk.agents import Agent
+from google.adk.apps.app import App
 from langchain_google_vertexai import VertexAIEmbeddings
 
 from {{cookiecutter.agent_directory}}.retrievers import get_compressor, get_retriever
@@ -115,3 +116,5 @@ root_agent = Agent(
     instruction=instruction,
     tools=[retrieve_docs],
 )
+
+app = App(root_agent=root_agent, name="app")

agent_starter_pack/agents/agentic_rag/notebooks/adk_app_testing.ipynb

@@ -16,7 +16,9 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "## Install dependencies"
+    "## Set Up Your Environment\n",
+    "\n",
+    "> **Note:** For best results, use the same `.venv` created for local development with `uv` to ensure dependency compatibility and avoid environment-related issues."
    ]
   },
   {
@@ -25,7 +27,11 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "!pip install google-cloud-aiplatform --upgrade"
+    "# Uncomment the following lines if you're not using the virtual environment created by uv\n",
+    "# import sys\n",
+    "\n",
+    "# sys.path.append(\"../\")\n",
+    "# !pip install google-cloud-aiplatform a2a-sdk --upgrade"
    ]
   },
   {
@@ -123,16 +129,7 @@
    "execution_count": null,
    "metadata": {},
    "outputs": [],
-   "source": [
-    "remote_agent_engine.register_feedback(\n",
-    "    feedback={\n",
-    "        \"score\": 5,\n",
-    "        \"text\": \"Great response!\",\n",
-    "        \"invocation_id\": \"test-invocation-123\",\n",
-    "        \"user_id\": \"test\",\n",
-    "    }\n",
-    ")"
-   ]
+   "source": "remote_agent_engine.register_feedback(\n    feedback={\n        \"score\": 5,\n        \"text\": \"Great response!\",\n        \"user_id\": \"test-user-123\",\n        \"session_id\": \"test-session-123\",\n    }\n)"
   },
   {
    "cell_type": "markdown",
@@ -154,21 +151,9 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "# Uncomment the following lines if you're not using the virtual environment created by uv\n",
-    "# import sys\n",
-    "# sys.path.append(\"../\")"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "from app.agent import root_agent\n",
-    "from app.agent_engine_app import AgentEngineApp\n",
+    "from app.agent_engine_app import agent_engine\n",
     "\n",
-    "agent_engine = AgentEngineApp(agent=root_agent)"
+    "agent_engine.set_up()"
    ]
   },
   {
@@ -360,7 +345,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "myagent-1758791726",
+   "display_name": "myagent-1762384391",
    "language": "python",
    "name": "python3"
   },
@@ -379,4 +364,4 @@
  },
  "nbformat": 4,
  "nbformat_minor": 2
-}
+}

agent_starter_pack/agents/{crewai_coding_crew → langgraph_base}/.template/templateconfig.yaml

@@ -12,17 +12,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-description: "A multi-agent system implemented with CrewAI created to support coding activities"
+description: "A base ReAct agent implemented using LangGraph with Agent2Agent (A2A) Protocol support"
 settings:
   requires_data_ingestion: false
   deployment_targets: ["agent_engine", "cloud_run"]
   extra_dependencies: [
-    "langchain-google-vertexai~=2.0.22",
-    "langchain~=0.3.14",
-    "langchain-community~=0.3.17", 
-    "langchain-openai~=0.3.5",
-    "langgraph~=0.6.2",
-    "crewai~=0.152.0"
+    "langchain-google-vertexai>=3.0.3",
+    "langchain~=1.0.7",
+    "langgraph~=1.0.3",
+    "langchain-community~=0.4.1",
+    "a2a-sdk[http-server]~=0.3.12",
+    "nest-asyncio>=1.6.0,<2.0.0",
+    "traceloop-sdk>=0.10.0,<1.0.0",
+    "opentelemetry-exporter-gcp-trace>=1.9.0,<2.0.0",
   ]
-  frontend_type: "streamlit"
-example_question: "How can I implement a function to sort a list in Python?"
+  tags: ["langgraph", "a2a"]
+  frontend_type: "inspector"
+example_question: "What's the weather in San Francisco?"

agent_starter_pack/agents/langgraph_base/README.md

@@ -0,0 +1,30 @@
+# LangGraph Base ReAct Agent with A2A Protocol
+
+<p align="center">
+  <img src="https://langchain-ai.github.io/langgraph/static/wordmark_dark.svg" width="50%" alt="LangGraph Logo" style="margin-right: 40px; vertical-align: middle;">
+  <img src="https://github.com/a2aproject/A2A/blob/main/docs/assets/a2a-logo-white.svg?raw=true" width="40%" alt="A2A Logo" style="vertical-align: middle;">
+</p>
+
+A base ReAct agent built using **[LangGraph](https://docs.langchain.com/oss/python/langgraph/overview)** with **[Agent2Agent (A2A) Protocol](https://a2a-protocol.org/)** support. This example demonstrates how to build a LangGraph-based agent with distributed agent communication capabilities through the A2A protocol for interoperability with agents across different frameworks and languages.
+
+## Key Features
+
+- **Simple Architecture**: Shows the basic building blocks of a LangGraph agent
+- **A2A Protocol Support**: Enables distributed agent communication and interoperability
+- **Streaming Support**: Includes streaming response capability using Vertex AI
+- **Sample Tool Integration**: Includes a basic search tool to demonstrate tool usage
+
+## Validating Your A2A Implementation
+
+This template includes the **[A2A Protocol Inspector](https://github.com/a2aproject/a2a-inspector)** for validating your agent's A2A implementation.
+
+```bash
+make inspector
+```
+
+The inspector now supports both JSON-RPC 2.0 (Cloud Run) and HTTP-JSON (Agent Engine) transport protocols:
+
+- **Cloud Run**: Test locally at `http://localhost:8000` or connect to your deployed Cloud Run URL
+- **Agent Engine**: Must deploy first, then connect to your deployed Agent Engine URL (local testing not available)
+
+For detailed setup instructions including local and remote testing workflows, refer to the `README.md` in your generated project.

agent_starter_pack/agents/langgraph_base/app/__init__.py

@@ -0,0 +1,17 @@
+# 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.
+
+from .agent import root_agent
+
+__all__ = ["root_agent"]

agent_starter_pack/agents/{langgraph_base_react → langgraph_base}/app/agent.py

@@ -12,9 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# mypy: disable-error-code="union-attr"
+from langchain.agents import create_agent
 from langchain_google_vertexai import ChatVertexAI
-from langgraph.prebuilt import create_react_agent
+from langgraph.graph.state import CompiledStateGraph
 
 LOCATION = "global"
 LLM = "gemini-2.5-flash"
@@ -29,6 +29,6 @@ def get_weather(query: str) -> str:
     return "It's 90 degrees and sunny."
 
 
-agent = create_react_agent(
-    model=llm, tools=[get_weather], prompt="You are a helpful assistant"
+root_agent: CompiledStateGraph = create_agent(
+    model=llm, tools=[get_weather], system_prompt="You are a helpful assistant"
 )

agent_starter_pack/agents/{langgraph_base_react → langgraph_base}/tests/integration/test_agent.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # mypy: ignore-errors
-from {{cookiecutter.agent_directory}}.agent import agent
+from {{cookiecutter.agent_directory}}.agent import root_agent as agent
 
 
 def test_agent_stream() -> None:

agent_starter_pack/base_template/.gitignore

@@ -189,9 +189,11 @@ 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
 .env
 .requirements.txt
+
+# A2A Inspector
+tools/a2a-inspector/

agent_starter_pack/base_template/Makefile

@@ -8,7 +8,7 @@ install:
 {%- if cookiecutter.settings.get("commands", {}).get("override", {}).get("install") %}
 	{{cookiecutter.settings.get("commands", {}).get("override", {}).get("install")}}
 {%- else %}
-	uv sync --dev{% if not cookiecutter.is_adk and not cookiecutter.is_adk_live %} --extra streamlit{%- endif %}{% if cookiecutter.is_adk_live %} && (cd frontend && npm install){%- endif %}
+	uv sync{% if cookiecutter.is_adk_live %} && (cd frontend && npm install){%- endif %}
 {%- endif %}
 
 # ==============================================================================
@@ -38,17 +38,29 @@ playground:{%- if cookiecutter.is_adk_live %} build-frontend-if-needed{%- endif
 	@echo "==============================================================================="
 {%- if cookiecutter.is_adk_live %}
 {%- if cookiecutter.deployment_target == 'agent_engine' %}
-	uv run python -m {{cookiecutter.agent_directory}}.utils.expose_app --mode local --local-agent {{cookiecutter.agent_directory}}.agent.root_agent
+	uv run python -m {{cookiecutter.agent_directory}}.app_utils.expose_app --mode local --local-agent {{cookiecutter.agent_directory}}.agent.root_agent
 {%- else %}
-	uv run uvicorn {{cookiecutter.agent_directory}}.server:app --host localhost --port 8000 --reload
+	uv run uvicorn {{cookiecutter.agent_directory}}.fast_api_app:app --host localhost --port 8000 --reload
 {%- endif %}
 {%- elif cookiecutter.is_adk %}
 	uv run adk web . --port 8501 --reload_agents
-{%- else %}
+{%- elif cookiecutter.is_a2a %}
 {%- if cookiecutter.deployment_target == 'cloud_run' %}
-	uv run uvicorn {{cookiecutter.agent_directory}}.server:app --host localhost --port 8000 --reload &
+	uv run uvicorn {{cookiecutter.agent_directory}}.fast_api_app:app --host localhost --port 8000 --reload &
+	$(MAKE) inspector
+{%- else %}
+{%- if cookiecutter.agent_name == 'langgraph_base' %}
+	@echo "ℹ️  Note: Local playground not supported for LangGraph on Agent Engine."
+	@echo "    To test your agent, deploy first with 'make deploy' then use 'make inspector'."
+{%- else %}
+	@echo "ℹ️  Note: Local playground uses ADK web interface (not A2A endpoints)."
+	@echo "    To test A2A protocol, deploy first with 'make deploy' then use 'make inspector'."
+	@echo ""
+	uv run adk web . --port 8501 --reload_agents
 {%- endif %}
-	{% if cookiecutter.deployment_target == 'agent_engine' %}PYTHONPATH=. {% endif %}uv run streamlit run frontend/streamlit_app.py --browser.serverAddress=localhost --server.enableCORS=false --server.enableXsrfProtection=false
+{%- endif %}
+{%- else %}
+	uv run uvicorn {{cookiecutter.agent_directory}}.fast_api_app:app --host localhost --port 8000 --reload
 {%- endif %}
 {%- endif %}
 {%- if cookiecutter.settings.get("commands", {}).get("extra", {}) %}
@@ -88,9 +100,9 @@ playground:{%- if cookiecutter.is_adk_live %} build-frontend-if-needed{%- endif
 # Launch local development server with hot-reload
 local-backend:
 {%- if cookiecutter.deployment_target == 'cloud_run' %}
-	uv run uvicorn {{cookiecutter.agent_directory}}.server:app --host localhost --port 8000 --reload
+	uv run uvicorn {{cookiecutter.agent_directory}}.fast_api_app:app --host localhost --port 8000 --reload
 {%- else %}
-	uv run python -m {{cookiecutter.agent_directory}}.utils.expose_app --mode local --port 8000  --local-agent {{cookiecutter.agent_directory}}.agent.root_agent
+	uv run python -m {{cookiecutter.agent_directory}}.app_utils.expose_app --mode local --port 8000  --local-agent {{cookiecutter.agent_directory}}.agent.root_agent
 {%- endif %}
 {%- endif %}
 {%- if cookiecutter.is_adk_live %}
@@ -125,7 +137,7 @@ playground-remote: build-frontend-if-needed
 	@echo "| 🌐 Access your app at: http://localhost:8000                               |"
 	@echo "| ☁️  Connected to deployed agent engine                                      |"
 	@echo "==============================================================================="
-	uv run python -m {{cookiecutter.agent_directory}}.utils.expose_app --mode remote
+	uv run python -m {{cookiecutter.agent_directory}}.app_utils.expose_app --mode remote
 {%- endif %}
 {%- endif %}
 {%- if cookiecutter.is_adk_live and cookiecutter.deployment_target == 'agent_engine' %}
@@ -149,6 +161,68 @@ playground-dev:
 	@echo "Starting frontend dev server..."
 	$(MAKE) ui
 {%- endif %}
+{%- if cookiecutter.is_a2a %}
+
+# ==============================================================================
+# A2A Protocol Inspector
+# ==============================================================================
+
+# Launch A2A Protocol Inspector to test your agent implementation
+inspector: setup-inspector-if-needed build-inspector-if-needed
+	@echo "==============================================================================="
+	@echo "| 🔍 A2A Protocol Inspector                                                  |"
+	@echo "==============================================================================="
+	@echo "| 🌐 Inspector UI: http://localhost:5001                                     |"
+	@echo "|                                                                             |"
+{%- if cookiecutter.deployment_target == 'cloud_run' %}
+	@echo "| 💡 Testing Locally:                                                         |"
+	@echo "|    Paste this URL into the inspector:                                      |"
+	@echo "|    http://localhost:8000/a2a/{{cookiecutter.agent_directory}}/.well-known/agent-card.json              |"
+	@echo "|                                                                             |"
+{%- endif %}
+	@echo "| 💡 Testing Remote Deployment:                                               |"
+{%- if cookiecutter.deployment_target == 'cloud_run' %}
+	@echo "|    Connect to your deployed Cloud Run URL                                  |"
+	@echo "|    🔐 See README for authentication setup                                  |"
+{%- else %}
+	@echo "|    Connect to your deployed Agent Engine URL                               |"
+	@echo "|    🔐 See README for authentication setup                                  |"
+	@echo "|                                                                             |"
+	@echo "| ℹ️  Note: Local testing requires deploying to Agent Engine first.          |"
+	@echo "|    Local 'make playground' uses ADK web interface (not A2A endpoints)      |"
+{%- endif %}
+	@echo "==============================================================================="
+	@echo ""
+	cd tools/a2a-inspector/backend && uv run app.py
+
+# Internal: Setup inspector if not already present (runs once)
+# TODO: Update to --branch v1.0.0 when a2a-inspector publishes releases
+setup-inspector-if-needed:
+	@if [ ! -d "tools/a2a-inspector" ]; then \
+		echo "" && \
+		echo "📦 First-time setup: Installing A2A Inspector..." && \
+		echo "" && \
+		mkdir -p tools && \
+		git clone --quiet https://github.com/a2aproject/a2a-inspector.git tools/a2a-inspector && \
+		(cd tools/a2a-inspector && git -c advice.detachedHead=false checkout --quiet 893e4062f6fbd85a8369228ce862ebbf4a025694) && \
+		echo "📥 Installing Python dependencies..." && \
+		(cd tools/a2a-inspector && uv sync --quiet) && \
+		echo "📥 Installing Node.js dependencies..." && \
+		(cd tools/a2a-inspector/frontend && npm install --silent) && \
+		echo "🔨 Building frontend..." && \
+		(cd tools/a2a-inspector/frontend && npm run build --silent) && \
+		echo "" && \
+		echo "✅ A2A Inspector setup complete!" && \
+		echo ""; \
+	fi
+
+# Internal: Build inspector frontend if needed
+build-inspector-if-needed:
+	@if [ -d "tools/a2a-inspector" ] && [ ! -f "tools/a2a-inspector/frontend/public/script.js" ]; then \
+		echo "🔨 Building inspector frontend..."; \
+		cd tools/a2a-inspector/frontend && npm run build; \
+	fi
+{%- endif %}
 
 # ==============================================================================
 # Backend Deployment Targets
@@ -161,6 +235,9 @@ playground-dev:
 deploy:
 {%- if cookiecutter.deployment_target == 'cloud_run' %}
 	PROJECT_ID=$$(gcloud config get-value project) && \
+{%- if cookiecutter.is_a2a %}
+	PROJECT_NUMBER=$$(gcloud projects describe $$PROJECT_ID --format="value(projectNumber)") && \
+{%- endif %}
 	gcloud beta run deploy {{cookiecutter.project_name}} \
 		--source . \
 		--memory "4Gi" \
@@ -169,14 +246,20 @@ 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_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 > {{cookiecutter.agent_directory}}/app_utils/.requirements.txt 2>/dev/null || \
+	uv export --no-hashes --no-header --no-dev --no-emit-project > {{cookiecutter.agent_directory}}/app_utils/.requirements.txt) && \
+	uv run -m {{cookiecutter.agent_directory}}.app_utils.deploy \
+		--source-packages=./{{cookiecutter.agent_directory}} \
+		--entrypoint-module={{cookiecutter.agent_directory}}.agent_engine_app \
+		--entrypoint-object=agent_engine \
+		--requirements-file={{cookiecutter.agent_directory}}/app_utils/.requirements.txt
 {%- endif %}
 
 # Alias for 'make deploy' for backward compatibility
@@ -222,6 +305,7 @@ data-ingestion:
 
 # Run unit and integration tests
 test:
+	uv sync --dev
 	uv run pytest tests/unit && uv run pytest tests/integration
 
 # Run code quality checks (codespell, ruff, mypy)
@@ -231,15 +315,25 @@ lint:
 	uv run ruff check . --diff
 	uv run ruff format . --check --diff
 	uv run mypy .
-{%- if cookiecutter.is_adk and cookiecutter.deployment_target == 'agent_engine' %}
+{%- if (cookiecutter.is_a2a and cookiecutter.deployment_target == 'cloud_run') or (cookiecutter.is_adk and not cookiecutter.is_a2a and cookiecutter.deployment_target == 'agent_engine') %}
 
 # ==============================================================================
 # Gemini Enterprise Integration
 # ==============================================================================
 
 # Register the deployed agent to Gemini Enterprise
-# Usage: make register-gemini-enterprise ARGS="--gemini-enterprise-app-id=xxx --display-name='My Agent'"
-# Or set environment variables: GEMINI_ENTERPRISE_APP_ID, GEMINI_DISPLAY_NAME, GEMINI_DESCRIPTION, etc.
+# Usage: make register-gemini-enterprise (interactive - will prompt for required details)
+# For non-interactive use, set env vars: ID or GEMINI_ENTERPRISE_APP_ID (full GE resource name)
+# Optional env vars: GEMINI_DISPLAY_NAME, GEMINI_DESCRIPTION{%- if cookiecutter.deployment_target == 'agent_engine' %}, GEMINI_TOOL_DESCRIPTION, AGENT_ENGINE_ID{%- endif %}{%- if cookiecutter.deployment_target == 'cloud_run' %}, AGENT_CARD_URL{%- endif %}
 register-gemini-enterprise:
-	uvx --from agent-starter-pack agent-starter-pack-register-gemini-enterprise $(ARGS)
+{%- if cookiecutter.deployment_target == 'cloud_run' and cookiecutter.is_a2a %}
+	@PROJECT_ID=$$(gcloud config get-value project 2>/dev/null) && \
+	PROJECT_NUMBER=$$(gcloud projects describe $$PROJECT_ID --format="value(projectNumber)" 2>/dev/null) && \
+	uvx agent-starter-pack@{{ cookiecutter.package_version }} register-gemini-enterprise \
+		--agent-card-url="https://{{cookiecutter.project_name}}-$$PROJECT_NUMBER.us-central1.run.app/a2a/{{cookiecutter.agent_directory}}/.well-known/agent-card.json" \
+		--deployment-target="{{cookiecutter.deployment_target}}" \
+		--project-number="$$PROJECT_NUMBER"
+{%- else %}
+	@uvx agent-starter-pack@{{ cookiecutter.package_version }} register-gemini-enterprise
+{%- endif %}
 {%- endif %}