agent-starter-pack 0.11.1__tar.gz → 0.12.0__tar.gz

agent_starter_pack-0.12.0/.claude/settings.local.json

@@ -0,0 +1,10 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(PROJECT_IDS=agent-starter-pack-e2e-dev,agent-starter-pack-e2e-st,agent-starter-pack-e2e-pr python tests/cicd/scripts/delete_vector_search.py)",
+      "Bash(make lint)"
+    ],
+    "deny": [],
+    "ask": []
+  }
+}

{agent_starter_pack-0.11.1 → agent_starter_pack-0.12.0}/.cloudbuild/ci/lint.yaml

@@ -32,7 +32,7 @@ steps:
         set -e
         uv run ruff check . --config pyproject.toml --diff
         uv run ruff format . --check  --config pyproject.toml --diff
-        uv run mypy --config-file pyproject.toml ./agents ./src/cli ./tests ./src/frontends/streamlit
+        uv run mypy --config-file pyproject.toml ./src/cli ./tests ./src/frontends/streamlit
 
 logsBucket: gs://${PROJECT_ID}-logs-data/build-logs
 options:

{agent_starter_pack-0.11.1 → agent_starter_pack-0.12.0}/.cloudbuild/ci/test_templated_agents.yaml

@@ -35,4 +35,4 @@ logsBucket: gs://${PROJECT_ID}-logs-data/build-logs
 options:
   defaultLogsBucketBehavior: REGIONAL_USER_OWNED_BUCKET
   env:
-    - "_TEST_AGENT_COMBINATION=${_TEST_AGENT_COMBINATION}"
+    - "_TEST_AGENT_COMBINATION=live_api,cloud_run"

{agent_starter_pack-0.11.1 → agent_starter_pack-0.12.0}/.cloudbuild/terraform/build_triggers.tf

@@ -72,7 +72,7 @@ locals {
     },
     {
       name  = "langgraph_base_react-cloud_run"
-      value = "langgraph_base_react,cloud_run"
+      value = "langgraph_base_react,cloud_run,-dir,tag"
     },
     {
       name  = "crewai_coding_crew-agent_engine"
@@ -134,11 +134,11 @@ agent_testing_included_files = { for combo in local.agent_testing_combinations :
     },
     {
       name  = "adk_base-agent_engine"
-      value = "adk_base,agent_engine"
+      value = "adk_base,agent_engine,-dir,tag"
     },
     {
       name  = "adk_base-cloud_run"
-      value = "adk_base,cloud_run"
+      value = "adk_base,cloud_run,-dir,tag"
     },
     {
       name = "langgraph_base_react-agent_engine"

{agent_starter_pack-0.11.1 → agent_starter_pack-0.12.0}/Makefile

@@ -13,7 +13,7 @@ generate-lock:
 lint:
 	uv run ruff check . --config pyproject.toml --diff
 	uv run ruff format . --check  --config pyproject.toml --diff
-	uv run mypy --config-file pyproject.toml ./agents ./src/cli ./tests ./src/frontends/streamlit
+	uv run mypy --config-file pyproject.toml ./src/cli ./tests ./src/frontends/streamlit
 
 lint-templated-agents:
 	uv run tests/integration/test_template_linting.py

{agent_starter_pack-0.11.1 → agent_starter_pack-0.12.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agent-starter-pack
-Version: 0.11.1
+Version: 0.12.0
 Summary: CLI to bootstrap production-ready Google Cloud GenAI agent projects from templates.
 Author-email: Google LLC <agent-starter-pack@google.com>
 License: Apache-2.0

agent_starter_pack-0.12.0/agents/adk_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-0.11.1/agents/agentic_rag → agent_starter_pack-0.12.0/agents/adk_base}/notebooks/adk_app_testing.ipynb

@@ -9,7 +9,10 @@
     "This notebook demonstrates how to test an ADK (Agent Development Kit) application.\n",
     "It covers both local and remote testing, both with Agent Engine and Cloud Run.\n",
     "\n",
-    "<img src=\"https://github.com/GoogleCloudPlatform/agent-starter-pack/blob/main/docs/images/adk_logo.png?raw=true\" width=\"400\">\n"
+    "> **Note**: This notebook assumes that the agent files are stored in the `app` folder. If your agent files are located in a different directory, please update all relevant file paths and references accordingly.\n",
+    "\n",
+    "<img src=\"https://github.com/GoogleCloudPlatform/agent-starter-pack/blob/main/docs/images/adk_logo.png?raw=true\" width=\"400\">\n",
+    "\n"
    ]
   },
   {

{agent_starter_pack-0.11.1 → agent_starter_pack-0.12.0}/agents/adk_base/tests/integration/test_agent.py

@@ -18,7 +18,7 @@ from google.adk.runners import Runner
 from google.adk.sessions import InMemorySessionService
 from google.genai import types
 
-from app.agent import root_agent
+from {{cookiecutter.agent_directory}}.agent import root_agent
 
 
 def test_agent_stream() -> None:

agent_starter_pack-0.12.0/agents/agentic_rag/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-0.11.1 → agent_starter_pack-0.12.0}/agents/agentic_rag/app/agent.py

