fix: enhance cmd (#286)

* fix: enhance cmd

* fix: enhance cmd

Author: eliasecchig

docs/agents/overview.md

@@ -8,7 +8,6 @@ The Agent Starter Pack follows a "bring your own agent" approach. It provides se
 | Agent Name | Description | Use Case |
 |------------|-------------|----------|
 | `adk_base` | A base ReAct agent implemented using Google's [Agent Development Kit](https://github.com/google/adk-python) | General purpose conversational agent |
-| `adk_gemini_fullstack` | A production-ready fullstack research agent with Gemini | Complex research and information synthesis |
 | `agentic_rag` | A RAG agent for document retrieval and Q&A | Document search and question answering |
 | `langgraph_base_react` | A base ReAct agent using LangGraph | Graph based conversational agent |
 | `crewai_coding_crew` | A multi-agent system implemented with CrewAI | Collaborative coding assistance |

docs/cli/create.md

@@ -35,8 +35,8 @@ uvx agent-starter-pack create my-agent -a github.com/user/repo@main
 # ADK samples shortcut
 uvx agent-starter-pack create my-agent -a adk@gemini-fullstack
 
-# Local templates
-uvx agent-starter-pack create my-agent -a local@./path/to/template
+# Use your existing project as source
+uvx agent-starter-pack create my-agent -a local@./path/to/project
 ```
 
 If omitted, you'll see an interactive list of available agents.
@@ -135,8 +135,8 @@ uvx agent-starter-pack create my-agent -a https://github.com/user/my-template
 # Use shorthand notation with branch
 uvx agent-starter-pack create my-agent -a github.com/user/template@develop
 
-# Test local template
-uvx agent-starter-pack create my-agent -a local@./my-template
+# Use your existing project  
+uvx agent-starter-pack create my-agent -a local@./my-project
 ```
 
 ### Advanced Configuration

docs/cli/enhance.md

@@ -18,8 +18,15 @@ uvx agent-starter-pack enhance [TEMPLATE_PATH] [OPTIONS]
 
 ## Options
 
-The `enhance` command supports all the same options as [`create`](./create.md), including:
+The `enhance` command supports all the same options as [`create`](./create.md), plus:
 
+### `--base-template` TEMPLATE
+Override the base template for inheritance when enhancing your existing project. Available base templates include:
+- `adk_base` - Basic agent template (default)
+- `langgraph_base_react` - LangGraph-based ReAct agent
+- `agentic_rag` - RAG-enabled agent template
+
+### Other Options
 - `--name, -n` - Project name (defaults to current directory name)
 - `--deployment-target, -d` - Deployment target (`agent_engine`, `cloud_run`)
 - `--include-data-ingestion, -i` - Include data ingestion pipeline
@@ -55,6 +62,16 @@ uvx agent-starter-pack enhance --include-data-ingestion --datastore alloydb
 uvx agent-starter-pack enhance --session-type alloydb
 ```
 
+### Base Template Inheritance
+
+```bash
+# Enhance current project with LangGraph capabilities
+uvx agent-starter-pack enhance . --base-template langgraph_base_react
+
+# Enhance with RAG-enabled base template
+uvx agent-starter-pack enhance . --base-template agentic_rag
+```
+
 ## Project Structure Validation
 
 The enhance command validates your project structure and provides guidance:
@@ -87,6 +104,23 @@ It automatically:
 - Validates the project structure for compatibility
 - Applies the same file merging logic as the `create` command
 
+### Base Template Inheritance
+
+When enhancing your existing project (using `local@.` or `local@/path/to/project`), the enhance command will:
+
+1. **Show current inheritance**: Display which base template your project inherits from
+2. **Provide guidance**: Show available alternative base templates and how to use them
+3. **Support CLI override**: Use `--base-template` to override the base template specified in `pyproject.toml`
+
+The inheritance hierarchy works as follows:
+```
+Your Existing Project
+    ↓ (inherits from)
+Base Template (adk_base, langgraph_base_react, etc.)
+    ↓ (provides)
+Core Infrastructure & Capabilities
+```
+
 ## Use Cases
 
 **Prototype to Production:**
@@ -111,6 +145,9 @@ uvx agent-starter-pack enhance --include-data-ingestion --datastore alloydb
 ```bash
 # Upgrade from basic to advanced agent template
 uvx agent-starter-pack enhance adk@gemini-fullstack
+
+# Or change base template inheritance
+uvx agent-starter-pack enhance . --base-template langgraph_base_react
 ```
 
 ## Automatic Backup

docs/remote-templates/using-remote-templates.md

@@ -32,8 +32,8 @@ uvx agent-starter-pack create my-agent -a github.com/user/my-template@main
 # Use official ADK samples
 uvx agent-starter-pack create my-agent -a adk@gemini-fullstack
 
-# Test local templates
-uvx agent-starter-pack create my-agent -a local@./path/to/template
+# Use your existing project
+uvx agent-starter-pack create my-agent -a local@./path/to/project
 ```
 
 The system automatically handles the rest - fetching the template, applying intelligent defaults, and generating your production-ready agent.
@@ -70,11 +70,11 @@ uvx agent-starter-pack create my-agent -a adk@data-science
 uvx agent-starter-pack create my-agent -a adk@chat-agent
 ```
 
-### Local Templates
+### Your Existing Projects
 ```bash
-# Test templates on your local machine
-uvx agent-starter-pack create my-test-agent -a local@./path/to/your/template
-uvx agent-starter-pack create my-test-agent -a local@/absolute/path/to/template
+# Use your existing project as source
+uvx agent-starter-pack create my-test-agent -a local@./path/to/your/project
+uvx agent-starter-pack create my-test-agent -a local@/absolute/path/to/project
 ```
 
 ## Advanced Usage

src/cli/commands/create.py

@@ -104,6 +104,62 @@ def shared_template_options(f: Callable) -> Callable:
     return f
 
 
+def get_available_base_templates() -> list[str]:
+    """Get list of available base templates for inheritance.
+
+    Returns:
+        List of base template names.
+    """
+    agents = get_available_agents()
+    return sorted([agent_info["name"] for agent_info in agents.values()])
+
+
+def validate_base_template(base_template: str) -> bool:
+    """Validate that a base template exists.
+
+    Args:
+        base_template: Name of the base template to validate
+
+    Returns:
+        True if the base template exists, False otherwise
+    """
+    available_templates = get_available_base_templates()
+    return base_template in available_templates
+
+
+def get_standard_ignore_patterns() -> Callable[[str, list[str]], list[str]]:
+    """Get standard ignore patterns for copying directories.
+
+    Returns:
+        A callable that can be used with shutil.copytree's ignore parameter.
+    """
+    exclude_dirs = {
+        ".git",
+        ".venv",
+        "venv",
+        "__pycache__",
+        ".pytest_cache",
+        "node_modules",
+        ".next",
+        "dist",
+        "build",
+        ".DS_Store",
+        ".vscode",
+        ".idea",
+        "*.egg-info",
+        ".mypy_cache",
+        ".coverage",
+        "htmlcov",
+        ".tox",
+        ".cache",
+    }
+
+    def ignore_patterns(dir: str, files: list[str]) -> list[str]:
+        return [f for f in files if f in exclude_dirs or f.startswith(".backup_")]
+
+    return ignore_patterns
+
+
 def normalize_project_name(project_name: str) -> str:
     """Normalize project name for better compatibility with cloud resources and tools."""
 
@@ -176,6 +232,7 @@ def create(
     region: str,
     skip_checks: bool,
     in_folder: bool,
+    base_template: str | None = None,
     skip_welcome: bool = False,
 ) -> None:
     """Create GCP-based AI agent projects from templates."""
@@ -210,14 +267,14 @@ def create(
 
             # Create backup of entire directory before in-folder templating
             timestamp = datetime.datetime.now().strftime("%Y%m%d_%H%M%S")
-            backup_dir = (
-                project_path.parent / f".backup_{project_path.name}_{timestamp}"
-            )
+            backup_dir = project_path / f".backup_{project_path.name}_{timestamp}"
 
-            console.print("📦 [blue]Creating backup before enhancement...[/blue]")
+            console.print("📦 [blue]Creating backup before modification...[/blue]")
 
             try:
-                shutil.copytree(project_path, backup_dir)
+                shutil.copytree(
+                    project_path, backup_dir, ignore=get_standard_ignore_patterns()
+                )
                 console.print(f"Backup created: [cyan]{backup_dir.name}[/cyan]")
             except Exception as e:
                 console.print(
@@ -257,7 +314,11 @@ def create(
                 temp_dir = tempfile.mkdtemp(prefix="asp_local_template_")
                 temp_dir_to_clean = temp_dir
                 template_source_path = pathlib.Path(temp_dir) / local_path.name
-                shutil.copytree(local_path, template_source_path)
+                shutil.copytree(
+                    local_path,
+                    template_source_path,
+                    ignore=get_standard_ignore_patterns(),
+                )
 
                 selected_agent = f"local_{template_source_path.name}"
                 console.print(f"Using local template: {local_path}")
@@ -334,15 +395,25 @@ def create(
 
         # Load template configuration based on whether it's remote or local
         if template_source_path:
+            # Prepare CLI overrides for remote template config
+            cli_overrides = {}
+            if base_template:
+                cli_overrides["base_template"] = base_template
+
             # Load remote template config
-            source_config = load_remote_template_config(template_source_path)
+            source_config = load_remote_template_config(
+                template_source_path, cli_overrides
+            )
 
             # Remote templates now work even without pyproject.toml thanks to defaults
             if debug and source_config:
                 logging.debug(f"Final remote template config: {source_config}")
 
             # Load base template config for inheritance
             base_template_name = get_base_template_name(source_config)
+            if debug:
+                logging.debug(f"Using base template: {base_template_name}")
+
             base_template_path = (
                 pathlib.Path(__file__).parent.parent.parent.parent
                 / "agents"