agent-starter-pack 0.11.1__py3-none-any.whl → 0.12.0__py3-none-any.whl

src/base_template/deployment/terraform/{% if cookiecutter.cicd_runner == 'google_cloud_build' %}build_triggers.tf{% else %}unused_build_triggers.tf{% endif %}

@@ -29,7 +29,7 @@ resource "google_cloudbuild_trigger" "pr_checks" {
 
   filename = ".cloudbuild/pr_checks.yaml"
   included_files = [
-    "app/**",
+    "{{cookiecutter.agent_directory}}/**",
     "data_ingestion/**",
     "tests/**",
     "deployment/**",
@@ -64,7 +64,7 @@ resource "google_cloudbuild_trigger" "cd_pipeline" {
 
   filename = ".cloudbuild/staging.yaml"
   included_files = [
-    "app/**",
+    "{{cookiecutter.agent_directory}}/**",
     "data_ingestion/**",
     "tests/**",
     "deployment/**",

src/base_template/pyproject.toml

@@ -75,7 +75,7 @@ select = [
 ignore = ["E501", "C901"] # ignore line too long, too complex
 
 [tool.ruff.lint.isort]
-known-first-party = ["app", "frontend"]
+known-first-party = ["{{cookiecutter.agent_directory}}", "frontend"]
 
 [tool.mypy]
 disallow_untyped_calls = true
@@ -113,4 +113,4 @@ pythonpath = "."
 asyncio_default_fixture_loop_scope = "function"
 
 [tool.hatch.build.targets.wheel]
-packages = ["app","frontend"]
+packages = ["{{cookiecutter.agent_directory}}","frontend"]

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

@@ -108,7 +108,7 @@ 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 app/agent_engine_app.py \
+          uv run {{cookiecutter.agent_directory}}/agent_engine_app.py \
             --project {% raw %}${{ vars.PROD_PROJECT_ID }}{% endraw %} \
             --location {% raw %}${{ vars.REGION }}{% endraw %} \
             --service-account {% raw %}${{ vars.APP_SA_EMAIL_PROD }}{% endraw %} \

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

@@ -19,7 +19,7 @@ on:
     branches:
       - main
     paths:
-      - 'app/**'
+      - '{{cookiecutter.agent_directory}}/**'
       - 'data_ingestion/**'
       - 'tests/**'
       - 'deployment/**'

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

@@ -19,7 +19,7 @@ on:
     branches:
       - main
     paths:
-      - 'app/**'
+      - '{{cookiecutter.agent_directory}}/**'
       - 'data_ingestion/**'
       - 'tests/**'
       - 'deployment/**'
@@ -119,7 +119,7 @@ jobs:
       - 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 app/agent_engine_app.py \
+          uv run {{cookiecutter.agent_directory}}/agent_engine_app.py \
             --project {% raw %}${{ vars.STAGING_PROJECT_ID }}{% endraw %} \
             --location {% raw %}${{ vars.REGION }}{% endraw %} \
             --service-account {% raw %}${{ vars.APP_SA_EMAIL_STAGING }}{% endraw %} \

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

@@ -74,7 +74,7 @@ steps:
       - "-c"
       - |
         uv export --no-hashes --no-sources --no-header --no-dev --no-emit-project --no-annotate --locked > .requirements.txt
-        uv run app/agent_engine_app.py \
+        uv run {{cookiecutter.agent_directory}}/agent_engine_app.py \
           --project ${_PROD_PROJECT_ID} \
           --location ${_REGION} \
           --service-account ${_APP_SA_EMAIL_PROD} \

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

@@ -108,7 +108,7 @@ steps:
       - "-c"
       - |
         uv export --no-hashes --no-sources --no-header --no-dev --no-emit-project --no-annotate --locked > .requirements.txt
-        uv run app/agent_engine_app.py \
+        uv run {{cookiecutter.agent_directory}}/agent_engine_app.py \
           --project ${_STAGING_PROJECT_ID} \
           --location ${_REGION} \
           --service-account ${_APP_SA_EMAIL_STAGING} \

src/cli/commands/create.py

@@ -19,10 +19,10 @@ import pathlib
 import shutil
 import subprocess
 import tempfile
+import tomllib
 from collections.abc import Callable
 
 import click
-import tomllib
 from click.core import ParameterSource
 from rich.console import Console
 from rich.prompt import IntPrompt, Prompt
@@ -101,6 +101,11 @@ def shared_template_options(f: Callable) -> Callable:
         type=click.Choice(["agent_engine", "cloud_run"]),
         help="Deployment target name",
     )(f)
+    f = click.option(
+        "--agent-directory",
+        "-dir",
+        help="Name of the agent directory (overrides template default)",
+    )(f)
     return f
 
 
@@ -232,8 +237,10 @@ def create(
     region: str,
     skip_checks: bool,
     in_folder: bool,
+    agent_directory: str | None,
     base_template: str | None = None,
     skip_welcome: bool = False,
+    cli_overrides: dict | None = None,
 ) -> None:
     """Create GCP-based AI agent projects from templates."""
     try:
@@ -434,6 +441,14 @@ def create(
                 / ".template"
             )
             config = load_template_config(template_path)
+
+            # Apply CLI overrides for local templates if provided (e.g., from enhance command)
+            if cli_overrides:
+                config = merge_template_configs(config, cli_overrides)
+                if debug:
+                    logging.debug(
+                        f"Applied CLI overrides to local template config: {cli_overrides}"
+                    )
         # Data ingestion and datastore selection
         if include_data_ingestion or datastore:
             include_data_ingestion = True
@@ -610,6 +625,13 @@ def create(
         if debug:
             logging.debug(f"Output directory: {destination_dir}")
 
+        # Construct CLI overrides for template processing
+        final_cli_overrides = cli_overrides or {}
+        if agent_directory:
+            if "settings" not in final_cli_overrides:
+                final_cli_overrides["settings"] = {}
+            final_cli_overrides["settings"]["agent_directory"] = agent_directory
+
         try:
             # Process template (handles both local and remote templates)
             process_template(
@@ -623,8 +645,9 @@ def create(
                 session_type=final_session_type,
                 output_dir=destination_dir,
                 remote_template_path=template_source_path,
-                remote_config=config if template_source_path else None,
+                remote_config=config,
                 in_folder=in_folder,
+                cli_overrides=final_cli_overrides,
             )
 
             # Replace region in all files if a different region was specified

src/cli/commands/enhance.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 import pathlib
+from typing import Any
 
 import click
 from rich.console import Console
@@ -48,7 +49,7 @@ def display_base_template_selection(current_base: str) -> str:
     choice_num = 1
     current_choice = None
 
-    for _num, agent in agents.items():
+    for agent in agents.values():
         template_choices[choice_num] = agent["name"]
         current_indicator = " (current)" if agent["name"] == current_base else ""
         console.print(
@@ -89,6 +90,10 @@ def display_base_template_selection(current_base: str) -> str:
     "--base-template",
     help="Base template to inherit from (e.g., adk_base, langgraph_base_react, agentic_rag)",
 )
+@click.option(
+    "--agent-directory",
+    help="Custom directory name for agent files (default: 'app' or auto-detected from pyproject.toml)",
+)
 @shared_template_options
 @handle_cli_error
 def enhance(
@@ -105,6 +110,7 @@ def enhance(
     region: str,
     skip_checks: bool,
     base_template: str | None,
+    agent_directory: str | None,
 ) -> None:
     """Enhance your existing project with AI agent capabilities.
 
@@ -113,7 +119,8 @@ def enhance(
     creating a new project directory.
 
     For best compatibility, your project should follow the agent-starter-pack structure
-    with agent code organized in an /app folder (containing agent.py, etc.).
+    with agent code organized in an agent directory (default: /app, configurable via
+    --agent-directory).
 
     TEMPLATE_PATH can be:
     - A local directory path (e.g., . for current directory)
@@ -191,10 +198,13 @@ def enhance(
             load_remote_template_config,
         )
 
-        # Prepare CLI overrides for base template
-        cli_overrides = {}
+        # Prepare CLI overrides for base template and agent directory
+        cli_overrides: dict[str, Any] = {}
         if base_template:
             cli_overrides["base_template"] = base_template
+        if agent_directory:
+            cli_overrides["settings"] = cli_overrides.get("settings", {})
+            cli_overrides["settings"]["agent_directory"] = agent_directory
 
         # Load config from current directory for inheritance info
         current_dir = pathlib.Path.cwd()
@@ -209,6 +219,10 @@ def enhance(
             if selected_base_template != original_base_template_name:
                 # Update CLI overrides with the selected base template
                 cli_overrides["base_template"] = selected_base_template
+                # Preserve agent_directory override if it was set
+                if agent_directory:
+                    cli_overrides["settings"] = cli_overrides.get("settings", {})
+                    cli_overrides["settings"]["agent_directory"] = agent_directory
                 base_template = selected_base_template
                 console.print(
                     f"✅ Selected base template: [cyan]{selected_base_template}[/cyan]"
@@ -232,9 +246,53 @@ def enhance(
     # Validate project structure when using current directory template
     if template_path == pathlib.Path("."):
         current_dir = pathlib.Path.cwd()
-        app_folder = current_dir / "app"
 
-        if not app_folder.exists() or not app_folder.is_dir():
+        # Determine agent directory: CLI param > pyproject.toml detection > default
+        detected_agent_directory = "app"  # default
+        if not agent_directory:  # Only try to detect if not provided via CLI
+            pyproject_path = current_dir / "pyproject.toml"
+            if pyproject_path.exists():
+                try:
+                    import tomllib
+
+                    with open(pyproject_path, "rb") as f:
+                        pyproject_data = tomllib.load(f)
+                    packages = (
+                        pyproject_data.get("tool", {})
+                        .get("hatch", {})
+                        .get("build", {})
+                        .get("targets", {})
+                        .get("wheel", {})
+                        .get("packages", [])
+                    )
+                    if packages:
+                        # Find the first package that isn't 'frontend'
+                        for pkg in packages:
+                            if pkg != "frontend":
+                                detected_agent_directory = pkg
+                                break
+                except Exception as e:
+                    if debug:
+                        console.print(
+                            f"[dim]Could not auto-detect agent directory: {e}[/dim]"
+                        )
+                    pass  # Fall back to default
+
+        final_agent_directory = agent_directory or detected_agent_directory
+
+        # Show info about agent directory selection
+        if agent_directory:
+            console.print(
+                f"ℹ️  Using CLI-specified agent directory: [cyan]{agent_directory}[/cyan]"
+            )
+        elif detected_agent_directory != "app":
+            console.print(
+                f"ℹ️  Auto-detected agent directory: [cyan]{detected_agent_directory}[/cyan]"
+            )
+
+        agent_folder = current_dir / final_agent_directory
+
+        if not agent_folder.exists() or not agent_folder.is_dir():
             console.print()
             console.print(
                 "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
@@ -245,42 +303,61 @@ def enhance(
             )
             console.print()
             console.print(
-                "📁 [bold]Expected Structure:[/bold] [cyan]/app[/cyan] folder containing your agent code"
+                f"📁 [bold]Expected Structure:[/bold] [cyan]/{final_agent_directory}[/cyan] folder containing your agent code"
             )
             console.print(f"📍 [bold]Current Directory:[/bold] {current_dir}")
-            console.print("❌ [bold red]Missing:[/bold red] /app folder")
+            console.print(
+                f"❌ [bold red]Missing:[/bold red] /{final_agent_directory} folder"
+            )
             console.print()
             console.print(
-                "[dim]The enhance command can still proceed, but for best compatibility"
-                " your agent code should be organized in an /app folder structure.[/dim]"
+                f"The enhance command can still proceed, but for best compatibility"
+                f" your agent code should be organized in a /{final_agent_directory} folder structure."
             )
             console.print()
 
             # Ask for confirmation after showing the structure warning
+            console.print("💡 Options:")
             console.print(
-                "💡 [dim]Consider creating an /app folder for better compatibility.[/dim]"
+                f"   • Create a /{final_agent_directory} folder and move your agent code there"
             )
+            if final_agent_directory == "app":
+                console.print(
+                    "   • Use [cyan]--agent-directory <custom_name>[/cyan] if your agent code is in a different directory"
+                )
+            else:
+                console.print(
+                    "   • Use [cyan]--agent-directory <custom_name>[/cyan] to specify your existing agent directory"
+                )
             console.print()
 
             if not auto_approve:
                 if not click.confirm(
-                    "Continue with enhancement despite missing /app folder?",
+                    f"Continue with enhancement despite missing /{final_agent_directory} folder?",
                     default=True,
                 ):
                     console.print("✋ [yellow]Enhancement cancelled.[/yellow]")
                     return
         else:
             # Check for common agent files
-            agent_py = app_folder / "agent.py"
+            agent_py = agent_folder / "agent.py"
             if agent_py.exists():
                 console.print(
-                    "Detected existing agent structure with [cyan]/app/agent.py[/cyan]"
+                    f"Detected existing agent structure with [cyan]/{final_agent_directory}/agent.py[/cyan]"
                 )
             else:
                 console.print(
-                    "ℹ️  [blue]Found /app folder[/blue] - ensure your agent code is properly organized within it"
+                    f"ℹ️  [blue]Found /{final_agent_directory} folder[/blue] - ensure your agent code is properly organized within it, including an agent.py file"
                 )
 
+    # Prepare CLI overrides to pass to create command
+    final_cli_overrides: dict[str, Any] = {}
+    if base_template:
+        final_cli_overrides["base_template"] = base_template
+    if agent_directory:
+        final_cli_overrides["settings"] = final_cli_overrides.get("settings", {})
+        final_cli_overrides["settings"]["agent_directory"] = agent_directory
+
     # Call the create command with in-folder mode enabled
     ctx.invoke(
         create,
@@ -297,6 +374,8 @@ def enhance(
         region=region,
         skip_checks=skip_checks,
         in_folder=True,  # Always use in-folder mode for enhance
+        agent_directory=agent_directory,
         base_template=base_template,
         skip_welcome=True,  # Skip welcome message since enhance shows its own
+        cli_overrides=final_cli_overrides if final_cli_overrides else None,
     )

src/cli/commands/list.py

@@ -14,9 +14,9 @@
 
 import logging
 import pathlib
+import tomllib
 
 import click
-import tomllib
 from rich.console import Console
 from rich.table import Table
 

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")

src/cli/utils/remote_template.py

@@ -19,10 +19,10 @@ import re
 import shutil
 import subprocess
 import tempfile
+import tomllib
 from dataclasses import dataclass
 from typing import Any
 
-import tomllib
 from jinja2 import Environment