@@ -20,8 +20,8 @@ import vertexai
 from google.adk.agents import Agent
 from langchain_google_vertexai import VertexAIEmbeddings
 
-from app.retrievers import get_compressor, get_retriever
-from app.templates import format_docs
+from {{cookiecutter.agent_directory}}.retrievers import get_compressor, get_retriever
+from {{cookiecutter.agent_directory}}.templates import format_docs
 
 EMBEDDING_MODEL = "text-embedding-005"
 LLM_LOCATION = "global"

{agent_starter_pack-0.11.1/agents/adk_base → agent_starter_pack-0.12.0/agents/agentic_rag}/notebooks/adk_app_testing.ipynb

@@ -9,7 +9,10 @@
     "This notebook demonstrates how to test an ADK (Agent Development Kit) application.\n",
     "It covers both local and remote testing, both with Agent Engine and Cloud Run.\n",
     "\n",
-    "<img src=\"https://github.com/GoogleCloudPlatform/agent-starter-pack/blob/main/docs/images/adk_logo.png?raw=true\" width=\"400\">\n"
+    "> **Note**: This notebook assumes that the agent files are stored in the `app` folder. If your agent files are located in a different directory, please update all relevant file paths and references accordingly.\n",
+    "\n",
+    "<img src=\"https://github.com/GoogleCloudPlatform/agent-starter-pack/blob/main/docs/images/adk_logo.png?raw=true\" width=\"400\">\n",
+    "\n"
    ]
   },
   {

{agent_starter_pack-0.11.1 → agent_starter_pack-0.12.0}/agents/agentic_rag/tests/integration/test_agent.py

@@ -20,11 +20,11 @@ from google.adk.runners import Runner
 from google.adk.sessions import InMemorySessionService
 from google.genai import types
 
-from app.agent import root_agent
+from {{cookiecutter.agent_directory}}.agent import root_agent
 
 
 @patch(
-    "app.agent.retrieve_docs",
+    "{{cookiecutter.agent_directory}}.agent.retrieve_docs",
     return_value="dummy content",
 )
 def test_agent_stream(mock_retrieve: MagicMock) -> None:

{agent_starter_pack-0.11.1 → agent_starter_pack-0.12.0}/agents/crewai_coding_crew/tests/integration/test_agent.py

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

{agent_starter_pack-0.11.1 → agent_starter_pack-0.12.0}/agents/langgraph_base_react/tests/integration/test_agent.py

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

{agent_starter_pack-0.11.1 → agent_starter_pack-0.12.0}/agents/live_api/tests/unit/test_server.py

@@ -57,8 +57,8 @@ def mock_dependencies() -> Generator[None, None, None]:
     Patches genai client and tool functions.
     """
     with (
-        patch("app.server.genai_client") as mock_genai,
-        patch("app.server.tool_functions") as mock_tools,
+        patch("{{cookiecutter.agent_directory}}.server.genai_client") as mock_genai,
+        patch("{{cookiecutter.agent_directory}}.server.tool_functions") as mock_tools,
     ):
         mock_genai.aio.live.connect = AsyncMock()
         mock_tools.return_value = {}
@@ -71,7 +71,7 @@ async def test_websocket_endpoint() -> None:
     Test the websocket endpoint to ensure it correctly handles
     websocket connections and messages.
     """
-    from app.server import app
+    from {{cookiecutter.agent_directory}}.server import app
 
     mock_session = AsyncMock()
     mock_session._ws = AsyncMock()
@@ -90,7 +90,7 @@ async def test_websocket_endpoint() -> None:
         None,  # Add None to trigger StopAsyncIteration after first message
     ]
 
