agent-starter-pack 0.11.0__tar.gz → 0.11.2__tar.gz

{agent_starter_pack-0.11.0 → agent_starter_pack-0.11.2}/.claude/settings.local.json

@@ -1,4 +1,5 @@
 {
+  "$schema": "https://json.schemastore.org/claude-code-settings.json",
   "permissions": {
     "allow": [
       "Bash(grep:*)",
@@ -11,9 +12,10 @@
       "Bash(. tests/cicd/.env)",
       "Bash(set +a)",
       "Bash(bash:*)",
-      "Bash(ls:*)"
+      "Bash(ls:*)",
+      "Bash(python -m pytest tests/cli/commands/test_enhance.py::TestEnhanceCommand::test_enhance_with_interactive_base_template_selection -v)",
+      "Bash(python tests/cicd/scripts/delete_agent_engines.py:*)"
     ],
     "deny": []
-  },
-  "$schema": "https://json.schemastore.org/claude-code-settings.json"
+  }
 }

{agent_starter_pack-0.11.0 → agent_starter_pack-0.11.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agent-starter-pack
-Version: 0.11.0
+Version: 0.11.2
 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
@@ -75,6 +75,14 @@ This command handles creating the project without needing to pre-install the pac
 
 **That's it!** You now have a fully functional agent project—complete with backend, frontend, and deployment infrastructure—ready for you to explore and customize.
 
+### 🔧 Enhance Existing Agents
+
+Already have an agent? Add production-ready deployment and infrastructure:
+
+```bash
+agent-starter-pack enhance my-existing-agent
+```
+
 See [Installation Guide](https://googlecloudplatform.github.io/agent-starter-pack/guide/installation) for more options, or try with zero setup in [Firebase Studio](https://studio.firebase.google.com/new?template=https%3A%2F%2Fgithub.com%2FGoogleCloudPlatform%2Fagent-starter-pack%2Ftree%2Fmain%2Fsrc%2Fresources%2Fidx) or [Cloud Shell](https://shell.cloud.google.com/cloudshell/editor?cloudshell_git_repo=https%3A%2F%2Fgithub.com%2Feliasecchig%2Fasp-open-in-cloud-shell&cloudshell_print=open-in-cs).
 
 ---
@@ -84,7 +92,6 @@ See [Installation Guide](https://googlecloudplatform.github.io/agent-starter-pac
 | Agent Name                  | Description                                                                                                                       |
 |-----------------------------|-----------------------------------------------------------------------------------------------------------------------------------|
 | `adk_base`      | A base ReAct agent implemented using Google's [Agent Development Kit](https://github.com/google/adk-python) |
-| `adk_gemini_fullstack` | A production-ready fullstack research agent with Gemini that demonstrates complex agentic workflows, modular agent design, and Human-in-the-Loop steps. [ADK Samples](https://github.com/google/adk-samples/tree/main/python/agents/gemini-fullstack) |
 | `agentic_rag` | A RAG agent for document retrieval and Q&A. Supporting [Vertex AI Search](https://cloud.google.com/generative-ai-app-builder/docs/enterprise-search-introduction) and [Vector Search](https://cloud.google.com/vertex-ai/docs/vector-search/overview).       |
 | `langgraph_base_react`      | An agent implementing a base ReAct agent using LangGraph |
 | `crewai_coding_crew`       | A multi-agent system implemented with CrewAI created to support coding activities       |

{agent_starter_pack-0.11.0 → agent_starter_pack-0.11.2}/README.md

@@ -52,6 +52,14 @@ This command handles creating the project without needing to pre-install the pac
 
 **That's it!** You now have a fully functional agent project—complete with backend, frontend, and deployment infrastructure—ready for you to explore and customize.
 
+### 🔧 Enhance Existing Agents
+
+Already have an agent? Add production-ready deployment and infrastructure:
+
+```bash
+agent-starter-pack enhance my-existing-agent
+```
+
 See [Installation Guide](https://googlecloudplatform.github.io/agent-starter-pack/guide/installation) for more options, or try with zero setup in [Firebase Studio](https://studio.firebase.google.com/new?template=https%3A%2F%2Fgithub.com%2FGoogleCloudPlatform%2Fagent-starter-pack%2Ftree%2Fmain%2Fsrc%2Fresources%2Fidx) or [Cloud Shell](https://shell.cloud.google.com/cloudshell/editor?cloudshell_git_repo=https%3A%2F%2Fgithub.com%2Feliasecchig%2Fasp-open-in-cloud-shell&cloudshell_print=open-in-cs).
 
 ---
@@ -61,7 +69,6 @@ See [Installation Guide](https://googlecloudplatform.github.io/agent-starter-pac
 | Agent Name                  | Description                                                                                                                       |
 |-----------------------------|-----------------------------------------------------------------------------------------------------------------------------------|
 | `adk_base`      | A base ReAct agent implemented using Google's [Agent Development Kit](https://github.com/google/adk-python) |
-| `adk_gemini_fullstack` | A production-ready fullstack research agent with Gemini that demonstrates complex agentic workflows, modular agent design, and Human-in-the-Loop steps. [ADK Samples](https://github.com/google/adk-samples/tree/main/python/agents/gemini-fullstack) |
 | `agentic_rag` | A RAG agent for document retrieval and Q&A. Supporting [Vertex AI Search](https://cloud.google.com/generative-ai-app-builder/docs/enterprise-search-introduction) and [Vector Search](https://cloud.google.com/vertex-ai/docs/vector-search/overview).       |
 | `langgraph_base_react`      | An agent implementing a base ReAct agent using LangGraph |
 | `crewai_coding_crew`       | A multi-agent system implemented with CrewAI created to support coding activities       |

{agent_starter_pack-0.11.0 → agent_starter_pack-0.11.2}/docs/agents/overview.md

@@ -33,16 +33,6 @@ This template provides a minimal example of a ReAct agent built using Google's [
 *   Building general-purpose conversational agents.
 *   Learning the ADK framework and ReAct pattern.
 
-### ADK Gemini Fullstack (`adk_gemini_fullstack`)
-
-> 🔍 **Sample Agent**: This agent is part of the [ADK Samples](https://github.com/google/adk-samples/tree/main/python/agents/gemini-fullstack) collection, showcasing agent implementations using the Agent Development Kit.
-
-This template provides a production-ready blueprint for building a sophisticated, fullstack research agent with Gemini. It demonstrates how the ADK helps structure complex agentic workflows, build modular agents, and incorporate critical Human-in-the-Loop (HITL) steps. Key features include:
-
-*   A complete React frontend and ADK-powered FastAPI backend
-*   Advanced agentic workflow where the agent strategizes a multi-step plan, reflects on findings to identify gaps, and synthesizes a final, comprehensive report.
-*   Iterative and Human-in-the-Loop research that involves the user for plan approval, then autonomously loops through searching and refining results.
-
 ### Agentic RAG (`agentic_rag`)
 
 Built on the ADK, this template implements [Retrieval-Augmented Generation (RAG)](https://cloud.google.com/use-cases/retrieval-augmented-generation?hl=en) with a production-ready data ingestion pipeline for document-based question answering. It allows you to ingest, process, and embed custom data to enhance response relevance. Features include:

{agent_starter_pack-0.11.0 → agent_starter_pack-0.11.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "agent-starter-pack"
-version = "0.11.0"
+version = "0.11.2"
 description = "CLI to bootstrap production-ready Google Cloud GenAI agent projects from templates."
 authors = [
     { name = "Google LLC", email = "agent-starter-pack@google.com" },

{agent_starter_pack-0.11.0 → agent_starter_pack-0.11.2}/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 %}

{agent_starter_pack-0.11.0 → agent_starter_pack-0.11.2}/src/base_template/deployment/terraform/iam.tf

@@ -44,19 +44,7 @@ resource "google_project_iam_member" "other_projects_roles" {
   member     = "serviceAccount:${resource.google_service_account.cicd_runner_sa.email}"
   depends_on = [resource.google_project_service.cicd_services, resource.google_project_service.deploy_project_services]
 }
-{% if cookiecutter.deployment_target == 'cloud_run' %}
-# 3. Allow Cloud Run service SA to pull containers stored in the CICD project
-resource "google_project_iam_member" "cicd_run_invoker_artifact_registry_reader" {
-  for_each = local.deploy_project_ids
-  project  = var.cicd_runner_project_id
-
-  role       = "roles/artifactregistry.reader"
-  member     = "serviceAccount:service-${data.google_project.projects[each.key].number}@serverless-robot-prod.iam.gserviceaccount.com"
-  depends_on = [resource.google_project_service.cicd_services, resource.google_project_service.deploy_project_services]
-
-}
-
-# 4. Grant application SA the required permissions to run the application
+# 3. Grant application SA the required permissions to run the application
 resource "google_project_iam_member" "app_sa_roles" {
   for_each = {
     for pair in setproduct(keys(local.deploy_project_ids), var.app_sa_roles) :
@@ -72,33 +60,21 @@ resource "google_project_iam_member" "app_sa_roles" {
   depends_on = [resource.google_project_service.cicd_services, resource.google_project_service.deploy_project_services]
 }
 
-{% endif %}
-
-{% if cookiecutter.deployment_target == 'agent_engine' %}
-resource "google_project_service_identity" "vertex_sa" {
+{% if cookiecutter.deployment_target == 'cloud_run' %}
+# 4. Allow Cloud Run service SA to pull containers stored in the CICD project
+resource "google_project_iam_member" "cicd_run_invoker_artifact_registry_reader" {
   for_each = local.deploy_project_ids
-  provider = google-beta
-  project  = each.value
-  service  = "aiplatform.googleapis.com"
-}
+  project  = var.cicd_runner_project_id
 
-# 5. Grant required permissions to Vertex AI Service Agent SA for Agent Engine
-resource "google_project_iam_member" "vertex_ai_sa_permissions" {
-  for_each = {
-    for pair in setproduct(keys(local.deploy_project_ids), var.app_sa_roles) :
-    "${pair[0]}_${pair[1]}" => {
-      project = local.deploy_project_ids[pair[0]]
-      role = pair[1]
-    }
-  }
+  role       = "roles/artifactregistry.reader"
+  member     = "serviceAccount:service-${data.google_project.projects[each.key].number}@serverless-robot-prod.iam.gserviceaccount.com"
+  depends_on = [resource.google_project_service.cicd_services, resource.google_project_service.deploy_project_services]
 
-  project     = each.value.project
-  role        = each.value.role
-  member      = "serviceAccount:service-${data.google_project.projects[split("_", each.key)[0]].number}@gcp-sa-aiplatform-re.iam.gserviceaccount.com"
-  depends_on  = [resource.google_project_service.deploy_project_services, resource.google_project_service_identity.vertex_sa]
 }
+
 {% endif %}
 
+
 # Special assignment: Allow the CICD SA to create tokens
 resource "google_service_account_iam_member" "cicd_run_invoker_token_creator" {
   service_account_id = google_service_account.cicd_runner_sa.name

{agent_starter_pack-0.11.0 → agent_starter_pack-0.11.2}/src/base_template/deployment/terraform/variables.tf

@@ -70,15 +70,15 @@ variable "app_sa_roles" {
   description = "List of roles to assign to the application service account"
   type        = list(string)
   default = [
-{%- if cookiecutter.deployment_target == 'cloud_run' %}
-    "roles/run.invoker",
+{%- 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.deployment_target == 'cloud_run' %}

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

@@ -64,10 +64,12 @@ jobs:
         uses: 'google-github-actions/setup-gcloud@v2'
 {%- endif %}
 
+{%- if cookiecutter.deployment_target == 'agent_engine' %}
       - name: Install uv and dependencies
         run: |
           pip install uv==0.6.12
           uv sync --locked
+{%- endif %}
 
 {%- if cookiecutter.data_ingestion %}
       - name: Deploy data ingestion pipeline (Production)

{agent_starter_pack-0.11.0 → agent_starter_pack-0.11.2}/src/cli/commands/enhance.py

@@ -16,8 +16,10 @@ import pathlib
 
 import click
 from rich.console import Console
+from rich.prompt import IntPrompt
 
 from ..utils.logging import display_welcome_banner, handle_cli_error
+from ..utils.template import get_available_agents
 from .create import (
     create,
     get_available_base_templates,
@@ -28,6 +30,48 @@ from .create import (
 console = Console()
 
 
+def display_base_template_selection(current_base: str) -> str:
+    """Display available base templates and prompt for selection."""
+    agents = get_available_agents()
+
+    if not agents:
+        raise click.ClickException("No base templates available")
+
+    console.print()
+    console.print("🔧 [bold]Base Template Selection[/bold]")
+    console.print()
+    console.print(f"Your project currently inherits from: [cyan]{current_base}[/cyan]")
+    console.print("Available base templates:")
+
+    # Create a mapping of choices to agent names
+    template_choices = {}
+    choice_num = 1
+    current_choice = None
+
+    for _num, agent in agents.items():
+        template_choices[choice_num] = agent["name"]
+        current_indicator = " (current)" if agent["name"] == current_base else ""
+        console.print(
+            f"  {choice_num}. [bold]{agent['name']}[/]{current_indicator} - [dim]{agent['description']}[/]"
+        )
+        if agent["name"] == current_base:
+            current_choice = choice_num
+        choice_num += 1
+
+    if current_choice is None:
+        current_choice = 1
+
+    console.print()
+    choice = IntPrompt.ask(
+        "Select base template", default=current_choice, show_default=True
+    )
+
+    if choice in template_choices:
+        return template_choices[choice]
+    else:
+        raise ValueError(f"Invalid base template selection: {choice}")
+
+
 @click.command()
 @click.pass_context
 @click.argument(
@@ -155,25 +199,35 @@ def enhance(
         # Load config from current directory for inheritance info
         current_dir = pathlib.Path.cwd()
         source_config = load_remote_template_config(current_dir, cli_overrides)
-        base_template_name = get_base_template_name(source_config)
-
-        console.print()
-        console.print(
-            f"Template inherits from base: [cyan][link=https://github.com/GoogleCloudPlatform/agent-starter-pack/tree/main/agents/{base_template_name}]{base_template_name}[/link][/cyan]"
-        )
+        original_base_template_name = get_base_template_name(source_config)
 
-        # Show available alternatives and guidance
-        available_bases = get_available_base_templates()
-        if len(available_bases) > 1:
-            other_bases = [b for b in available_bases if b != base_template_name]
-            if other_bases:
-                console.print(
-                    f"[dim]💡 To use a different base template (e.g., {', '.join(other_bases[:2])}), use:[/dim]"
-                )
+        # Interactive base template selection if not provided via CLI and not auto-approved
+        if not base_template and not auto_approve:
+            selected_base_template = display_base_template_selection(
+                original_base_template_name
+            )
+            if selected_base_template != original_base_template_name:
+                # Update CLI overrides with the selected base template
+                cli_overrides["base_template"] = selected_base_template
+                base_template = selected_base_template
                 console.print(
-                    "[dim]   asp enhance . --base-template langgraph_base_react[/dim]"
+                    f"✅ Selected base template: [cyan]{selected_base_template}[/cyan]"
                 )
-        console.print()
+                console.print()
+
+        # Reload config with potential base template override
+        if cli_overrides.get("base_template"):
+            source_config = load_remote_template_config(current_dir, cli_overrides)
+
+        base_template_name = get_base_template_name(source_config)
+
+        # Show current inheritance info
+        if not auto_approve or base_template:
+            console.print()
+            console.print(
+                f"Template inherits from base: [cyan][link=https://github.com/GoogleCloudPlatform/agent-starter-pack/tree/main/agents/{base_template_name}]{base_template_name}[/link][/cyan]"
+            )
+            console.print()
 
     # Validate project structure when using current directory template
     if template_path == pathlib.Path("."):

{agent_starter_pack-0.11.0 → agent_starter_pack-0.11.2}/src/cli/commands/setup_cicd.py

@@ -48,7 +48,7 @@ def display_intro_message() -> None:
         "This command helps set up a basic CI/CD pipeline for development and testing purposes."
     )
     console.print("It will:")
-    console.print("- Create a GitHub repository and connect it to Cloud Build")
+    console.print("- Create a GitHub repository and connect it to your CI/CD runner")
     console.print("- Set up development environment infrastructure")
     console.print("- Configure basic CI/CD triggers for PR checks and deployments")
     console.print(
@@ -218,6 +218,34 @@ def validate_working_directory() -> None:
         )
 
 
+def detect_region_from_terraform_vars() -> str | None:
+    """Detect region from Terraform vars file.
+
+    Returns:
+        str | None: The detected region, or None if not found or is default
+    """
+    try:
+        tf_vars_path = Path("deployment/terraform/vars/env.tfvars")
+        if not tf_vars_path.exists():
+            return None
+
+        with open(tf_vars_path, encoding="utf-8") as f:
+            content = f.read()
+
+        # Look for region = "value" pattern
+        region_match = re.search(r'region\s*=\s*"([^"]+)"', content)
+        if region_match:
+            detected_region = region_match.group(1)
+            # Don't auto-detect if it's the default value
+            if detected_region != "us-central1":
+                return detected_region
+
+        return None
+    except Exception:
+        # If any error occurs, return None to use default
+        return None
+
+
 def update_build_triggers(tf_dir: Path) -> None:
     """Update build triggers configuration."""
     build_triggers_path = tf_dir / "build_triggers.tf"
@@ -427,7 +455,9 @@ console = Console()
 @click.option(
     "--cicd-project", help="CICD project ID (defaults to prod project if not specified)"
 )
-@click.option("--region", default="us-central1", help="GCP region")
+@click.option(
+    "--region", help="GCP region (auto-detects from Terraform vars if not specified)"
+)
 @click.option("--repository-name", help="Repository name (optional)")
 @click.option(
     "--repository-owner",
@@ -468,7 +498,7 @@ def setup_cicd(
     staging_project: str | None,
     prod_project: str | None,
     cicd_project: str | None,
-    region: str,
+    region: str | None,
     repository_name: str | None,
     repository_owner: str | None,
     host_connection_name: str | None,
@@ -502,23 +532,24 @@ def setup_cicd(
         cicd_project = prod_project
         console.print(f"Using production project '{prod_project}' for CI/CD resources")
 
-    console.print(
-        "\n⚠️  WARNING: The setup-cicd command is experimental and may have unexpected behavior.",
-        style="bold yellow",
-    )
-    console.print("Please report any issues you encounter.\n")
+    # Auto-detect region if not provided
+    if region is None:
+        detected_region = detect_region_from_terraform_vars()
+        if detected_region:
+            region = detected_region
+            console.print(f"Auto-detected region from Terraform vars: {region}")
+        else:
+            region = "us-central1"
+            console.print(f"Using default region: {region}")
+    else:
+        console.print(f"Using provided region: {region}")
 
-    console.print("\n📋 About this command:", style="bold blue")
-    console.print(
-        "This command helps set up a basic CI/CD pipeline for development and testing purposes."
-    )
-    console.print("It will:")
-    console.print("- Create a GitHub repository and connect it to Cloud Build")
-    console.print("- Set up development environment infrastructure")
-    console.print("- Configure basic CI/CD triggers for PR checks and deployments")
-    console.print(
-        "- Configure remote Terraform state in GCS (use --local-state to use local state instead)"
-    )
+    # Auto-detect CI/CD runner based on Terraform files (moved earlier)
+    tf_dir = Path("deployment/terraform")
+    is_github_actions = (tf_dir / "wif.tf").exists() and (tf_dir / "github.tf").exists()
+    cicd_runner = "github_actions" if is_github_actions else "google_cloud_build"
+
+    display_intro_message()
 
     console.print("\n⚡ Production Setup Note:", style="bold yellow")
     console.print(
@@ -537,28 +568,6 @@ def setup_cicd(
             console.print("\n🛑 Setup cancelled by user", style="bold yellow")
             return
 
-    console.print(
-        "This command helps set up a basic CI/CD pipeline for development and testing purposes."
-    )
-    console.print("It will:")
-    console.print("- Create a GitHub repository and connect it to Cloud Build")
-    console.print("- Set up development environment infrastructure")
-    console.print("- Configure basic CI/CD triggers for PR checks and deployments")
-    console.print(
-        "- Configure remote Terraform state in GCS (use --local-state to use local state instead)"
-    )
-
-    console.print("\n⚡ Production Setup Note:", style="bold yellow")
-    console.print(
-        "For production deployments and maximum flexibility, we recommend following"
-    )
-    console.print("the manual setup instructions in deployment/README.md")
-    console.print("This will give you more control over:")
-    console.print("- Security configurations")
-    console.print("- Custom deployment workflows")
-    console.print("- Environment-specific settings")
-    console.print("- Advanced CI/CD pipeline customization\n")
-
     if debug:
         logging.basicConfig(level=logging.DEBUG)
         console.print("> Debug mode enabled")