Initial plan

contributing/samples/adk_agent_builder_assistant/__init__.py

@@ -18,10 +18,9 @@ This package provides an intelligent assistant for building multi-agent systems
 using YAML configurations. It can be used directly as an agent or integrated
 with ADK tools and web interfaces.
 """
-from __future__ import annotations
 
 from . import agent  # Import to make agent.root_agent available
-from .adk_agent_builder_assistant import AgentBuilderAssistant
+from .agent_builder_assistant import AgentBuilderAssistant
 
 __all__ = [
     'AgentBuilderAssistant',

contributing/samples/adk_agent_builder_assistant/agent.py

@@ -13,9 +13,8 @@
 # limitations under the License.
 
 """Agent Builder Assistant instance for ADK web testing."""
-from __future__ import annotations
 
-from .adk_agent_builder_assistant import AgentBuilderAssistant
+from .agent_builder_assistant import AgentBuilderAssistant
 
 # Create the agent instance using the factory
 # The root_agent variable is what ADK looks for when loading agents

contributing/samples/adk_agent_builder_assistant/agent_builder_assistant.py

@@ -13,7 +13,6 @@
 # limitations under the License.
 
 """Agent factory for creating Agent Builder Assistant with embedded schema."""
-from __future__ import annotations
 
 from pathlib import Path
 import textwrap
@@ -416,8 +415,3 @@ class AgentBuilderAssistant:
 
     with open(template_path, "r", encoding="utf-8") as f:
       return f.read()
-
-
-# Expose a module-level root_agent so the AgentLoader can find this built-in
-# assistant when requested as "__adk_agent_builder_assistant".
-root_agent = AgentBuilderAssistant.create_agent()

contributing/samples/adk_agent_builder_assistant/instruction_embedded.template

@@ -75,9 +75,6 @@ Always reference this schema when creating configurations to ensure compliance.
 - **CRITICAL TIMING**: Ask for model selection IMMEDIATELY after determining LlmAgent is needed, BEFORE presenting any design
 - **MANDATORY CONFIRMATION**: Say "Please confirm what model you want to use" - do NOT assume or suggest defaults
 - **EXAMPLES**: "gemini-2.5-flash", "gemini-2.5-pro", etc.
-- **ALLOWED MODELS ONLY**: Only mention or propose "gemini-2.5-flash" or
-  "gemini-2.5-pro". Treat any request for gemini-1.5-* or older models as
-  unsupported and redirect to one of the 2.5 options.
 - **RATIONALE**: Only LlmAgent requires model specification; workflow agents do not
 - **DEFAULT MODEL**: If user says "use default" or "proceed with default model", use: {default_model}
   * This is the actual model name, NOT the literal string "default"

contributing/samples/adk_agent_builder_assistant/sub_agents/__init__.py

@@ -13,7 +13,6 @@
 # limitations under the License.
 
 """Sub-agents for Agent Builder Assistant."""
-from __future__ import annotations
 
 from .google_search_agent import create_google_search_agent
 from .url_context_agent import create_url_context_agent

contributing/samples/adk_agent_builder_assistant/sub_agents/google_search_agent.py

@@ -13,7 +13,6 @@
 # limitations under the License.
 
 """Sub-agent for Google Search functionality."""
-from __future__ import annotations
 
 from google.adk.agents import LlmAgent
 from google.adk.tools import google_search

contributing/samples/adk_agent_builder_assistant/sub_agents/url_context_agent.py

@@ -13,7 +13,6 @@
 # limitations under the License.
 
 """Sub-agent for URL context fetching functionality."""
-from __future__ import annotations
 
 from google.adk.agents import LlmAgent
 from google.adk.tools import url_context

contributing/samples/adk_agent_builder_assistant/tools/__init__.py

@@ -13,7 +13,6 @@
 # limitations under the License.
 
 """Tools for Agent Builder Assistant."""
-from __future__ import annotations
 
 from .cleanup_unused_files import cleanup_unused_files
 from .delete_files import delete_files

contributing/samples/adk_agent_builder_assistant/tools/delete_files.py

@@ -13,7 +13,6 @@
 # limitations under the License.
 
 """File deletion tool for Agent Builder Assistant."""
-from __future__ import annotations
 
 from datetime import datetime
 from pathlib import Path

contributing/samples/adk_agent_builder_assistant/tools/explore_project.py

@@ -13,7 +13,6 @@
 # limitations under the License.
 
 """Project explorer tool for analyzing structure and suggesting file paths."""
-from __future__ import annotations
 
 from pathlib import Path
 from typing import Any

contributing/samples/adk_agent_builder_assistant/tools/query_schema.py

@@ -13,7 +13,6 @@
 # limitations under the License.
 
 """ADK AgentConfig schema query tool for dynamic schema information access."""
-from __future__ import annotations
 
 from typing import Any
 from typing import Dict

contributing/samples/adk_agent_builder_assistant/tools/read_config_files.py

@@ -13,7 +13,6 @@
 # limitations under the License.
 
 """Configuration file reader tool for existing YAML configs."""
-from __future__ import annotations
 
 from pathlib import Path
 from typing import Any

contributing/samples/adk_agent_builder_assistant/tools/read_files.py

@@ -13,7 +13,6 @@
 # limitations under the License.
 
 """File reading tool for Agent Builder Assistant."""
-from __future__ import annotations
 
 from pathlib import Path
 from typing import Any

contributing/samples/adk_agent_builder_assistant/tools/search_adk_knowledge.py

@@ -13,7 +13,6 @@
 # limitations under the License.
 
 """ADK knowledge search tool."""
-from __future__ import annotations
 
 from typing import Any
 import uuid

contributing/samples/adk_agent_builder_assistant/tools/search_adk_source.py

@@ -13,7 +13,6 @@
 # limitations under the License.
 
 """ADK source code search tool for Agent Builder Assistant."""
-from __future__ import annotations
 
 from pathlib import Path
 import re

contributing/samples/adk_agent_builder_assistant/tools/write_config_files.py

@@ -31,7 +31,6 @@ import jsonschema
 import yaml
 
 from ..utils import load_agent_config_schema
-from ..utils.path_normalizer import sanitize_generated_file_path
 from ..utils.resolve_root_directory import resolve_file_path
 from .write_files import write_files
 
@@ -178,9 +177,8 @@ async def write_config_files(
 
   # Step 1: Validate all configs before writing any files
   for file_path, config_content in configs.items():
-    normalized_input_path = sanitize_generated_file_path(file_path)
     file_result = _validate_single_config(
-        normalized_input_path, config_content, project_folder_name
+        file_path, config_content, project_folder_name
     )
     result["files"][file_path] = file_result
 
@@ -199,7 +197,7 @@ async def write_config_files(
           rename_applied,
           sanitized_name,
           rename_warning,
-      ) = _determine_target_file_path(normalized_input_path, agent_name)
+      ) = _determine_target_file_path(file_path, agent_name)
 
       file_result["target_file_path"] = target_path
       file_result["rename_applied"] = rename_applied

contributing/samples/adk_agent_builder_assistant/tools/write_files.py

@@ -13,7 +13,6 @@
 # limitations under the License.
 
 """File writing tool for Agent Builder Assistant."""
-from __future__ import annotations
 
 from datetime import datetime
 from pathlib import Path