-    with patch("app.server.genai_client") as mock_genai:
+    with patch("{{cookiecutter.agent_directory}}.server.genai_client") as mock_genai:
         mock_genai.aio.live.connect.return_value.__aenter__.return_value = mock_session
         client = TestClient(app)
         with client.websocket_connect("/ws") as websocket:
@@ -132,9 +132,9 @@ async def test_websocket_endpoint() -> None:
 @pytest.mark.asyncio
 def test_websocket_error_handling() -> None:
     """Test websocket error handling."""
-    from app.server import app
+    from {{cookiecutter.agent_directory}}.server import app
 
-    with patch("app.server.genai_client") as mock_genai:
+    with patch("{{cookiecutter.agent_directory}}.server.genai_client") as mock_genai:
         mock_genai.aio.live.connect.side_effect = Exception("Connection failed")
 
         client = TestClient(app)

{agent_starter_pack-0.11.1 → agent_starter_pack-0.12.0}/docs/cli/create.md

@@ -78,6 +78,9 @@ Session storage type (for Cloud Run deployment):
 ### `--output-dir`, `-o` DIRECTORY
 Output directory for the project (default: current directory)
 
+### `--agent-directory`, `-dir` DIRECTORY
+Name of the agent directory (overrides template default, usually `app`). This determines where your agent code files will be located within the project structure.
+
 ### `--in-folder`
 Create agent files directly in the current directory instead of creating a new project subdirectory.
 
@@ -151,6 +154,9 @@ uvx agent-starter-pack create my-agent -a template-url --region europe-west1 --c
 # In-folder creation (add to existing project)
 uvx agent-starter-pack create my-agent -a adk@data-science --in-folder
 
+# Customize agent directory name
+uvx agent-starter-pack create my-agent -a adk_base --agent-directory chatbot
+
 # Skip all prompts for automation
 uvx agent-starter-pack create my-agent -a template-url --auto-approve --skip-checks
 ```

{agent_starter_pack-0.11.1 → agent_starter_pack-0.12.0}/docs/guide/development-guide.md

@@ -38,7 +38,7 @@ cd my-awesome-agent
 
 Inside, you'll find a complete project structure:
 
-*   `app/`: Backend agent code (prompts, tools, business logic).
+*   `app/`: Backend agent code (prompts, tools, business logic). Directory name is configurable via the `--agent-directory` parameter.
 *   `.cloudbuild/`: CI/CD pipeline configurations for Google Cloud Build (if you selected Cloud Build as your CI/CD runner).
 *   `.github/`: CI/CD pipeline configurations for GitHub Actions (if you selected GitHub Actions as your CI/CD runner).
 *   `deployment/`: Terraform infrastructure-as-code files.
@@ -51,7 +51,7 @@ Inside, you'll find a complete project structure:
 Your development loop will look like this:
 
 1.  **Prototype:** Use the notebooks in `notebooks/` for rapid experimentation with your agent's core logic. This is ideal for trying new prompts or tools before integrating them.
-2.  **Integrate:** Edit `app/agent.py` and other files in the `app/` directory to incorporate your new logic into the main application.
+2.  **Integrate:** Edit `app/agent.py` and other files in the agent directory (usually `app/`, but configurable) to incorporate your new logic into the main application.
 3.  **Test:** Run the interactive UI playground to test your changes. It features hot-reloading, chat history, and user feedback.
 
 ```bash
@@ -62,28 +62,46 @@ make install && make playground
 
 ## 2. Deploy to the Cloud
 
-Once you're satisfied with local testing, you are ready to deploy your agent to Google Cloud.
+Once you're satisfied with local testing, you are ready to deploy your agent to Google Cloud. The process involves two main stages: first, deploying to a hands-on development environment for quick iteration, and second, setting up a formal CI/CD pipeline for staging and production.
+
 *All `make` commands should be run from the root of your agent project (`my-awesome-agent`).*
-### A. Cloud Development Environment Setup
-First, provision a non-production environment in the cloud for remote testing.
+
+### Stage 1: Deploy to a Cloud Development Environment
+
+This initial stage is for provisioning a non-production environment in the cloud for remote testing and iteration.
+
 **i. Set Google Cloud Project**
+
 Configure `gcloud` to target your development project.
 ```bash
 # Replace YOUR_DEV_PROJECT_ID with your actual Google Cloud Project ID
 gcloud config set project YOUR_DEV_PROJECT_ID
 ```
+
 **ii. Provision Cloud Resources**
-This command uses Terraform to set up necessary cloud resources for your dev environment.
+
+This command uses Terraform to set up the necessary cloud resources for your dev environment.
+
+::: tip Optional Step
+This step is recommended to create a development environment that closely mirrors production (including dedicated service accounts and IAM permissions). However, for simple deployments, you can consider this step optional and proceed directly to deploying the backend if you have sufficient permissions.
+:::
+
 ```bash
 make setup-dev-env
 ```
+
 **iii. Deploy Agent Backend**
+
 Build and deploy your agent's backend to the dev environment.
 ```bash
 make backend
 ```
 
-### Option 1: Automated CI/CD Setup
+### Stage 2: Set Up the Path to Production with CI/CD
+
+Once you've refined your agent in the development environment, the next stage is to set up a fully automated CI/CD pipeline for seamless deployment through staging and into production.
+
+#### Option 1: Automated CI/CD Setup
 
 From the root of your agent project (`my-awesome-agent`), run:
 ```bash
@@ -92,17 +110,18 @@ agent-starter-pack setup-cicd
 This single command handles everything:
 - Creates a GitHub repository.
 - Connects it to your chosen CI/CD provider (Google Cloud Build or GitHub Actions).
-- Provisions all necessary infrastructure for your staging and production environments using Terraform.
+- Provisions all necessary infrastructure for your **staging and production environments** using Terraform.
 - Configures the deployment triggers.
 
 For a detailed walkthrough, see the [**`setup-cicd` CLI reference**](../cli/setup_cicd).
 
-### Option 2: Manual CI/CD Setup
+#### Option 2: Manual CI/CD Setup
+
+For full control or for use with other Git providers, refer to the [manual deployment setup guide](./deployment.md).
 
-For full control or for other Git providers, refer to the [manual deployment setup guide](./deployment.md).
+#### Trigger Your First Deployment
 
-### Trigger Your First Deployment
-After the CI/CD setup is complete, commit and push your code to trigger the pipeline.
+After the CI/CD setup is complete, commit and push your code to trigger the pipeline. This will deploy your agent to the staging environment first.
 ```bash
 git add -A
 git config --global user.email "you@example.com" # If not already configured

{agent_starter_pack-0.11.1 → agent_starter_pack-0.12.0}/docs/guide/getting-started.md

@@ -55,7 +55,7 @@ cd my-awesome-agent && make install && make playground
 
 Inside your new project directory (`my-awesome-agent`), you'll find:
 
-*   `app/`: Backend agent code.
+*   `app/`: Backend agent code (or custom directory name if configured).
 *   `deployment/`: Terraform infrastructure code.
 *   `tests/`: Unit and integration tests for your agent.
 *   `notebooks/`: Jupyter notebooks for getting started with evaluation.

{agent_starter_pack-0.11.1 → agent_starter_pack-0.12.0}/docs/guide/template-config-reference.md

@@ -1,6 +1,13 @@
-# `templateconfig.yaml` Reference
+# Template Configuration Reference
 
-This document provides a detailed reference for all the available fields in the `templateconfig.yaml` file. This file is used to configure both the built-in agents provided by the starter pack and your own remote templates.
+This document provides a detailed reference for template configuration options.
+
+## Configuration Files
+
+- **Built-in templates**: Use `templateconfig.yaml` files
+- **Remote templates**: Configure settings in `pyproject.toml` under the `[tool.agent-starter-pack.settings]` section
+
+The configuration fields are the same for both types of templates.
 
 ## Top-Level Fields
 
@@ -21,6 +28,7 @@ This object contains fields that control the generated project's features and be
 | `deployment_targets`        | list(string)   | A list of deployment targets your template supports. Options: `agent_engine`, `cloud_run`.                                                  |
 | `tags`                      | list(string)   | A list of tags for categorization. The `adk` tag enables special integrations with the Agent Development Kit.                                 |
 | `frontend_type`             | string         | Specifies the frontend to use. Examples: `streamlit`, `live_api_react`. Defaults to `streamlit`.                                             |
+| `agent_directory`           | string         | The name of the directory where agent code will be placed. Defaults to `app`. Can be overridden by the CLI `--agent-directory` parameter.    |
 | `requires_data_ingestion`   | boolean        | If `true`, the user will be prompted to configure a datastore.                                                                              |
 | `requires_session`          | boolean        | If `true`, the user will be prompted to choose a session storage type (e.g., `alloydb`) when using the `cloud_run` target.                    |
 | `interactive_command`       | string         | The `make` command to run for starting the agent, after the agent code is being created (e.g., `make playground`, `make dev`). Defaults to `playground`. |

{agent_starter_pack-0.11.1 → agent_starter_pack-0.12.0}/docs/remote-templates/creating-remote-templates.md

@@ -61,6 +61,9 @@ description = "A simple template that demonstrates custom greetings"
 [tool.agent-starter-pack.settings]
 # This template will only support the 'agent_engine' deployment target
 deployment_targets = ["agent_engine"]
+# Optional: Customize the directory name for agent files (default: "app")
+agent_directory = "app"
+
 ```
 
 ### Step 3: Create Your Custom Agent Logic
@@ -150,6 +153,8 @@ description = "Custom description"  # Optional: falls back to [project].descript
 [tool.agent-starter-pack.settings]
 deployment_targets = ["cloud_run", "agent_engine"]
 frontend_type = "adk_streamlit"
+# Optional: Customize the directory name for agent files (default: "app")
+agent_directory = "app"
 ```
 
 ## Configuration Reference
@@ -174,8 +179,25 @@ base_template = "adk_base"  # Override default
 # name and description will use [project] values
 ```
 
+### Agent Directory Configuration
+
+By default, agent files are expected to be in an `app/` directory. You can customize this using the `agent_directory` setting:
+
+```toml
+[tool.agent-starter-pack.settings]
+agent_directory = "my_agent"  # Custom directory name
+```
+
+This is useful when:
+- You want to use a different directory name for consistency with your project structure
+- You're creating specialized templates with domain-specific naming (e.g., `chatbot/`, `assistant/`, `agent/`)
+- You need to avoid conflicts with existing codebases that use `app/` for other purposes
+
+**Important:** When using a custom `agent_directory`, ensure your Python imports and Docker configurations match the new directory name.
+
 For complete configuration options, see the [Template Config Reference](../guide/template-config-reference.md).
 
+
 ## How File Merging Works
 
 When someone uses your template, files are copied and overlaid in this order (later steps overwrite earlier ones):
@@ -271,7 +293,7 @@ uvx agent-starter-pack create test-project -a local@./your-template --deployment
 
 Before publishing, verify:
 - [ ] `pyproject.toml` has all required dependencies
-- [ ] Agent code is in `/app` directory structure
+- [ ] Agent code is in appropriate directory structure (usually `/app` or configured `agent_directory`)
 - [ ] `uv lock` generates without errors
 - [ ] Local testing creates working agent
 - [ ] README documents usage and requirements

{agent_starter_pack-0.11.1 → agent_starter_pack-0.12.0}/llm.txt

@@ -74,6 +74,10 @@ agent-starter-pack create PROJECT_NAME [OPTIONS]
 *   `--region`: GCP region (e.g., `us-central1`).
 *   `--auto-approve`: **Skips all interactive prompts (crucial for automation).**
 *   `--debug`: Enables debug logging during creation.
+*   `--agent-directory, -dir`: Name of the agent directory (overrides template default).
+*   `-o, --output-dir`: Output directory for the project (default: current directory).
+*   `--in-folder, -if`: Template files directly into the current directory instead of creating a new project directory.
+*   `--skip-checks`: Skip verification checks for GCP and Vertex AI.
 
 **Automated Creation Example:**
 ```bash
@@ -196,7 +200,7 @@ For stateful agents, the starter pack supports persistent sessions.
 
 ### Monitoring & Observability
 *   **Technology:** Uses OpenTelemetry to emit events to Google Cloud Trace and Logging.
-*   **Custom Tracer:** A custom tracer in `app/utils/tracing.py` handles large payloads by linking to GCS, overcoming default service limits.
+*   **Custom Tracer:** A custom tracer in `app/utils/tracing.py` (or a different agent directory instead of app) handles large payloads by linking to GCS, overcoming default service limits.
 *   **Infrastructure:** A Log Router to sink data to BigQuery is provisioned by Terraform.
 
 ---
@@ -217,8 +221,16 @@ uvx agent-starter-pack setup-cicd [OPTIONS]
 *   `--prod-project`: (REQUIRED) The Google Cloud Project ID for your production environment.
 *   `--repository-name`: (REQUIRED) The name for the new GitHub repository that will be created.
 *   `--repository-owner`: (REQUIRED) Your GitHub username or organization where the repo will be created.
-*   `--git-provider`: (REQUIRED) The Git provider to use (github, gitlab, etc.). Only "github" is supported. 
 *   `--auto-approve`: Skips all interactive confirmation prompts.
+*   `--dev-project`: Development project ID (optional).
+*   `--cicd-project`: CICD project ID (defaults to prod project if not specified).
+*   `--region`: GCP region (auto-detects from Terraform vars if not specified).
+*   `--host-connection-name`: Host connection name (optional).
+*   `--github-pat`: GitHub Personal Access Token for programmatic auth.
+*   `--github-app-installation-id`: GitHub App Installation ID for programmatic auth.
+*   `--local-state`: Use local Terraform state instead of remote GCS backend.
+*   `--debug`: Enable debug logging.
+*   `--create-repository`: Flag indicating whether to create a new repository.
 
 
 **Automated Example:**
@@ -228,10 +240,9 @@ uvx agent-starter-pack setup-cicd \
   --prod-project the-user-prod-project \
   --repository-name the-user-repo-name \
   --repository-owner the-username \
-  --git-provider github \
   --auto-approve
 ```
-* Note: As a coding agent, you must run this command non-interactively. Before executing, you must ask the user to provide the following required flags: `--staging-project`, `--prod-project`, `--repository-name`, `--repository-owner`, and `--git-provider`. Once you have these values, you can construct and run the command with the `--auto-approve` flag.
+* Note: As a coding agent, you must run this command non-interactively. Before executing, you must ask the user to provide the following required flags: `--staging-project`, `--prod-project`, `--repository-name`, and `--repository-owner`. Once you have these values, you can construct and run the command with the `--auto-approve` flag.
 * Note: If the user tells that `setup-cicd` is not a viable option or it wants to use a different git provider, you must not use this command. Instead, you should look at the `deployment/README.md` to get instructions on how to manually deploy the agent.
 ---
 ### Section 6: Operational Guidelines for Coding Agents

{agent_starter_pack-0.11.1 → agent_starter_pack-0.12.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "agent-starter-pack"
-version = "0.11.1"
+version = "0.12.0"
 description = "CLI to bootstrap production-ready Google Cloud GenAI agent projects from templates."
 authors = [
     { name = "Google LLC", email = "agent-starter-pack@google.com" },
@@ -71,9 +71,9 @@ log_cli_date_format = "%Y-%m-%d %H:%M:%S"
 
 [tool.ruff]
 line-length = 88
-target-version = "py310"
-include = ["./agents/**/*.py", "src/cli/**/*.py", "tests/**/*.py", "src/frontends/streamlit/**/*.py"]
-exclude = ["./agents/agentic_rag/**/*.py"]
+target-version = "py311"
+include = ["src/cli/**/*.py", "tests/**/*.py", "src/frontends/streamlit/**/*.py"]
+exclude = ["./agents/**/*.py", "./tests/cicd/scripts/**/*.py"]
 
 [tool.ruff.lint]
 preview = true
@@ -109,7 +109,8 @@ ignore_missing_imports = true
 explicit_package_bases = true
 disable_error_code = ["misc", "no-untyped-call", "no-any-return"]
 exclude = '''(?x)(
-    ^agents/agentic_rag/.*$  # exclude all files under agentic_rag directory
+    ^agents/.*$  # exclude all files under agents
+    ^tests/cicd/scripts/.*$  # exclude cicd scripts
 )'''
 
 [tool.codespell]

{agent_starter_pack-0.11.1 → agent_starter_pack-0.12.0}/src/base_template/Makefile

@@ -34,14 +34,14 @@ playground:
 	@echo "| 💡 Try asking: {{cookiecutter.example_question}}|"
 {%- if "adk" in cookiecutter.tags %}
 	@echo "|                                                                             |"
-	@echo "| 🔍 IMPORTANT: Select the 'app' folder to interact with your agent.          |"
+	@echo "| 🔍 IMPORTANT: Select the '{{cookiecutter.agent_directory}}' folder to interact with your agent.          |"
 {%- endif %}
 	@echo "==============================================================================="
 {%- if "adk" in cookiecutter.tags %}
-	uv run adk web --port 8501
+	uv run adk web . --port 8501
 {%- else %}
 {%- if cookiecutter.deployment_target == 'cloud_run' %}
-	uv run uvicorn app.server:app --host 0.0.0.0 --port 8000 --reload &
+	uv run uvicorn {{cookiecutter.agent_directory}}.server:app --host 0.0.0.0 --port 8000 --reload &
 {%- endif %}
 {%- if cookiecutter.agent_name == 'live_api' %}
 	(cd frontend && PORT=8501 npm start)
@@ -73,13 +73,13 @@ backend:
 {%- 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 app/agent_engine_app.py
+	uv export --no-hashes --no-header --no-dev --no-emit-project > .requirements.txt && uv run {{cookiecutter.agent_directory}}/agent_engine_app.py
 {%- endif %}
 {%- if cookiecutter.deployment_target == 'cloud_run' %}
 
 # Launch local development server with hot-reload
 local-backend:
-	uv run uvicorn app.server:app --host 0.0.0.0 --port 8000 --reload
+	uv run uvicorn {{cookiecutter.agent_directory}}.server:app --host 0.0.0.0 --port 8000 --reload
 {%- endif %}
 {%- if cookiecutter.deployment_target == 'cloud_run' %}
 {%- if cookiecutter.agent_name == 'live_api' %}

{agent_starter_pack-0.11.1 → agent_starter_pack-0.12.0}/src/base_template/README.md

@@ -9,7 +9,7 @@ This project is organized as follows:
 
 ```
 {{cookiecutter.project_name}}/
-├── app/                 # Core application code
+├── {{cookiecutter.agent_directory}}/                 # Core application code
 │   ├── agent.py         # Main agent logic
 {%- if cookiecutter.deployment_target == 'cloud_run' %}
 │   ├── server.py        # FastAPI Backend server
@@ -83,7 +83,7 @@ For full command options and usage, refer to the [Makefile](Makefile).
 {% if cookiecutter.agent_name == 'live_api' %}
 ## Usage
 
-This template follows a "bring your own agent" approach - you focus on your business logic in `app/agent.py`, and the template handles the surrounding components (UI, infrastructure, deployment, monitoring).
+This template follows a "bring your own agent" approach - you focus on your business logic in `{{cookiecutter.agent_directory}}/agent.py`, and the template handles the surrounding components (UI, infrastructure, deployment, monitoring).
 
 Here’s the recommended workflow for local development:
 
@@ -124,7 +124,7 @@ Here’s the recommended workflow for local development:
     *   Open the Streamlit UI in your browser (usually `http://localhost:8501` or `http://localhost:3001`).
     *   Click the play button in the UI to connect to the backend.
     *   Interact with the agent! Try prompts like: *"Using the tool you have, define Governance in the context MLOPs"*
-    *   Modify the agent logic in `app/agent.py`. The backend server (FastAPI with `uvicorn --reload`) should automatically restart when you save changes. Refresh the frontend if needed to see behavioral changes.
+    *   Modify the agent logic in `{{cookiecutter.agent_directory}}/agent.py`. The backend server (FastAPI with `uvicorn --reload`) should automatically restart when you save changes. Refresh the frontend if needed to see behavioral changes.
 
 <details>
 <summary><b>Cloud Shell Usage</b></summary>
@@ -162,7 +162,7 @@ To run the agent using Google Cloud Shell:
 This template follows a "bring your own agent" approach - you focus on your business logic, and the template handles everything else (UI, infrastructure, deployment, monitoring).
 
 1. **Prototype:** Build your Generative AI Agent using the intro notebooks in `notebooks/` for guidance. Use Vertex AI Evaluation to assess performance.
-2. **Integrate:** Import your agent into the app by editing `app/agent.py`.
+2. **Integrate:** Import your agent into the app by editing `{{cookiecutter.agent_directory}}/agent.py`.
 3. **Test:** Explore your agent functionality using the Streamlit playground with `make playground`. The playground offers features like chat history, user feedback, and various input types, and automatically reloads your agent on code changes.
 4. **Deploy:** Set up and initiate the CI/CD pipelines, customizing tests as necessary. Refer to the [deployment section](#deployment) for comprehensive instructions. For streamlined infrastructure deployment, simply run `uvx agent-starter-pack setup-cicd`. Check out the [`agent-starter-pack setup-cicd` CLI command](https://googlecloudplatform.github.io/agent-starter-pack/cli/setup_cicd.html). Currently supports GitHub with both Google Cloud Build and GitHub Actions as CI/CD runners.
 5. **Monitor:** Track performance and gather insights using Cloud Logging, Tracing, and the Looker Studio dashboard to iterate on your application.

{agent_starter_pack-0.11.1 → agent_starter_pack-0.12.0}/src/base_template/deployment/terraform/dev/variables.tf

@@ -49,14 +49,15 @@ variable "app_sa_roles" {
   description = "List of roles to assign to the application service account"
   type        = list(string)
   default = [
-{%- if "adk" in cookiecutter.tags and cookiecutter.session_type == "alloydb" %}
+{%- if cookiecutter.session_type == "alloydb" %}
     "roles/secretmanager.secretAccessor",
 {%- endif %}
     "roles/aiplatform.user",
     "roles/discoveryengine.editor",
     "roles/logging.logWriter",
     "roles/cloudtrace.agent",
-    "roles/storage.admin"
+    "roles/storage.admin",
+    "roles/serviceusage.serviceUsageConsumer",
   ]
 }
 {% if cookiecutter.data_ingestion %}