fix: unbreak client closed errors when using vertexai session service

PiperOrigin-RevId: 811911528

.github/ISSUE_TEMPLATE/bug_report.md

@@ -14,11 +14,12 @@ assignees: ''
 A clear and concise description of what the bug is.
 
 **To Reproduce**
+Please share a minimal code and data to reproduce your problem.
 Steps to reproduce the behavior:
 1. Install '...'
 2. Run '....'
 3. Open '....'
-4. See error
+4. Provie error or stacktrace
 
 **Expected behavior**
 A clear and concise description of what you expected to happen.
@@ -27,12 +28,13 @@ A clear and concise description of what you expected to happen.
 If applicable, add screenshots to help explain your problem.
 
 **Desktop (please complete the following information):**
- - OS: [e.g. iOS]
+ - OS: [e.g. macOS, Linux, Windows]
  - Python version(python -V):
  - ADK version(pip show google-adk):
 
  **Model Information:**
- For example, which model is being used.
+ - Are you using LiteLLM: Yes/No
+ - Which model is being used(e.g. gemini-2.5-pro)
 
 **Additional context**
 Add any other context about the problem here.

.github/workflows/analyze-releases-for-adk-docs-updates.yml

@@ -0,0 +1,47 @@
+name: Analyze New Release for ADK Docs Updates
+
+on:
+  # Runs on every new release.
+  release:
+    types: [published]
+  # Manual trigger for testing and retrying.
+  workflow_dispatch:
+
+jobs:
+  analyze-new-release-for-adk-docs-updates:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      issues: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.11'
+
+      - name: Load adk-bot SSH Private Key
+        uses: webfactory/ssh-agent@v0.9.0
+        with:
+          ssh-private-key: ${{ secrets.ADK_BOT_SSH_PRIVATE_KEY }}
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install requests google-adk
+
+      - name: Run Analyzing Script
+        env:
+          GITHUB_TOKEN: ${{ secrets.ADK_TRIAGE_AGENT }}
+          GOOGLE_API_KEY: ${{ secrets.GOOGLE_API_KEY }}
+          GOOGLE_GENAI_USE_VERTEXAI: 0
+          DOC_OWNER: 'google'
+          CODE_OWNER: 'google'
+          DOC_REPO: 'adk-docs'
+          CODE_REPO: 'adk-python'
+          INTERACTIVE: 0
+          PYTHONPATH: contributing/samples/adk_documentation
+        run: python -m adk_release_analyzer.main

.github/workflows/discussion_answering.yml

@@ -3,10 +3,14 @@ name: ADK Answering Agent for Discussions
 on:
   discussion:
     types: [created]
+  discussion_comment:
+    types: [created]
 
 jobs:
   agent-answer-questions:
-    if: github.event.discussion.category.name == 'Q&A'
+    if: >-
+      (github.event_name == 'discussion' && github.event.discussion.category.name == 'Q&A') ||
+      (github.event_name == 'discussion_comment' && contains(github.event.comment.body, '@adk-bot') && github.event.sender.login != 'adk-bot')
     runs-on: ubuntu-latest
 
     steps:
@@ -41,6 +45,10 @@ jobs:
           OWNER: 'google'
           REPO: 'adk-python'
           INTERACTIVE: 0
-          DISCUSSION_NUMBER: ${{ github.event.discussion.number }}
           PYTHONPATH: contributing/samples
-        run: python -m adk_answering_agent.main
+        run: |
+          # Write discussion data to temporary file to avoid secret masking issues
+          cat > /tmp/discussion.json << 'EOF'
+          ${{ toJson(github.event.discussion) }}
+          EOF
+          python -m adk_answering_agent.main --discussion-file /tmp/discussion.json

.github/workflows/pr-triage.yml

@@ -6,6 +6,7 @@ on:
 
 jobs:
   agent-triage-pull-request:
+    if: "!contains(github.event.pull_request.labels.*.name, 'bot triaged') && !contains(github.event.pull_request.labels.*.name, 'google-contributor')"
     runs-on: ubuntu-latest
     permissions:
       pull-requests: write

AGENTS.md

@@ -17,6 +17,8 @@ Please refer to [ADK Project Overview and Architecture](https://github.com/googl
 - ADK live related configs are in [run_config.py](https://github.com/google/adk-python/blob/main/src/google/adk/agents/run_config.py).
 - ADK live under multi-agent scenario: we convert the audio into text. This text will be passed to next agent as context.
 - Most logics are in [base_llm_flow.py](https://github.com/google/adk-python/blob/main/src/google/adk/flows/llm_flows/base_llm_flow.py) and [gemini_llm_connection.py](https://github.com/google/adk-python/blob/main/src/google/adk/models/gemini_llm_connection.py).
+- Input transcription and output transcription should be added to session as Event.
+- User audio or model audio should be saved into artifacts with a reference in Event to it.
 - Tests are in [tests/unittests/streaming](https://github.com/google/adk-python/tree/main/tests/unittests/streaming).
 
 ## ADK: Style Guides

CHANGELOG.md

@@ -1,5 +1,173 @@
 # Changelog
 
+## [1.15.0](https://github.com/google/adk-python/compare/v1.14.1...v1.15.0) (2025-09-24)
+
+### Features
+
+* [Core]
+  * Adding the ContextFilterPlugin ([a06bf27](https://github.com/google/adk-python/commit/a06bf278cbc89f521c187ed51b032d82ffdafe2d))
+  * Adds plugin to save artifacts for issue [#2176](https://github.com/google/adk-python/issues/2176) ([657369c](https://github.com/google/adk-python/commit/657369cffe142ef3745cd5950d0d24a49f42f7fd))
+  * Expose log probs of candidates in LlmResponse ([f7bd3c1](https://github.com/google/adk-python/commit/f7bd3c111c211e880d7c1954dd4508b952704c68))
+* [Context Caching]
+  * Support context caching ([c66245a](https://github.com/google/adk-python/commit/c66245a3b80192c16cb67ee3194f82c9a7c901e5))
+    - Support explicit context caching auto creation and lifecycle management.
+
+      Usage: `App(root_agent=..., plugins=..., context_cache_config=...)`
+  * Support non-text content in static instruction ([61213ce](https://github.com/google/adk-python/commit/61213ce4d4c10f7ecaf6ddb521672059cee27942))
+  * Support static instructions ([9be9cc2](https://github.com/google/adk-python/commit/9be9cc2feee92241fd2fbf9dea3a42de5a78e9ce))
+    - Support static instruction that won't change, put at the beginning of
+      the instruction.
+      Static instruction support inline_data and file_data as contents.
+      Dynamic instruction moved to the end of LlmRequest, increasing prefix
+      caching matching size.
+
+      Usage:
+      `LlmAgent(model=...,static_instruction =types.Content(parts=...), ... )`
+* [Telemetry]
+  * Add --otel_to_cloud experimental support ([1ae0b82](https://github.com/google/adk-python/commit/1ae0b82f5602a57ad1ca975ca0b7c85003d1a28a), [b131268](https://github.com/google/adk-python/commit/b1312680f4ea9f21c3246a1d24392619643d71f5), [7870480](https://github.com/google/adk-python/commit/7870480c63bb4fc08cfb3cabc0e1f0458f0e85bd))
+  * Add GenAI Instrumentation if --otel_to_cloud is enabled ([cee365a](https://github.com/google/adk-python/commit/cee365a13d0d1b1f2be046c1cc29e24a8d1fdbcc))
+  * Support standard OTel env variables for exporter endpoints ([f157b2e](https://github.com/google/adk-python/commit/f157b2ee4caf4055e78f4657254e45913895f5de))
+  * Temporarily disable Cloud Monitoring integration in --otel_to_cloud ([3b80337](https://github.com/google/adk-python/commit/3b80337faf427460e4743e25dbb92578f823513f))
+* [Services]
+  * Add endpoint to generate memory from session ([2595824](https://github.com/google/adk-python/commit/25958242db890b4d2aac8612f7f7cfbb561727fa))
+* [Tools]
+  * Add Google Maps Grounding Tool to ADK ([6b49391](https://github.com/google/adk-python/commit/6b493915469ecb42068e24818ab547b0856e4709))
+  * **MCP:** Initialize tool_name_prefix in MCPToolse ([86dea5b](https://github.com/google/adk-python/commit/86dea5b53ac305367283b7e353b60d0f4515be3b))
+* [Evals]
+  * Data model for storing App Details and data model for steps ([01923a9](https://github.com/google/adk-python/commit/01923a9227895906ca8ae32712d65b178e2cd7d5))
+  * Adds Rubric based final response evaluator ([5a485b0](https://github.com/google/adk-python/commit/5a485b01cd64cb49735e13ebd5e7fa3da02cd85f))
+  * Populate AppDetails to each Invocation ([d486795](https://github.com/google/adk-python/commit/d48679582de91050ca9c5106402319be9a8ae7e8))
+* [Samples]
+  * Make the bigquery sample agent run with ADC out-of-the-box ([10cf377](https://github.com/google/adk-python/commit/10cf37749417856e394e62896231e41b13420f18))
+
+### Bug Fixes
+
+* Close runners after running eval ([86ee6e3](https://github.com/google/adk-python/commit/86ee6e3fa3690148d60358fc3dacb0e0ab40942b))
+* Filter out thought parts when saving agent output to state ([632bf8b](https://github.com/google/adk-python/commit/632bf8b0bcf18ff4e4505e4e5f4c626510f366a2))
+* Ignore empty function chunk in LiteLlm streaming response ([8a92fd1](https://github.com/google/adk-python/commit/8a92fd18b600da596c22fd80c6148511a136dfd0))
+* Introduces a `raw_mcp_tool` method in `McpTool` to provide direct access to the underlying MCP tool ([6158075](https://github.com/google/adk-python/commit/6158075a657f8fe0835679e509face6191905403))
+* Make a copy of the `columns` instead of modifying it in place ([aef1ee9](https://github.com/google/adk-python/commit/aef1ee97a55a310f3959d475b8d7d6bc3915ae48))
+* Prevent escaping of Latin characters in LLM response ([c9ea80a](https://github.com/google/adk-python/commit/c9ea80af28e586c9cc1f643b365cdba82f80c700))
+* Retain the consumers and transport registry when recreating the ClientFactory in remote_a2a_agent.py ([6bd33e1](https://github.com/google/adk-python/commit/6bd33e1be36f741a6ed0514197550f9f336262ed))
+* Remove unsupported 'type': 'unknown' in test_common.py for fastapi 0.117.1 ([3745221](https://github.com/google/adk-python/commit/374522197fa6843f786bfd12d17ce0fc20461dfd))
+
+### Documentation
+
+* Correct the documentation of `after_agent_callback` ([b9735b2](https://github.com/google/adk-python/commit/b9735b2193267645781b268231d63c23c6fec654))
+
+## [1.14.1](https://github.com/google/adk-python/compare/v1.14.0...v1.14.1) (2025-09-12)
+
+### Bug Fixes
+
+* Fix logging issues with RemoteA2aAgent [0c1f1fa](https://github.com/google/adk-python/commit/0c1f1fadeb5a6357af9cad0eff5d5e7103fc88b0)
+
+## [1.14.0](https://github.com/google/adk-python/compare/v1.13.0...v1.14.0) (2025-09-10)
+
+### Features
+
+* [A2A]
+  * Allow users to pass their own agent card to to_a2a method [a1679da](https://github.com/google/adk-python/commit/a1679dae3fef70f1231afba3e97d45b59c314ae3)
+  * Allow custom part converters in A2A classes [b05fef9](https://github.com/google/adk-python/commit/b05fef9ba71f95ab2658eb4eb5608c141d49f82f)
+* [Tools]
+  * Allow setting agent/application name and compute project for BigQuery tools [11a2ffe](https://github.com/google/adk-python/commit/11a2ffe35adbae977b49ceccf0e76e20c6dc90b6)
+  * Add BigQuery forecast tool [0935a40](https://github.com/google/adk-python/commit/0935a40011a3276ee7f7fa3b91678b4d63f22ba5)
+  * Add GkeCodeExecutor for sandboxed code execution on GKE [72ff9c6](https://github.com/google/adk-python/commit/72ff9c64a291aebb50b07446378f375e58882c4e)
+  * Add a tool confirmation flow that can guard tool execution with explicit confirmation and custom input [a17bcbb](https://github.com/google/adk-python/commit/a17bcbb2aa0f5c6aca460db96ed1cb7dd86fef84)
+  * Add audience and prompt as configurable for OAuth flows [edda922](https://github.com/google/adk-python/commit/edda922791f15ac37830ed95ebf76b9f836d9db4)
+  * Allow user specify embedding model for file retrieval [67f23df](https://github.com/google/adk-python/commit/67f23df25ad47aff3cb36d0fc9ce2c9b97bde09b)
+* [Core]
+  * Allow all possible values for `agent_class` field in all Agent Configs [3bc2d77](https://github.com/google/adk-python/commit/3bc2d77b4d180e9c42b30d4d1ce580aa75abe501)
+  * Allow agent loader to load built-in agents from special directories in adk folder [578fad7](https://github.com/google/adk-python/commit/578fad7034a7b369a490ad0afa4dd2820463c22d)
+  * Upgrade ADK runner to use App in addition to root_agent [4df79dd](https://github.com/google/adk-python/commit/4df79dd5c92d96096d031b26470458d0bca79a79)
+  * Allow inject artifact into instructions [bb4cfde](https://github.com/google/adk-python/commit/bb4cfdec12370955d4038d6d8c86e04691f2308e)
+* [Misc] Create an initial ADK release analyzer agent to find the doc updates needed between releases [e3422c6](https://github.com/google/adk-python/commit/e3422c616d18ec3850454ee83f2ef286198543ec)
+
+### Bug Fixes
+
+* Add a NOTE to agent transfer instructions listing available agents [43eec82](https://github.com/google/adk-python/commit/43eec82f8444c19455089655ee288200ec966577)
+* Fix pagination of list_sessions in VertexAiSessionService [e63fe0c](https://github.com/google/adk-python/commit/e63fe0c0eb73ac6e22d975387dd2df3d2ba3f521)
+* Fix AttributeError and indentation in parameter processing of LiteLlm [1e23652](https://github.com/google/adk-python/commit/1e23652968164c5fdfa5564e966e78799237d94b)
+* Allow AgentTool to inherit/use plugins from its invocation context when running [1979dcf](https://github.com/google/adk-python/commit/1979dcf496be3fb75fa2063fc96f480bedeb5de2)
+* Enforce foreign key constraint for SQLite DB [0c87907](https://github.com/google/adk-python/commit/0c87907bcb2e5687a4ad08bab450fc888a5b5233)
+* Add back installing requirements.txt to Dockerfile template for cloud run [8e43f0d](https://github.com/google/adk-python/commit/8e43f0dd8321ea31d6ad970ad4402feb48cdbd3d)
+* Only process the auth responses in the last event with content (if applicable i.e. it's authored by user) [3b922a2](https://github.com/google/adk-python/commit/3b922a2f6da373b0de78b022db5d5bcb5453379f)
+* Extract a utility for aggregating partial streaming responses and emitting LlmResponses for them as needed [7975e8e](https://github.com/google/adk-python/commit/7975e8e1961c8e375e2af3506ea546580ff7e45d)
+* Support saving text artifacts in GCS artifact service [cecf7e8](https://github.com/google/adk-python/commit/cecf7e805d19d20e940319a6e16bfc9015ead202)
+* Fixes `thought` handling in contents.py and refactors its unit tests [a30851e](https://github.com/google/adk-python/commit/a30851ee16114103dca7b9736e79cb31e82ee4d8)
+* Fixes the `thought` field handling in _planning.py [fe8b37b](https://github.com/google/adk-python/commit/fe8b37b0d3046a9c0dd90e8ddca2940c28d1a93f)
+* Pass state_delta to runner in /run endpoint [a3410fa](https://github.com/google/adk-python/commit/a3410fab7b25cc0e9c5908e23a087b501466df76)
+* Fix discussion answering github action workflow to escape the quote in the discussion content JSON [43c9681](https://github.com/google/adk-python/commit/43c96811da891a5b0c9cf1be525665e65f346a13)
+* Send full MIME types for image/video/pdf in get_content [e45c3be](https://github.com/google/adk-python/commit/e45c3be23895b5ec68908ad9ee19bd622dcbd003)
+* Fix flaky unit tests: tests/unittests/flows/llm_flows/test_functions_simple.py [b92b288](https://github.com/google/adk-python/commit/b92b288c978a9b3d1a76c8bcb96cc8f439ce610b)
+* Make UT of a2a consistent about how tests should be skipped when python verison < 3.10 [98b0426](https://github.com/google/adk-python/commit/98b0426cd2dc5e28014ead22b22dbf50d42d0a9a)
+
+### Improvements
+
+* Update contribution guide [8174a29](https://github.com/google/adk-python/commit/8174a29c6db9fd22a5a563f3088bd538b90e9a50)
+* Skip PR triage for already triaged or Google-contributor PRs [78eea1a](https://github.com/google/adk-python/commit/78eea1aa550790097a1005237acaec56309cd61e)
+* Avoid mutable default arguments in `local_eval_service` and `runners` [64f11a6](https://github.com/google/adk-python/commit/64f11a6a67e7042768270c5587e87528c358bd06)
+* Avoid mutable default arguments in `local_eval_service` and `runners` [5b465fd](https://github.com/google/adk-python/commit/5b465fd71b601a2a1ab95a74f7c9ddafe09085e5)
+* Reorder dependencies in `pyproject.toml` [ca5f7f1](https://github.com/google/adk-python/commit/ca5f7f1ff0afb2b3c2457fb9efdf029dcf7494b7)
+* Follow pydantic convention to make field_validator a public method [1448406](https://github.com/google/adk-python/commit/14484065c64396cebc4a1dde84d6b8b51439b990)
+* Update comment to clarify `after_run` callbacks [7720616](https://github.com/google/adk-python/commit/7720616c5f1dc302f019c348a6dfa70d1cf0b135)
+* Tune instructions to not ask root directory if it's already provided in the context [25df6c2](https://github.com/google/adk-python/commit/25df6c22d5942ead3a329f90ed2c10b374051ae6)
+* Load discussion data from event content to avoid additional GraphQL API call [a503a0c](https://github.com/google/adk-python/commit/a503a0c807e50ec9dde7d5095f8e020861d1375d)
+* Refactor discussion answering agent to merge answer_discussions.py into main.py [408d3df](https://github.com/google/adk-python/commit/408d3dfeb1475da343a15ae13e9b128985460a5d)
+* Add community repo dependency group to pyproject toml [7b077ac](https://github.com/google/adk-python/commit/7b077ac3517f2b88d1bc4b732815ca766c791168)
+* Add warning for using Gemini models via LiteLLM [9291daa](https://github.com/google/adk-python/commit/9291daaa8e399ca052f5a52dbb600d719dcc9fa8)
+
+### Documentation
+
+* Update root_agent description for clarity [467df1a](https://github.com/google/adk-python/commit/467df1a36f3ded1a0e324defcd94c557871c9190)
+* Update the ask_data_insights docstring [aad1533](https://github.com/google/adk-python/commit/aad153322e54cc39c97e3e0bc71cbed72bcab477)
+* Add contributing Spanner tools RAG agent sample [fcd748e](https://github.com/google/adk-python/commit/fcd748e17f4e0e7a3146716816c579f2ee973e6b)
+
+### Tests
+
+* Add functional telemetry tests [bc6b546](https://github.com/google/adk-python/commit/bc6b5462a76ee1cd718c75360daac94373d7c071)
+* Add unit tests for the `App` class and improve `Runner` initialization tests [fc90ce9](https://github.com/google/adk-python/commit/fc90ce968f114f84b14829f8117797a4c256d710)
+
+### Chores
+
+* Use lazy % formatting in logging functions to fix pylint warnings [b431072](https://github.com/google/adk-python/commit/b4310727d90421a81a8afc47e3c344646ee7aee8)
+* Update release cadence in README [decc19b](https://github.com/google/adk-python/commit/decc19b188fbf097995824f9ad7b7be1263b6338)
+* Add `custom_metadata` to DatabaseSessionService [fb009d8](https://github.com/google/adk-python/commit/fb009d8ea672bbbef4753e4cd25229dbebd0ff8d)
+* Update create_session endpoint to use Request message as post body [219815d](https://github.com/google/adk-python/commit/219815d2d7f45ac0cff28265f23fbf4f4e77163f)
+
+## 1.13.0 (2025-08-27)
+
+### Features
+
+* [Tools] Add the ask_data_insights tool for natural language queries on BigQuery data [47b88d2](https://github.com/google/adk-python/commit/47b88d2b06d247a698915ebf74564dbb5d81153e)
+
+### Bug Fixes
+
+* Add the missing `from_config` class method in BaseToolset [2dd432c](https://github.com/google/adk-python/commit/2dd432cc1fe265a79986a28e2afb59ee2c83abb3)
+* Change LlmResponse to use Content for transcriptions [3b997a0](https://github.com/google/adk-python/commit/3b997a0a07d1a2915bc64d64355f4dbabb7e0ba0)
+* AgentTool returns last content, instead of the content in the last event [bcf0dda](https://github.com/google/adk-python/commit/bcf0dda8bcc221974098f3077007c9e84c63021a)
+* Fix adk deploy docker file permission [ad81aa5](https://github.com/google/adk-python/commit/ad81aa54de1f38df580915b7f47834ea8e5f1004)
+* Updating BaseAgent.clone() and LlmAgent.clone() to properly clone fields that are lists [29bb75f](https://github.com/google/adk-python/commit/29bb75f975fe0c9c9d9a7e534a9c20158e1cbe1e)
+* Make tool description for bigquery `execute_sql` for various write modes self contained [167182b](https://github.com/google/adk-python/commit/167182be0163117f814c70f453d5b2e19bf474df)
+* Set invocation_id and branch for event generated when both output_schema and tools are used [3f3aa7b](https://github.com/google/adk-python/commit/3f3aa7b32d63cae5750d71bc586c088427c979ea)
+* Rework parallel_agent.py to always aclose async generators [826f554](https://github.com/google/adk-python/commit/826f5547890dc02e707be33a3d6a58b527dac223)
+* Add table metadata info into Spanner tool `get_table_schema` and fix the key usage info [81a53b5](https://github.com/google/adk-python/commit/81a53b53d6336011187a50ae8f1544de9b2764a8)
+* Fix Spanner DatabaseSessionService support [54ed079](https://github.com/google/adk-python/commit/54ed0791005350542708eb2c38f32ce8b92356bc)
+* Add support for required params [c144b53](https://github.com/google/adk-python/commit/c144b5347cc459496d4fd41e0c63715ffffb4952)
+* Replaced hard coded value for user_id to the value from the tool context from parent agent. [0b89f18](https://github.com/google/adk-python/commit/0b89f1882dccc1acd0ee109832053edecec04850)
+
+### Improvements
+
+* Allow user to specify protocol for A2A RPC URL in to_a2a utility [157f731](https://github.com/google/adk-python/commit/157f73181d123b0fddc34205dc74434fcbc43b2a)
+* Passthrough extra args for `adk deploy cloud_run` as Cloud Run args [6806dea](https://github.com/google/adk-python/commit/6806deaf8811eb7f02ed958648886323aba16adb)
+* Renames MCPTool and MCPToolset to McpTool and McpToolset [4c70606](https://github.com/google/adk-python/commit/4c7060612967253dae824a14c5c3f853a547469b)
+* Ignore hidden files in autoformat.sh [0eb65c0](https://github.com/google/adk-python/commit/0eb65c07d52f71cf555f0c32dc34b2e4ac8cf2a2)
+
+### Documentation
+
+* Clean up docs in sample [a360bc2](https://github.com/google/adk-python/commit/a360bc25429bf4bef6a80da59afe30d6933a844b)
+* Fixes root_agent.yaml in tool_mcp_stdio_notion_config for Agent Config sample and add README.md [2c088ac](https://github.com/google/adk-python/commit/2c088acc9b34f030537b02b45a4afd458445d15b)
+* Add What's new section to README.md [ccab076](https://github.com/google/adk-python/commit/ccab076aceff917591eb3a3cc89a9f85226b832a)
+
 ## 1.12.0 (2025-08-21)
 
 ### Features

CONTRIBUTING.md

@@ -2,25 +2,24 @@
 
 We'd love to accept your patches and contributions to this project.
 
-- [How to contribute](#how-to-contribute)
-- [Before you begin](#before-you-begin)
-  - [Sign our Contributor License Agreement](#sign-our-contributor-license-agreement)
-  - [Review our community guidelines](#review-our-community-guidelines)
-- [Contribution workflow](#contribution-workflow)
-  - [Finding Issues to Work On](#finding-issues-to-work-on)
-  - [Requirement for PRs](#requirement-for-prs)
-  - [Large or Complex Changes](#large-or-complex-changes)
-  - [Testing Requirements](#testing-requirements)
-    - [Unit Tests](#unit-tests)
-    - [Manual End-to-End (E2E) Tests](#manual-end-to-end-e2e-tests)
-  - [Documentation](#documentation)
-  - [Development Setup](#development-setup)
-  - [Code reviews](#code-reviews)
+-   [How to contribute](#how-to-contribute)
+-   [Before you begin](#before-you-begin)
+    -   [Sign our Contributor License Agreement](#sign-our-contributor-license-agreement)
+    -   [Review our community guidelines](#review-our-community-guidelines)
+-   [Contribution workflow](#contribution-workflow)
+    -   [Finding Issues to Work On](#finding-issues-to-work-on)
+    -   [Requirement for PRs](#requirement-for-prs)
+    -   [Large or Complex Changes](#large-or-complex-changes)
+    -   [Testing Requirements](#testing-requirements)
+    -   [Unit Tests](#unit-tests)
+    -   [Manual End-to-End (E2E) Tests](#manual-end-to-end-e2e-tests)
+    -   [Documentation](#documentation)
+    -   [Development Setup](#development-setup)
+    -   [Code reviews](#code-reviews)
 
+## Before you begin
 
-# Before you begin
-
-## Sign our Contributor License Agreement
+### Sign our Contributor License Agreement
 
 Contributions to this project must be accompanied by a
 [Contributor License Agreement](https://cla.developers.google.com/about) (CLA).
@@ -34,73 +33,102 @@ was for a different project), you probably don't need to do it again.
 Visit <https://cla.developers.google.com/> to see your current agreements or to
 sign a new one.
 
-## Review our community guidelines
+### Review our community guidelines
 
 This project follows
 [Google's Open Source Community Guidelines](https://opensource.google/conduct/).
 
-# Contribution workflow
+### Code reviews
 
-## Finding Issues to Work On
+All submissions, including submissions by project members, require review. We
+use GitHub pull requests for this purpose. Consult
+[GitHub Help](https://help.github.com/articles/about-pull-requests/) for more
+information on using pull requests.
 
-- Browse issues labeled **`good first issue`** (newcomer-friendly) or **`help wanted`** (general contributions).
-- For other issues, please kindly ask before contributing to avoid duplication.
+## Contribution workflow
 
+### Finding Issues to Work On
 
-## Requirement for PRs
+-   Browse issues labeled **`good first issue`** (newcomer-friendly) or **`help
+    wanted`** (general contributions).
+-   For other issues, please kindly ask before contributing to avoid
+    duplication.
 
-- All PRs, other than small documentation or typo fixes, should have a Issue associated. If not, please create one.
-- Small, focused PRs. Keep changes minimal—one concern per PR.
-- For bug fixes or features, please provide logs or screenshot after the fix is applied to help reviewers better understand the fix.
-- Please include a `testing plan` section in your PR to talk about how you will test. This will save time for PR review. See `Testing Requirements` section for more details.
+### Requirement for PRs
+
+-   All PRs, other than small documentation or typo fixes, should have a Issue
+    associated. If not, please create one.
+-   Small, focused PRs. Keep changes minimal—one concern per PR.
+-   For bug fixes or features, please provide logs or screenshot after the fix
+    is applied to help reviewers better understand the fix.
+-   Please include a `testing plan` section in your PR to talk about how you
+    will test. This will save time for PR review. See `Testing Requirements`
+    section for more details.
+
+### Large or Complex Changes
 
-## Large or Complex Changes
 For substantial features or architectural revisions:
 
-- Open an Issue First: Outline your proposal, including design considerations and impact.
-- Gather Feedback: Discuss with maintainers and the community to ensure alignment and avoid duplicate work
+-   Open an Issue First: Outline your proposal, including design considerations
+    and impact.
+-   Gather Feedback: Discuss with maintainers and the community to ensure
+    alignment and avoid duplicate work
 
-## Testing Requirements
+### Testing Requirements
 
-To maintain code quality and prevent regressions, all code changes must include comprehensive tests and verifiable end-to-end (E2E) evidence.
+To maintain code quality and prevent regressions, all code changes must include
+comprehensive tests and verifiable end-to-end (E2E) evidence.
 
+#### Unit Tests
 
-### Unit Tests
-
-Please add or update unit tests for your change. Please include a summary of passed `pytest` results.
+Please add or update unit tests for your change. Please include a summary of
+passed `pytest` results.
 
 Requirements for unit tests:
 
-- **Coverage:** Cover new features, edge cases, error conditions, and typical use cases.
-- **Location:** Add or update tests under `tests/unittests/`, following existing naming conventions (e.g., `test_<module>_<feature>.py`).
-- **Framework:** Use `pytest`. Tests should be:
-  - Fast and isolated.
-  - Written clearly with descriptive names.
-  - Free of external dependencies (use mocks or fixtures as needed).
-- **Quality:** Aim for high readability and maintainability; include docstrings or comments for complex scenarios.
+-   **Coverage:** Cover new features, edge cases, error conditions, and typical
+    use cases.
+-   **Location:** Add or update tests under `tests/unittests/`, following
+    existing naming conventions (e.g., `test_<module>_<feature>.py`).
+-   **Framework:** Use `pytest`. Tests should be:
+    -   Fast and isolated.
+    -   Written clearly with descriptive names.
+    -   Free of external dependencies (use mocks or fixtures as needed).
+-   **Quality:** Aim for high readability and maintainability; include
+    docstrings or comments for complex scenarios.
 
-### Manual End-to-End (E2E) Tests
+#### Manual End-to-End (E2E) Tests
 
-Manual E2E tests ensure integrated flows work as intended. Your tests should cover all scenarios. Sometimes, it's also good to ensure relevant functionality is not impacted.
+Manual E2E tests ensure integrated flows work as intended. Your tests should
+cover all scenarios. Sometimes, it's also good to ensure relevant functionality
+is not impacted.
 
 Depending on your change:
 
-- **ADK Web:**
-  - Use the `adk web` to verify functionality.
-  - Capture and attach relevant screenshots demonstrating the UI/UX changes or outputs.
-  - Label screenshots clearly in your PR description.
+-   **ADK Web:**
 
-- **Runner:**
-  - Provide the testing setup. For example, the agent definition, and the runner setup.
-  - Execute the `runner` tool to reproduce workflows.
-  - Include the command used and console output showing test results.
-  - Highlight sections of the log that directly relate to your change.
+    -   Use the `adk web` to verify functionality.
+    -   Capture and attach relevant screenshots demonstrating the UI/UX changes
+        or outputs.
+    -   Label screenshots clearly in your PR description.
 
-## Documentation
+-   **Runner:**
 
-For any changes that impact user-facing documentation (guides, API reference, tutorials), please open a PR in the [adk-docs](https://github.com/google/adk-docs) repository to update relevant part before or alongside your code PR.
+    -   Provide the testing setup. For example, the agent definition, and the
+        runner setup.
+    -   Execute the `runner` tool to reproduce workflows.
+    -   Include the command used and console output showing test results.
+    -   Highlight sections of the log that directly relate to your change.
+
+### Documentation
+
+For any changes that impact user-facing documentation (guides, API reference,
+tutorials), please open a PR in the
+[adk-docs](https://github.com/google/adk-docs) repository to update relevant
+part before or alongside your code PR.
 
 ## Development Setup
+
 1.  **Clone the repository:**
 
     ```shell
@@ -110,11 +138,13 @@ For any changes that impact user-facing documentation (guides, API reference, tu
 
 2.  **Install uv:**
 
-    Check out [uv installation guide](https://docs.astral.sh/uv/getting-started/installation/).
+    Check out
+    [uv installation guide](https://docs.astral.sh/uv/getting-started/installation/).
 
 3.  **Create and activate a virtual environment:**
 
-    **NOTE**: ADK supports Python 3.9+. Python 3.11 and above is strongly recommended.
+    **NOTE**: ADK supports Python 3.9+. Python 3.11 and above is strongly
+    recommended.
 
     Create a workspace venv using uv.
 
@@ -128,10 +158,7 @@ For any changes that impact user-facing documentation (guides, API reference, tu
     source .venv/bin/activate
     ```
 
-    **windows**
-    ```shell
-    source .\.venv\Scripts\activate
-    ```
+    **windows** `shell source .\.venv\Scripts\activate`
 
 4.  **Install dependencies:**
 
@@ -147,7 +174,7 @@ For any changes that impact user-facing documentation (guides, API reference, tu
     pytest ./tests/unittests
     ```
 
-    NOTE: for accurate repro of test failure, only include `test`, `eval` and 
+    NOTE: for accurate repro of test failure, only include `test`, `eval` and
     `a2a` as extra dependencies.
 
     ```shell
@@ -164,14 +191,14 @@ For any changes that impact user-facing documentation (guides, API reference, tu
     ./autoformat.sh
     ```
 
-7. **Build the wheel file:**
+7.  **Build the wheel file:**
 
     ```shell
     uv build
     ```
 
-8.  **Test the locally built wheel file:**
-    Have a simple testing folder setup as mentioned in the
+8.  **Test the locally built wheel file:** Have a simple testing folder setup as
+    mentioned in the
     [quickstart](https://google.github.io/adk-docs/get-started/quickstart/).
 
     Then following below steps to test your changes:
@@ -200,16 +227,11 @@ For any changes that impact user-facing documentation (guides, API reference, tu
 
 ## Contributing Resources
 
-[Contributing folder](https://github.com/google/adk-python/tree/main/contributing) has resources that is helpful for contributors.
+[Contributing folder](https://github.com/google/adk-python/tree/main/contributing)
+has resources that is helpful for contributors.
 
+## Vibe Coding
 
-## Code reviews
-
-All submissions, including submissions by project members, require review. We
-use GitHub pull requests for this purpose. Consult
-[GitHub Help](https://help.github.com/articles/about-pull-requests/) for more
-information on using pull requests.
-
-# Vibe Coding
-
-If you want to contribute by leveraging viber coding, the AGENTS.md (https://github.com/google/adk-python/tree/main/AGENTS.md) could be used as context to your LLM.
+If you want to contribute by leveraging viber coding, the AGENTS.md
+(https://github.com/google/adk-python/tree/main/AGENTS.md) could be used as
+context to your LLM.

README.md

@@ -27,11 +27,13 @@ Agent Development Kit (ADK) is a flexible and modular framework for developing a
 
 ---
 
-## ✨ What's new
+## 🔥 What's new
 
 - **Agent Config**: Build agents without code. Check out the
   [Agent Config](https://google.github.io/adk-docs/agents/config/) feature.
 
+- **Tool Confirmation**: A [tool confirmation flow(HITL)](https://google.github.io/adk-docs/tools/confirmation/) that can guard tool execution with explicit confirmation and custom input
+
 ## ✨ Key Features
 
 - **Rich Tool Ecosystem**: Utilize pre-built tools, custom functions,
@@ -64,7 +66,7 @@ You can install the latest stable version of ADK using `pip`:
 pip install google-adk
 ```
 
-The release cadence is weekly.
+The release cadence is roughly bi-weekly.
 
 This version is recommended for most users as it represents the most recent official release.
 
@@ -94,7 +96,7 @@ from google.adk.tools import google_search
 
 root_agent = Agent(
     name="search_assistant",
-    model="gemini-2.0-flash", # Or your preferred Gemini model
+    model="gemini-2.5-flash", # Or your preferred Gemini model
     instruction="You are a helpful assistant. Answer user questions using Google Search when needed.",
     description="An assistant that can search the web.",
     tools=[google_search]
@@ -109,13 +111,13 @@ Define a multi-agent system with coordinator agent, greeter agent, and task exec
 from google.adk.agents import LlmAgent, BaseAgent
 
 # Define individual agents
-greeter = LlmAgent(name="greeter", model="gemini-2.0-flash", ...)
-task_executor = LlmAgent(name="task_executor", model="gemini-2.0-flash", ...)
+greeter = LlmAgent(name="greeter", model="gemini-2.5-flash", ...)
+task_executor = LlmAgent(name="task_executor", model="gemini-2.5-flash", ...)
 
 # Create parent agent and assign children via sub_agents
 coordinator = LlmAgent(
     name="Coordinator",
-    model="gemini-2.0-flash",
+    model="gemini-2.5-flash",
     description="I coordinate greetings and tasks.",
     sub_agents=[ # Assign sub_agents here
         greeter,

contributing/samples/adk_agent_builder_assistant/README.md

@@ -0,0 +1,206 @@
+# Agent Builder Assistant
+
+An intelligent assistant for building ADK multi-agent systems using YAML configurations.
+
+## Quick Start
+
+### Using ADK Web Interface
+```bash
+# From the ADK project root
+adk web src/google/adk/agent_builder_assistant
+```
+
+### Programmatic Usage
+```python
+# Create with defaults
+agent = AgentBuilderAssistant.create_agent()
+
+# Create with custom settings
+agent = AgentBuilderAssistant.create_agent(
+    model="gemini-2.5-pro",
+    schema_mode="query",
+    working_directory="/path/to/project"
+)
+```
+
+## Core Features
+
+### 🎯 **Intelligent Agent Design**
+- Analyzes requirements and suggests appropriate agent types
+- Designs multi-agent architectures (Sequential, Parallel, Loop patterns)
+- Provides high-level design confirmation before implementation
+
+### 📝 **Advanced YAML Configuration**
+- Generates AgentConfig schema-compliant YAML files
+- Supports all agent types: LlmAgent, SequentialAgent, ParallelAgent, LoopAgent
+- Built-in validation with detailed error reporting
+
+### 🛠️ **Multi-File Management**
+- **Read/Write Operations**: Batch processing of multiple files
+- **File Type Separation**: YAML files use validation tools, Python files use generic tools
+- **Backup & Recovery**: Automatic backups before overwriting existing files
+
+### 🗂️ **Project Structure Analysis**
+- Explores existing project structures
+- Suggests conventional ADK file organization
+- Provides path recommendations for new components
+
+### 🧭 **Dynamic Path Resolution**
+- **Session Binding**: Each chat session bound to one root directory
+- **Working Directory**: Automatic detection and context provision
+- **ADK Source Discovery**: Finds ADK installation dynamically (no hardcoded paths)
+
+## Schema Modes
+
+Choose between two schema handling approaches:
+
+### Embedded Mode (Default)
+```python
+agent = AgentBuilderAssistant.create_agent(schema_mode="embedded")
+```
+- Full AgentConfig schema embedded in context
+- Faster execution, higher token usage
+- Best for comprehensive schema work
+
+### Query Mode
+```python
+agent = AgentBuilderAssistant.create_agent(schema_mode="query")
+```
+- Dynamic schema queries via tools
+- Lower initial token usage
+- Best for targeted schema operations
+
+## Example Interactions
+
+### Create a new agent
+```
+Create an agent that can roll n-sided number and check whether the rolled number is prime.
+```
+
+### Add Capabilities to Existing Agent
+```
+Could you make the agent under `./config_based/roll_and_check` a multi agent system : root_agent only for request routing and two sub agents responsible for two functions respectively ?
+```
+
+### Project Structure Analysis
+```
+Please analyze my existing project structure at './config_based/roll_and_check' and suggest improvements for better organization.
+```
+
+## Tool Ecosystem
+
+### Core File Operations
+- **`read_config_files`** - Read multiple YAML configurations with analysis
+- **`write_config_files`** - Write multiple YAML files with validation
+- **`read_files`** - Read multiple files of any type
+- **`write_files`** - Write multiple files with backup options
+- **`delete_files`** - Delete multiple files with backup options
+
+### Project Analysis
+- **`explore_project`** - Analyze project structure and suggest paths
+- **`resolve_root_directory`** - Resolve paths with working directory context
+
+### ADK knowledge Context
+- **`google_search`** - Search for ADK examples and documentation
+- **`url_context`** - Fetch content from URLs (GitHub, docs, etc.)
+- **`search_adk_source`** - Search ADK source code with regex patterns
+
+
+## File Organization Conventions
+
+### ADK Project Structure
+```
+my_adk_project/
+└── src/
+    └── my_app/
+        ├── root_agent.yaml
+        ├── sub_agent_1.yaml
+        ├── sub_agent_2.yaml
+        ├── tools/
+        │   ├── process_email.py    # No _tool suffix
+        │   └── analyze_sentiment.py
+        └── callbacks/
+            ├── logging.py            # No _callback suffix
+            └── security.py
+```
+
+### Naming Conventions
+- **Agent directories**: `snake_case`
+- **Tool files**: `descriptive_action.py`
+- **Callback files**: `descriptive_name.py`
+- **Tool paths**: `project_name.tools.module.function_name`
+- **Callback paths**: `project_name.callbacks.module.function_name`
+
+## Session Management
+
+### Root Directory Binding
+Each chat session is bound to a single root directory:
+
+- **Automatic Detection**: Working directory provided to model automatically
+- **Session State**: Tracks established root directory across conversations
+- **Path Resolution**: All relative paths resolved against session root
+- **Directory Switching**: Suggest user starting new session to work in different directory
+
+### Working Directory Context
+```python
+# The assistant automatically receives working directory context
+agent = AgentBuilderAssistant.create_agent(
+    working_directory="/path/to/project"
+)
+# Model instructions include: "Working Directory: /path/to/project"
+```
+
+## Advanced Features
+
+### Dynamic ADK Source Discovery
+No hardcoded paths - works in any ADK installation:
+
+```python
+from google.adk.agent_builder_assistant.utils import (
+    find_adk_source_folder,
+    get_adk_schema_path,
+    load_agent_config_schema
+)
+
+# Find ADK source dynamically
+adk_path = find_adk_source_folder()
+
+# Load schema with caching
+schema = load_agent_config_schema()
+```
+
+### Schema Validation
+All YAML files validated against AgentConfig schema:
+
+- **Syntax Validation**: YAML parsing with detailed error locations
+- **Schema Compliance**: Full AgentConfig.json validation
+- **Best Practices**: ADK naming and structure conventions
+- **Error Recovery**: Clear suggestions for fixing validation errors
+
+## Performance Optimization
+
+### Efficient Operations
+- **Multi-file Processing**: Batch operations reduce overhead
+- **Schema Caching**: Global cache prevents repeated file reads
+- **Dynamic Discovery**: Efficient ADK source location caching
+- **Session Context**: Persistent directory binding across conversations
+
+### Memory Management
+- **Lazy Loading**: Schema loaded only when needed
+- **Cache Control**: Manual cache clearing for testing/development
+- **Resource Cleanup**: Automatic cleanup of temporary files
+
+## Error Handling
+
+### Comprehensive Validation
+- **Path Validation**: All paths validated before file operations
+- **Schema Compliance**: AgentConfig validation with detailed error reporting
+- **Python Syntax**: Syntax validation for generated Python code
+- **Backup Creation**: Automatic backups before overwriting files
+
+### Recovery Mechanisms
+- **Retry Suggestions**: Clear guidance for fixing validation errors
+- **Backup Restoration**: Easy recovery from automatic backups
+- **Error Context**: Detailed error messages with file locations and suggestions
+
+This comprehensive assistant provides everything needed for intelligent, efficient ADK agent system creation with proper validation, file management, and project organization.

contributing/samples/adk_agent_builder_assistant/__init__.py

@@ -0,0 +1,28 @@
+# 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.
+
+"""Agent Builder Assistant for ADK.
+
+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 . import agent  # Import to make agent.root_agent available
+from .agent_builder_assistant import AgentBuilderAssistant
+
+__all__ = [
+    'AgentBuilderAssistant',
+    'agent',  # Make agent module available for adk web discovery
+]

contributing/samples/adk_agent_builder_assistant/agent.py

@@ -0,0 +1,21 @@
+# 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.
+
+"""Agent Builder Assistant instance for ADK web testing."""
+
+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
+root_agent = AgentBuilderAssistant.create_agent()

contributing/samples/adk_agent_builder_assistant/agent_builder_assistant.py

@@ -0,0 +1,256 @@
+# 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.
+
+"""Agent factory for creating Agent Builder Assistant with embedded schema."""
+
+from pathlib import Path
+from typing import Callable
+from typing import Optional
+from typing import Union
+
+from google.adk.agents import LlmAgent
+from google.adk.agents.readonly_context import ReadonlyContext
+from google.adk.models import BaseLlm
+from google.adk.tools import AgentTool
+from google.adk.tools import FunctionTool
+
+from .sub_agents.google_search_agent import create_google_search_agent
+from .sub_agents.url_context_agent import create_url_context_agent
+from .tools.cleanup_unused_files import cleanup_unused_files
+from .tools.delete_files import delete_files
+from .tools.explore_project import explore_project
+from .tools.read_config_files import read_config_files
+from .tools.read_files import read_files
+from .tools.resolve_root_directory import resolve_root_directory
+from .tools.search_adk_source import search_adk_source
+from .tools.write_config_files import write_config_files
+from .tools.write_files import write_files
+from .utils import load_agent_config_schema
+
+
+class AgentBuilderAssistant:
+  """Agent Builder Assistant factory for creating configured instances."""
+
+  @staticmethod
+  def create_agent(
+      model: Union[str, BaseLlm] = "gemini-2.5-flash",
+      working_directory: Optional[str] = None,
+  ) -> LlmAgent:
+    """Create Agent Builder Assistant with embedded ADK AgentConfig schema.
+
+    Args:
+      model: Model to use for the assistant (default: gemini-2.5-flash)
+      working_directory: Working directory for path resolution (default: current
+        working directory)
+
+    Returns:
+      Configured LlmAgent with embedded ADK AgentConfig schema
+    """
+    # Load full ADK AgentConfig schema directly into instruction context
+    instruction = AgentBuilderAssistant._load_instruction_with_schema(
+        model, working_directory
+    )
+
+    # TOOL ARCHITECTURE: Hybrid approach using both AgentTools and FunctionTools
+    #
+    # Why use sub-agents for built-in tools?
+    # - ADK's built-in tools (google_search, url_context) are designed as agents
+    # - AgentTool wrapper allows integrating them into our agent's tool collection
+    # - Maintains compatibility with existing ADK tool ecosystem
+
+    # Built-in ADK tools wrapped as sub-agents
+    google_search_agent = create_google_search_agent()
+    url_context_agent = create_url_context_agent()
+    agent_tools = [AgentTool(google_search_agent), AgentTool(url_context_agent)]
+
+    # CUSTOM FUNCTION TOOLS: Agent Builder specific capabilities
+    #
+    # Why FunctionTool pattern?
+    # - Automatically generates tool declarations from function signatures
+    # - Cleaner than manually implementing BaseTool._get_declaration()
+    # - Type hints and docstrings become tool descriptions automatically
+
+    # Core agent building tools
+    custom_tools = [
+        FunctionTool(read_config_files),  # Read/parse multiple YAML configs
+        FunctionTool(
+            write_config_files
+        ),  # Write/validate multiple YAML configs
+        FunctionTool(explore_project),  # Analyze project structure
+        # Working directory context tools
+        FunctionTool(resolve_root_directory),
+        # File management tools (multi-file support)
+        FunctionTool(read_files),  # Read multiple files
+        FunctionTool(write_files),  # Write multiple files
+        FunctionTool(delete_files),  # Delete multiple files
+        FunctionTool(cleanup_unused_files),
+        # ADK source code search (regex-based)
+        FunctionTool(search_adk_source),  # Search ADK source with regex
+    ]
+
+    # Combine all tools
+    all_tools = agent_tools + custom_tools
+
+    # Create agent directly using LlmAgent constructor
+    agent = LlmAgent(
+        name="agent_builder_assistant",
+        description=(
+            "Intelligent assistant for building ADK multi-agent systems "
+            "using YAML configurations"
+        ),
+        instruction=instruction,
+        model=model,
+        tools=all_tools,
+    )
+
+    return agent
+
+  @staticmethod
+  def _load_schema() -> str:
+    """Load ADK AgentConfig.json schema content and format for YAML embedding."""
+
+    # CENTRALIZED ADK AGENTCONFIG SCHEMA LOADING: Use common utility function
+    # This avoids duplication across multiple files and provides consistent
+    # ADK AgentConfig schema loading with caching and error handling.
+    schema_content = load_agent_config_schema(
+        raw_format=True,  # Get as JSON string
+        escape_braces=True,  # Escape braces for template embedding
+    )
+
+    # Format as indented code block for instruction embedding
+    #
+    # Why indentation is needed:
+    # - The ADK AgentConfig schema gets embedded into instruction templates using .format()
+    # - Proper indentation maintains readability in the final instruction
+    # - Code block markers (```) help LLMs recognize this as structured data
+    #
+    # Example final instruction format:
+    #   "Here is the ADK AgentConfig schema:
+    #   ```json
+    #     {"type": "object", "properties": {...}}
+    #   ```"
+    lines = schema_content.split("\n")
+    indented_lines = ["  " + line for line in lines]  # 2-space indent
+    return "```json\n" + "\n".join(indented_lines) + "\n  ```"
+
+  @staticmethod
+  def _load_instruction_with_schema(
+      model: Union[str, BaseLlm],
+      working_directory: Optional[str] = None,
+  ) -> Callable[[ReadonlyContext], str]:
+    """Load instruction template and embed ADK AgentConfig schema content."""
+    instruction_template = (
+        AgentBuilderAssistant._load_embedded_schema_instruction_template()
+    )
+    schema_content = AgentBuilderAssistant._load_schema()
+
+    # Get model string for template replacement
+    model_str = (
+        str(model)
+        if isinstance(model, str)
+        else getattr(model, "model_name", str(model))
+    )
+
+    # Fill the instruction template with ADK AgentConfig schema content and default model
+    instruction_text = instruction_template.format(
+        schema_content=schema_content, default_model=model_str
+    )
+
+    # Return a function that accepts ReadonlyContext and returns the instruction
+    def instruction_provider(context: ReadonlyContext) -> str:
+      return AgentBuilderAssistant._compile_instruction_with_context(
+          instruction_text, context, working_directory
+      )
+
+    return instruction_provider
+
+  @staticmethod
+  def _load_embedded_schema_instruction_template() -> str:
+    """Load instruction template for embedded ADK AgentConfig schema mode."""
+    template_path = Path(__file__).parent / "instruction_embedded.template"
+
+    if not template_path.exists():
+      raise FileNotFoundError(
+          f"Instruction template not found at {template_path}"
+      )
+
+    with open(template_path, "r", encoding="utf-8") as f:
+      return f.read()
+
+  @staticmethod
+  def _compile_instruction_with_context(
+      instruction_text: str,
+      context: ReadonlyContext,
+      working_directory: Optional[str] = None,
+  ) -> str:
+    """Compile instruction with session context and working directory information.
+
+    This method enhances instructions with:
+    1. Working directory information for path resolution
+    2. Session-based root directory binding if available
+
+    Args:
+      instruction_text: Base instruction text
+      context: ReadonlyContext from the agent session
+      working_directory: Optional working directory for path resolution
+
+    Returns:
+      Enhanced instruction text with context information
+    """
+    import os
+
+    # Get working directory (use provided or current working directory)
+    actual_working_dir = working_directory or os.getcwd()
+
+    # Check for existing root directory in session state
+    session_root_directory = context._invocation_context.session.state.get(
+        "root_directory"
+    )
+
+    # Compile additional context information
+    context_info = f"""
+
+## SESSION CONTEXT
+
+**Working Directory**: `{actual_working_dir}`
+- Use this as the base directory for path resolution when calling resolve_root_directory
+- Pass this as the working_directory parameter to resolve_root_directory tool
+
+"""
+
+    if session_root_directory:
+      context_info += f"""**Established Root Directory**: `{session_root_directory}`
+- This session is bound to root directory: {session_root_directory}
+- DO NOT ask the user for root directory - use this established path
+- All agent building should happen within this root directory
+- If user wants to work in a different directory, ask them to start a new chat session
+
+"""
+    else:
+      context_info += f"""**Root Directory**: Not yet established
+- You MUST ask the user for their desired root directory first
+- Use resolve_root_directory tool to validate the path
+- Once confirmed, this session will be bound to that root directory
+
+"""
+
+    context_info += """**Session Binding Rules**:
+- Each chat session is bound to ONE root directory
+- Once established, work only within that root directory
+- To switch directories, user must start a new chat session
+- Always verify paths using resolve_root_directory tool before creating files
+
+"""
+
+    return instruction_text + context_info

contributing/samples/adk_agent_builder_assistant/instruction_embedded.template

@@ -0,0 +1,350 @@
+# Agent Builder Assistant - Embedded Schema Mode
+
+You are an intelligent Agent Builder Assistant specialized in creating and configuring ADK (Agent Development Kit) multi-agent systems using YAML configuration files.
+
+## Your Purpose
+
+Help users design, build, and configure sophisticated multi-agent systems for the ADK framework. You guide users through the agent creation process by asking clarifying questions, suggesting optimal architectures, and generating properly formatted YAML configuration files that comply with the ADK AgentConfig schema.
+
+## CRITICAL BEHAVIOR RULE
+
+**NEVER assume users want to create agents unless they explicitly ask to CREATE, BUILD, GENERATE, IMPLEMENT, or UPDATE something.**
+
+When users ask informational questions like "find me examples", "show me samples", "how do I", etc., they want INFORMATION ONLY. Provide the information and stop. Do not offer to create anything or ask for root directories.
+
+## Core Capabilities
+
+1. **Agent Architecture Design**: Analyze requirements and suggest appropriate agent types (LlmAgent, SequentialAgent, ParallelAgent, LoopAgent)
+2. **YAML Configuration Generation**: Create proper ADK agent configuration files with correct ADK AgentConfig schema compliance
+3. **Tool Integration**: Help configure and integrate various tool types (Function tools, Google API tools, MCP tools, etc.)
+4. **Python File Management**: Create, update, and delete Python files for custom tools and callbacks per user request
+5. **Project Structure**: Guide proper ADK project organization and file placement
+6. **ADK Knowledge & Q&A**: Answer questions about ADK concepts, APIs, usage patterns, troubleshooting, and best practices using comprehensive research capabilities
+
+## ADK AgentConfig Schema Reference
+
+You have access to the complete ADK AgentConfig schema embedded in your context:
+
+{schema_content}
+
+Always reference this schema when creating configurations to ensure compliance.
+
+## Workflow Guidelines
+
+### 1. Discovery Phase
+- **DETERMINE USER INTENT FIRST**:
+  * **INFORMATIONAL QUESTIONS** (Answer directly WITHOUT asking for root directory):
+    - "Could you find me examples of..." / "Find me samples of..."
+    - "Show me how to..." / "How do I..."
+    - "What is..." / "What are..." / "Explain..."
+    - "Can you show me..." / "Do you have examples of..."
+    - "I'm looking for information about..." / "I need to understand..."
+    - Questions about ADK capabilities, concepts, or existing implementations
+    - **CRITICAL**: For informational questions, provide the requested information and STOP. Do NOT offer to create, build, or generate anything unless explicitly asked.
+  * **CREATION/BUILDING INTENT** (Only then ask for root directory):
+    - "Create a new agent..." / "Build me an agent..." 
+    - "Generate an agent..." / "Implement an agent..."
+    - "Update my agent..." / "Modify my agent..." / "Change my agent..."
+    - "I want to create..." / "Help me build..." / "Help me update..."
+    - "Set up a project..." / "Make me an agent..."
+
+**EXAMPLE OF CORRECT BEHAVIOR:**
+- User: "Could you find me a sample agent that can list my calendar events?"
+- ✅ CORRECT: Search for examples, show the samples found, explain how they work, and STOP.
+- ❌ WRONG: "Before I proceed with creating an agent..." or asking for root directory.
+- **ROOT DIRECTORY ESTABLISHMENT** (Only for Creation/Building):
+  * **FIRST**: Check SESSION CONTEXT section below for "Established Root Directory"
+  * **IF ESTABLISHED**: Use the existing session root directory - DO NOT ask again
+  * **IF NOT ESTABLISHED**: Ask user for root directory to establish working context
+- **MODEL PREFERENCE**: Always ask for explicit model confirmation when LlmAgent(s) will be needed
+  * **When to ask**: After analyzing requirements and deciding that LlmAgent is needed for the solution
+  * **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.
+  * **RATIONALE**: Only LlmAgent requires model specification; workflow agents do not
+  * **DEFAULT ONLY**: Use "{default_model}" only if user explicitly says "use default" or similar
+- **CRITICAL PATH RESOLUTION**: If user provides a relative path (e.g., `./config_agents/roll_and_check`):
+  * **FIRST**: Call `resolve_root_directory` to get the correct absolute path
+  * **VERIFY**: The resolved path matches user's intended location
+  * **EXAMPLE**: `./config_agents/roll_and_check` should resolve to `/Users/user/Projects/adk-python/config_agents/roll_and_check`, NOT `/config_agents/roll_and_check`
+- Understand the user's goals and requirements through targeted questions
+- Explore existing project structure using the RESOLVED ABSOLUTE PATH
+- Identify integration needs (APIs, databases, external services)
+
+### 2. Design Phase  
+- **MANDATORY HIGH-LEVEL DESIGN CONFIRMATION**: Present complete architecture design BEFORE any implementation
+- **ASK FOR EXPLICIT CONFIRMATION**: "Does this design approach work for you? Should I proceed with implementation?"
+- **INCLUDE IN DESIGN PRESENTATION**:
+  * Agent types and their roles
+  * Tool requirements and purposes
+  * File structure overview
+  * Model selection (if applicable)
+- **WAIT FOR USER CONFIRMATION**: Do not proceed to implementation until user confirms the design
+- **NO FILE CONTENT**: Do not show any file content during design phase - only architecture overview
+
+### 3. Implementation Phase
+
+**MANDATORY CONFIRMATION BEFORE ANY WRITES:**
+- **NEVER write any file without explicit user confirmation**
+- **Always present proposed changes first** and ask "Should I proceed with these changes?"
+- **For modifications**: Show exactly what will be changed and ask for approval
+- **For new files**: Show the complete content and ask for approval
+- **For existing file modifications**: Ask "Should I create a backup before modifying this file?"
+- **Use backup_existing parameter**: Set to True only if user explicitly requests backup
+
+**IMPLEMENTATION ORDER (CRITICAL - ONLY AFTER USER CONFIRMS DESIGN):**
+
+**STEP 1: YAML CONFIGURATION FILES FIRST**
+1. Generate all YAML configuration files
+2. Present complete YAML content to user for confirmation
+3. Ask: "Should I create these YAML configuration files?"
+4. Only proceed after user confirmation
+
+**STEP 2: PYTHON FILES SECOND**
+1. Generate Python tool/callback files
+2. Present complete Python content to user for confirmation  
+3. Ask: "Should I create these Python files?"
+4. Only proceed after user confirmation
+1. **Present all proposed changes** - Show exact file contents and modifications
+2. **Get explicit user approval** - Wait for "yes" or "proceed" before any writes
+3. **Execute approved changes** - Only write files after user confirms
+   * ⚠️  **YAML files**: Use `write_config_files` (root_agent.yaml, etc.)
+   * ⚠️  **Python files**: Use `write_files` (tools/*.py, etc.)
+4. **Clean up unused files** - Use cleanup_unused_files and delete_files to remove obsolete tool files
+
+**YAML Configuration Requirements:**
+- Main agent file MUST be named `root_agent.yaml`
+- **Sub-agent placement**: Place ALL sub-agent YAML files in the root folder, NOT in `sub_agents/` subfolder
+- Tool paths use format: `project_name.tools.module.function_name` (must start with project folder name, no `.py` extension, all dots)
+  * **Example**: For project at `config_agents/roll_and_check` with tool in `tools/is_prime.py`, use: `roll_and_check.tools.is_prime.is_prime`
+  * **Pattern**: `{{{{project_folder_name}}}}.tools.{{{{module_name}}}}.{{{{function_name}}}}`
+  * **CRITICAL**: Use only the final component of the root folder path as project_folder_name (e.g., for `./config_based/roll_and_check`, use `roll_and_check` not `config_based.roll_and_check`)
+- No function declarations in YAML (handled automatically by ADK)
+
+**TOOL IMPLEMENTATION STRATEGY:**
+- **For simple/obvious tools**: Implement them directly with actual working code
+  * Example: dice rolling, prime checking, basic math, file operations
+  * Don't ask users to "fill in TODO comments" for obvious implementations
+- **For complex/business-specific tools**: Generate proper function signatures with TODO comments
+  * Example: API integrations requiring API keys, complex business logic
+- **Always generate correct function signatures**: If user wants `roll_dice` and `is_prime`, generate those exact functions, not generic `tool_name`
+
+**CRITICAL: Tool Usage Patterns - MANDATORY FILE TYPE SEPARATION**
+
+⚠️  **YAML FILES (.yaml, .yml) - MUST USE CONFIG TOOLS:**
+- **ALWAYS use `write_config_files`** for writing YAML configuration files (root_agent.yaml, etc.)
+- **ALWAYS use `read_config_files`** for reading YAML configuration files
+- **NEVER use `write_files` for YAML files** - it lacks validation and schema compliance
+
+⚠️  **PYTHON/OTHER FILES (.py, .txt, .md) - USE GENERAL FILE TOOLS:**
+- **Use `write_files`** for Python tools, scripts, documentation, etc.
+- **Use `read_files`** for non-YAML content
+
+⚠️  **WHY THIS SEPARATION MATTERS:**
+- `write_config_files` validates YAML syntax and ADK AgentConfig schema compliance
+- `write_files` is raw file writing without validation
+- Using wrong tool can create invalid configurations
+
+- **For ADK code questions**: Use `search_adk_source` then `read_files` for complete context
+- **File deletion**: Use `delete_files` for multiple file deletion with backup options
+
+**TOOL GENERATION RULES:**
+- **Match user requirements exactly**: Generate the specific functions requested
+- **Use proper parameter types**: Don't use generic `parameter: str` when specific types are needed
+- **Implement when possible**: Write actual working code for simple, well-defined functions
+- **ONE TOOL PER FILE POLICY**: Always create separate files for individual tools
+  * **Example**: Create `roll_dice.py` and `is_prime.py` instead of `dice_tools.py`
+  * **Benefit**: Enables easy cleanup when tools are no longer needed
+  * **Exception**: Only use multi-tool files for legitimate toolsets with shared logic
+
+### 4. Validation Phase
+- Review generated configurations for schema compliance
+- Test basic functionality when possible
+- Provide clear next steps for the user
+
+## Available Tools
+
+### Core Agent Building Tools
+
+#### Configuration Management (MANDATORY FOR .yaml/.yml FILES)
+- **write_config_files**: ⚠️  REQUIRED for ALL YAML files (root_agent.yaml, sub-agents/*.yaml)
+  * Validates YAML syntax and ADK AgentConfig schema compliance
+  * Example: `write_config_files({{"./project/root_agent.yaml": yaml_content}})`
+- **read_config_files**: Read and parse multiple YAML configuration files with validation and metadata extraction
+- **config_file_reader**: Legacy function (use read_config_files instead)
+- **config_file_writer**: Legacy function (use write_config_files instead)
+
+#### File Management (Use for Python files and other content)
+- **read_files**: Read content from multiple files (Python tools, scripts, documentation)
+- **write_files**: Write content to multiple files (Python tools, callbacks, scripts)
+- **delete_files**: Delete multiple files with optional backup creation
+- **cleanup_unused_files**: Identify and clean up unused files
+- **delete_file**: Legacy function (use delete_files instead)
+
+#### Project Organization
+- **explore_project**: Explore project structure and suggest conventional file paths
+- **get_working_directory_info**: Get current working directory and execution context information
+- **resolve_root_directory**: Resolve path issues when execution context differs from user's working directory
+
+### ADK Knowledge and Research Tools
+
+#### Web-based Research
+- **google_search_agent**: Search web for ADK examples, patterns, and documentation (returns full page content as results)
+- **url_context_agent**: Fetch content from specific URLs when mentioned in search results or user queries (use only when specific URLs need additional fetching)
+
+#### Local ADK Source Search
+- **search_adk_source**: Search ADK source code using regex patterns for precise code lookups
+  * Use for finding class definitions: `"class FunctionTool"`
+  * Use for constructor signatures: `"def __init__.*FunctionTool"`
+  * Use for method definitions: `"def method_name"`
+  * Returns matches with file paths, line numbers, and context
+  * Follow up with **read_files** to get complete file contents
+
+**Research Workflow for ADK Questions:**
+1. **search_adk_source** - Find specific code patterns with regex
+2. **read_files** - Read complete source files for detailed analysis  
+3. **google_search_agent** - Find external examples and documentation
+4. **url_context_agent** - Fetch specific GitHub files or documentation pages
+
+### When to Use Research Tools
+**ALWAYS use research tools when:**
+1. **User asks ADK questions**: Any questions about ADK concepts, APIs, usage patterns, or troubleshooting
+2. **Unfamiliar ADK features**: When user requests features you're not certain about
+3. **Agent type clarification**: When unsure about agent types, their capabilities, or configuration
+4. **Best practices**: When user asks for examples or best practices
+5. **Error troubleshooting**: When helping debug ADK-related issues
+6. **Agent building uncertainty**: When unsure how to create agents or what's the best practice
+7. **Architecture decisions**: When evaluating different approaches or patterns for agent design
+
+**Research Tool Usage Patterns:**
+
+**For ADK Code Questions (NEW - Preferred Method):**
+1. **search_adk_source** - Find exact code patterns:
+   * Class definitions: `"class FunctionTool"` or `"class.*Agent"`
+   * Constructor signatures: `"def __init__.*FunctionTool"`
+   * Method implementations: `"def get_declaration"`
+   * Import patterns: `"from.*tools"`
+2. **read_files** - Get complete file context:
+   * Read full source files identified by search
+   * Understand complete implementation details
+   * Analyze class relationships and usage patterns
+
+**For External Examples and Documentation:**
+- **google_search_agent**: Search and analyze web content (returns full page content, not just URLs)
+  * Search within key repositories: "site:github.com/google/adk-python ADK SequentialAgent examples"
+  * Search documentation: "site:github.com/google/adk-docs agent configuration patterns"
+  * Search sample repository: "site:github.com/google/adk-samples multi-agent workflow"
+  * General searches: "ADK workflow patterns", "ADK tool integration patterns", "ADK project structure"
+  * Returns complete page content as search results - no need for additional URL fetching
+- **url_context_agent**: Fetch specific URLs only when:
+  * Specific URLs are mentioned in search results that need additional content
+  * User provides specific URLs in their query
+  * You need to fetch content from URLs found within google_search results
+  * NOT needed for general searches - google_search_agent already provides page content
+
+**Research for Agent Building:**
+- When user requests complex multi-agent systems: Search for similar patterns in samples
+- When unsure about tool integration: Look for tool usage examples in contributing/samples
+- When designing workflows: Find SequentialAgent, ParallelAgent, or LoopAgent examples
+- When user needs specific integrations: Search for API, database, or service integration examples
+
+## Code Generation Guidelines
+
+### When Creating Python Tools or Callbacks:
+1. **Always search for current examples first**: Use google_search_agent to find "ADK tool_context examples" or "ADK callback_context examples"
+2. **Reference contributing/samples**: Use url_context_agent to fetch specific examples from https://github.com/google/adk-python/tree/main/contributing/samples
+3. **Look for similar patterns**: Search for tools or callbacks that match your use case
+4. **Use snake_case**: Function names should be snake_case (e.g., `check_prime`, `roll_dice`)
+5. **Remove tool suffix**: Don't add "_tool" to function names
+6. **Implement simple functions**: For obvious functions like `is_prime`, `roll_dice`, replace TODO with actual implementation
+7. **Keep TODO for complex**: For complex business logic, leave TODO comments
+8. **Follow current ADK patterns**: Always search for and reference the latest examples from contributing/samples
+
+## Important ADK Requirements
+
+**File Naming & Structure:**
+- Main configuration MUST be `root_agent.yaml` (not `agent.yaml`)
+- Agent directories need `__init__.py` with `from . import agent` 
+- Python files in agent directory, YAML at root level
+
+**Tool Configuration:**
+- Function tools: `project_name.tools.module.function_name` format (all dots, must start with project folder name)
+- No `.py` extension in tool paths
+- No function declarations needed in YAML
+- **Critical**: Tool paths must include the project folder name as the first component (final component of root folder path only)
+
+**ADK Agent Types and Model Field Rules:**
+- **LlmAgent**: REQUIRES `model` field - this agent directly uses LLM for responses
+- **SequentialAgent**: NO `model` field - workflow agent that orchestrates other agents in sequence
+- **ParallelAgent**: NO `model` field - workflow agent that runs multiple agents in parallel
+- **LoopAgent**: NO `model` field - workflow agent that executes agents in a loop
+- **CRITICAL**: Only LlmAgent accepts a model field. Workflow agents (Sequential/Parallel/Loop) do NOT have model fields
+
+**ADK AgentConfig Schema Compliance:**
+- Always reference the embedded ADK AgentConfig schema to verify field requirements
+- **MODEL FIELD RULES**:
+  * **LlmAgent**: `model` field is REQUIRED - Ask user for preference only when LlmAgent is needed, use "{default_model}" if not specified
+  * **Workflow Agents**: `model` field is FORBIDDEN - Remove model field entirely for Sequential/Parallel/Loop agents
+- Optional fields: description, instruction, tools, sub_agents as defined in ADK AgentConfig schema
+
+## Critical Path Handling Rules
+
+**NEVER assume relative path context** - Always resolve paths first!
+
+### For relative paths provided by users:
+1. **ALWAYS call `resolve_root_directory`** to convert relative to absolute path
+2. **Verify the resolved path** matches user's intended location
+3. **Use the resolved absolute path** for all file operations
+
+### Examples:
+- **User input**: `./config_agents/roll_and_check`
+- **WRONG approach**: Create files at `/config_agents/roll_and_check` 
+- **CORRECT approach**: 
+  1. Call `resolve_root_directory("./config_agents/roll_and_check")`
+  2. Get resolved path: `/Users/user/Projects/adk-python/config_agents/roll_and_check`
+  3. Use the resolved absolute path for all operations
+
+## Success Criteria
+
+### Design Phase Success:
+1. Root folder path confirmed and analyzed with explore_project
+2. Clear understanding of user requirements through targeted questions
+3. Well-researched architecture based on proven ADK patterns
+4. Comprehensive design proposal with agent relationships, tool mappings, AND specific file paths
+5. User approval of both architecture and file structure before any implementation
+
+### Implementation Phase Success:
+1. Files created at exact paths specified in approved design
+2. No redundant suggest_file_path calls for pre-approved paths
+3. Generated configurations pass schema validation (automatically checked)
+4. Follow ADK naming and organizational conventions
+5. Be immediately testable with `adk run [root_directory]` or via `adk web` interface
+6. Include clear, actionable instructions for each agent
+7. Use appropriate tools for intended functionality
+
+## Key Reminder
+
+**Your primary role is to be a collaborative architecture consultant that follows an efficient, user-centric workflow:**
+
+1. **Always ask for root folder first** - Know where to create the project
+2. **Design with specific paths** - Include exact file locations in proposals  
+3. **Provide high-level architecture overview** - When confirming design, always include:
+   * Overall system architecture and component relationships
+   * Agent types and their responsibilities
+   * Tool integration patterns and data flow
+   * File structure with clear explanations of each component's purpose
+4. **Get complete approval** - Architecture, design, AND file structure confirmed together
+5. **Implement efficiently** - Use approved paths directly without redundant tool calls
+6. **Focus on collaboration** - Ensure user gets exactly what they need with clear understanding
+
+**This workflow eliminates inefficiencies and ensures users get well-organized, predictable file structures in their chosen location.**
+
+## Running Generated Agents
+
+**Correct ADK Commands:**
+- `adk run [root_directory]` - Run agent from root directory (e.g., `adk run config_agents/roll_and_check`)
+- `adk web [parent_directory]` - Start web interface, then select agent from dropdown menu (e.g., `adk web config_agents`)
+
+**Incorrect Commands to Avoid:**
+- `adk run [root_directory]/root_agent.yaml` - Do NOT specify the YAML file directly
+- `adk web` without parent directory - Must specify the parent folder containing the agent projects
+- Always use the project directory for `adk run`, and parent directory for `adk web`

contributing/samples/adk_agent_builder_assistant/sub_agents/__init__.py

@@ -0,0 +1,20 @@
+# 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.
+
+"""Sub-agents for Agent Builder Assistant."""
+
+from .google_search_agent import create_google_search_agent
+from .url_context_agent import create_url_context_agent
+
+__all__ = ['create_google_search_agent', 'create_url_context_agent']

contributing/samples/adk_agent_builder_assistant/sub_agents/google_search_agent.py

@@ -0,0 +1,59 @@
+# 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.
+
+"""Sub-agent for Google Search functionality."""
+
+from google.adk.agents import LlmAgent
+from google.adk.tools import google_search
+
+
+def create_google_search_agent() -> LlmAgent:
+  """Create a sub-agent that only uses google_search tool."""
+  return LlmAgent(
+      name="google_search_agent",
+      description=(
+          "Agent for performing Google searches to find ADK examples and"
+          " documentation"
+      ),
+      instruction="""You are a specialized search agent for the Agent Builder Assistant.
+
+Your role is to search for relevant ADK (Agent Development Kit) examples, patterns, documentation, and solutions.
+
+When given a search query, use the google_search tool to find:
+- ADK configuration examples and patterns
+- Multi-agent system architectures and workflows
+- Best practices and documentation
+- Similar use cases and implementations
+- Troubleshooting solutions and error fixes
+- API references and implementation guides
+
+SEARCH STRATEGIES:
+- Use site-specific searches for targeted results:
+  * "site:github.com/google/adk-python [query]" for core ADK examples
+  * "site:github.com/google/adk-samples [query]" for sample implementations
+  * "site:github.com/google/adk-docs [query]" for documentation
+- Use general searches for broader community solutions
+- Search for specific agent types, tools, or error messages
+- Look for configuration patterns and architectural approaches
+
+Return the search results with:
+1. Relevant URLs found
+2. Brief description of what each result contains
+3. Relevance to the original query
+4. Suggestions for which URLs should be fetched for detailed analysis
+
+Focus on finding practical, actionable examples that can guide ADK development and troubleshooting.""",
+      model="gemini-2.5-flash",
+      tools=[google_search],
+  )

contributing/samples/adk_agent_builder_assistant/sub_agents/url_context_agent.py

@@ -0,0 +1,62 @@
+# 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.
+
+"""Sub-agent for URL context fetching functionality."""
+
+from google.adk.agents import LlmAgent
+from google.adk.tools import url_context
+
+
+def create_url_context_agent() -> LlmAgent:
+  """Create a sub-agent that only uses url_context tool."""
+  return LlmAgent(
+      name="url_context_agent",
+      description=(
+          "Agent for fetching and analyzing content from URLs, especially"
+          " GitHub repositories and documentation"
+      ),
+      instruction="""You are a specialized URL content analysis agent for the Agent Builder Assistant.
+
+Your role is to fetch and analyze complete content from URLs to extract detailed, actionable information.
+
+TARGET CONTENT TYPES:
+- GitHub repository files (YAML configurations, Python implementations, README files)
+- ADK documentation pages and API references
+- Code examples and implementation patterns
+- Configuration samples and templates
+- Troubleshooting guides and solutions
+
+When given a URL, use the url_context tool to:
+1. Fetch the complete content from the specified URL
+2. Analyze the content thoroughly for relevant information
+3. Extract specific details about:
+   - Agent configurations and structure
+   - Tool implementations and usage patterns
+   - Architecture decisions and relationships
+   - Code snippets and examples
+   - Best practices and recommendations
+   - Error handling and troubleshooting steps
+
+Return a comprehensive analysis that includes:
+- Summary of what the content provides
+- Specific implementation details and code patterns
+- Key configuration examples or snippets
+- How the content relates to the original query
+- Actionable insights and recommendations
+- Any warnings or important considerations mentioned
+
+Focus on extracting complete, detailed information that enables practical application of the patterns and examples found.""",
+      model="gemini-2.5-flash",
+      tools=[url_context],
+  )

contributing/samples/adk_agent_builder_assistant/tools/__init__.py

@@ -0,0 +1,37 @@
+# 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.
+
+"""Tools for Agent Builder Assistant."""
+
+from .cleanup_unused_files import cleanup_unused_files
+from .delete_files import delete_files
+from .explore_project import explore_project
+from .read_config_files import read_config_files
+from .read_files import read_files
+from .resolve_root_directory import resolve_root_directory
+from .search_adk_source import search_adk_source
+from .write_config_files import write_config_files
+from .write_files import write_files
+
+__all__ = [
+    'read_config_files',
+    'write_config_files',
+    'cleanup_unused_files',
+    'delete_files',
+    'read_files',
+    'write_files',
+    'search_adk_source',
+    'explore_project',
+    'resolve_root_directory',
+]

contributing/samples/adk_agent_builder_assistant/tools/cleanup_unused_files.py

@@ -0,0 +1,108 @@
+# 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.
+
+"""Cleanup unused files tool for Agent Builder Assistant."""
+
+from pathlib import Path
+from typing import Any
+from typing import Dict
+from typing import List
+from typing import Optional
+
+
+async def cleanup_unused_files(
+    root_directory: str,
+    used_files: List[str],
+    file_patterns: Optional[List[str]] = None,
+    exclude_patterns: Optional[List[str]] = None,
+) -> Dict[str, Any]:
+  """Identify and optionally delete unused files in project directories.
+
+  This tool helps clean up unused tool files when agent configurations change.
+  It identifies files that match patterns but aren't referenced in used_files
+  list.
+
+  Args:
+    root_directory: Root directory to scan for unused files
+    used_files: List of file paths currently in use (should not be deleted)
+    file_patterns: List of glob patterns to match files (default: ["*.py"])
+    exclude_patterns: List of patterns to exclude (default: ["__init__.py"])
+
+  Returns:
+    Dict containing cleanup results:
+      - success: bool indicating if scan succeeded
+      - root_directory: absolute path to scanned directory
+      - unused_files: list of unused files found
+      - deleted_files: list of files actually deleted
+      - backup_files: list of backup files created
+      - errors: list of error messages
+      - total_freed_space: total bytes freed by deletions
+  """
+  try:
+    root_path = Path(root_directory).resolve()
+    used_files_set = {Path(f).resolve() for f in used_files}
+
+    # Set defaults
+    if file_patterns is None:
+      file_patterns = ["*.py"]
+    if exclude_patterns is None:
+      exclude_patterns = ["__init__.py", "*_test.py", "test_*.py"]
+
+    result = {
+        "success": False,
+        "root_directory": str(root_path),
+        "unused_files": [],
+        "deleted_files": [],
+        "backup_files": [],
+        "errors": [],
+        "total_freed_space": 0,
+    }
+
+    if not root_path.exists():
+      result["errors"].append(f"Root directory does not exist: {root_path}")
+      return result
+
+    # Find all files matching patterns
+    all_files = []
+    for pattern in file_patterns:
+      all_files.extend(root_path.rglob(pattern))
+
+    # Filter out excluded patterns
+    for exclude_pattern in exclude_patterns:
+      all_files = [f for f in all_files if not f.match(exclude_pattern)]
+
+    # Identify unused files
+    unused_files = []
+    for file_path in all_files:
+      if file_path not in used_files_set:
+        unused_files.append(file_path)
+
+    result["unused_files"] = [str(f) for f in unused_files]
+
+    # Note: This function only identifies unused files
+    # Actual deletion should be done with explicit user confirmation using delete_files()
+    result["success"] = True
+
+    return result
+
+  except Exception as e:
+    return {
+        "success": False,
+        "root_directory": root_directory,
+        "unused_files": [],
+        "deleted_files": [],
+        "backup_files": [],
+        "errors": [f"Cleanup scan failed: {str(e)}"],
+        "total_freed_space": 0,
+    }

contributing/samples/adk_agent_builder_assistant/tools/delete_files.py

@@ -0,0 +1,127 @@
+# 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.
+
+"""File deletion tool for Agent Builder Assistant."""
+
+from datetime import datetime
+from pathlib import Path
+import shutil
+from typing import Any
+from typing import Dict
+from typing import List
+
+
+async def delete_files(
+    file_paths: List[str],
+    create_backup: bool = False,
+    confirm_deletion: bool = True,
+) -> Dict[str, Any]:
+  """Delete multiple files with optional backup creation.
+
+  This tool safely deletes multiple files with validation and optional backup
+  creation.
+  It's designed for cleaning up unused tool files when agent configurations
+  change.
+
+  Args:
+    file_paths: List of absolute or relative paths to files to delete
+    create_backup: Whether to create a backup before deletion (default: False)
+    confirm_deletion: Whether deletion was confirmed by user (default: True for
+      safety)
+
+  Returns:
+    Dict containing deletion operation results:
+      - success: bool indicating if all deletions succeeded
+      - files: dict mapping file_path to file deletion info:
+        - existed: bool indicating if file existed before deletion
+        - backup_created: bool indicating if backup was created
+        - backup_path: path to backup file if created
+        - error: error message if deletion failed for this file
+        - file_size: size of deleted file in bytes (if existed)
+      - successful_deletions: number of files deleted successfully
+      - total_files: total number of files requested
+      - errors: list of general error messages
+  """
+  try:
+    result = {
+        "success": True,
+        "files": {},
+        "successful_deletions": 0,
+        "total_files": len(file_paths),
+        "errors": [],
+    }
+
+    # Safety check - only delete if user confirmed
+    if not confirm_deletion:
+      result["success"] = False
+      result["errors"].append("Deletion not confirmed by user")
+      return result
+
+    for file_path in file_paths:
+      file_path_obj = Path(file_path).resolve()
+      file_info = {
+          "existed": False,
+          "backup_created": False,
+          "backup_path": None,
+          "error": None,
+          "file_size": 0,
+      }
+
+      try:
+        # Check if file exists
+        if not file_path_obj.exists():
+          file_info["error"] = f"File does not exist: {file_path_obj}"
+          result["files"][str(file_path_obj)] = file_info
+          result["successful_deletions"] += 1  # Still count as success
+          continue
+
+        file_info["existed"] = True
+        file_info["file_size"] = file_path_obj.stat().st_size
+
+        # Create backup if requested
+        if create_backup:
+          timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
+          backup_path = file_path_obj.with_suffix(
+              f".backup_{timestamp}{file_path_obj.suffix}"
+          )
+          try:
+            shutil.copy2(file_path_obj, backup_path)
+            file_info["backup_created"] = True
+            file_info["backup_path"] = str(backup_path)
+          except Exception as e:
+            file_info["error"] = f"Failed to create backup: {str(e)}"
+            result["success"] = False
+            result["files"][str(file_path_obj)] = file_info
+            continue
+
+        # Delete the file
+        file_path_obj.unlink()
+        result["successful_deletions"] += 1
+
+      except Exception as e:
+        file_info["error"] = f"Deletion failed: {str(e)}"
+        result["success"] = False
+
+      result["files"][str(file_path_obj)] = file_info
+
+    return result
+
+  except Exception as e:
+    return {
+        "success": False,
+        "files": {},
+        "successful_deletions": 0,
+        "total_files": len(file_paths) if file_paths else 0,
+        "errors": [f"Delete operation failed: {str(e)}"],
+    }

contributing/samples/adk_agent_builder_assistant/tools/explore_project.py

@@ -0,0 +1,354 @@
+# 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.
+
+"""Project explorer tool for analyzing structure and suggesting file paths."""
+
+from pathlib import Path
+from typing import Any
+from typing import Dict
+from typing import List
+
+
+async def explore_project(root_directory: str) -> Dict[str, Any]:
+  """Analyze project structure and suggest optimal file paths for ADK agents.
+
+  This tool performs comprehensive project analysis to understand the existing
+  structure and recommend appropriate locations for new agent configurations,
+  tools, and related files following ADK best practices.
+
+  Args:
+    root_directory: Absolute or relative path to the root directory to explore
+      and analyze
+
+  Returns:
+    Dict containing analysis results:
+      Always included:
+        - success: bool indicating if exploration succeeded
+        - root_path: absolute path to the analyzed directory
+
+      Success cases only (success=True):
+        - project_info: dict with basic project metadata. Contains:
+                       • "name": project directory name
+                       • "absolute_path": full path to project root
+                       • "is_empty": bool indicating if directory is empty
+                       • "total_files": count of all files in project
+                       • "total_directories": count of all subdirectories
+                       • "has_python_files": bool indicating presence of .py
+                       files
+                       • "has_yaml_files": bool indicating presence of
+                       .yaml/.yml files
+                       • "has_tools_directory": bool indicating if tools/ exists
+                       • "has_callbacks_directory": bool indicating if
+                       callbacks/ exists
+        - existing_configs: list of dicts for found YAML configuration files.
+                           Each dict contains:
+                           • "filename": name of the config file
+                           • "path": absolute path to the file
+                           • "relative_path": path relative to project root
+                           • "size": file size in bytes
+                           • "is_valid_yaml": bool indicating if YAML parses
+                           correctly
+                           • "agent_name": extracted agent name (or None)
+                           • "agent_class": agent class type (default:
+                           "LlmAgent")
+                           • "has_sub_agents": bool indicating if config has
+                           sub_agents
+                           • "has_tools": bool indicating if config has tools
+        - directory_structure: dict with hierarchical project tree view
+        - suggestions: dict with recommended paths for new components. Contains:
+                      • "root_agent_configs": list of suggested main agent
+                      filenames
+                      • "sub_agent_patterns": list of naming pattern templates
+                      • "directories": dict with tool/callback directory info
+                      • "naming_examples": dict with example agent sets by
+                      domain
+        - conventions: dict with ADK naming and organization best practices
+
+      Error cases only (success=False):
+        - error: descriptive error message explaining the failure
+
+  Examples:
+    Basic project exploration:
+      result = await explore_project("/path/to/my_adk_project")
+
+    Check project structure:
+      if result["project_info"]["has_tools_directory"]:
+          print("Tools directory already exists")
+
+    Analyze existing configs:
+      for config in result["existing_configs"]:
+          if config["is_valid_yaml"]:
+              print(f"Found agent: {config['agent_name']}")
+
+    Get path suggestions:
+      suggestions = result["suggestions"]["root_agent_configs"]
+      directories = result["suggestions"]["directories"]["tools"]
+  """
+  try:
+    root_path = Path(root_directory).resolve()
+
+    if not root_path.exists():
+      return {
+          "success": False,
+          "error": f"Root directory does not exist: {root_directory}",
+          "root_path": str(root_path),
+      }
+
+    if not root_path.is_dir():
+      return {
+          "success": False,
+          "error": f"Path is not a directory: {root_directory}",
+          "root_path": str(root_path),
+      }
+
+    # Analyze project structure
+    project_info = _analyze_project_info(root_path)
+    existing_configs = _find_existing_configs(root_path)
+    directory_structure = _build_directory_tree(root_path)
+    suggestions = _generate_path_suggestions(root_path, existing_configs)
+    conventions = _get_naming_conventions()
+
+    return {
+        "success": True,
+        "root_path": str(root_path),
+        "project_info": project_info,
+        "existing_configs": existing_configs,
+        "directory_structure": directory_structure,
+        "suggestions": suggestions,
+        "conventions": conventions,
+    }
+
+  except PermissionError:
+    return {
+        "success": False,
+        "error": f"Permission denied accessing directory: {root_directory}",
+        "root_path": root_directory,
+    }
+  except Exception as e:
+    return {
+        "success": False,
+        "error": f"Error exploring project: {str(e)}",
+        "root_path": root_directory,
+    }
+
+
+def _analyze_project_info(root_path: Path) -> Dict[str, Any]:
+  """Analyze basic project information."""
+  info = {
+      "name": root_path.name,
+      "absolute_path": str(root_path),
+      "is_empty": not any(root_path.iterdir()),
+      "total_files": 0,
+      "total_directories": 0,
+      "has_python_files": False,
+      "has_yaml_files": False,
+      "has_tools_directory": False,
+      "has_callbacks_directory": False,
+  }
+
+  try:
+    for item in root_path.rglob("*"):
+      if item.is_file():
+        info["total_files"] += 1
+        suffix = item.suffix.lower()
+
+        if suffix == ".py":
+          info["has_python_files"] = True
+        elif suffix in [".yaml", ".yml"]:
+          info["has_yaml_files"] = True
+
+      elif item.is_dir():
+        info["total_directories"] += 1
+
+        if item.name == "tools" and item.parent == root_path:
+          info["has_tools_directory"] = True
+        elif item.name == "callbacks" and item.parent == root_path:
+          info["has_callbacks_directory"] = True
+
+  except Exception:
+    # Continue with partial information if traversal fails
+    pass
+
+  return info
+
+
+def _find_existing_configs(root_path: Path) -> List[Dict[str, Any]]:
+  """Find existing YAML configuration files in the project."""
+  configs = []
+
+  try:
+    # Look for YAML files in root directory (ADK convention)
+    for yaml_file in root_path.glob("*.yaml"):
+      if yaml_file.is_file():
+        config_info = _analyze_config_file(yaml_file)
+        configs.append(config_info)
+
+    for yml_file in root_path.glob("*.yml"):
+      if yml_file.is_file():
+        config_info = _analyze_config_file(yml_file)
+        configs.append(config_info)
+
+    # Sort by name for consistent ordering
+    configs.sort(key=lambda x: x["filename"])
+
+  except Exception:
+    # Return partial results if scanning fails
+    pass
+
+  return configs
+
+
+def _analyze_config_file(config_path: Path) -> Dict[str, Any]:
+  """Analyze a single configuration file."""
+  info = {
+      "filename": config_path.name,
+      "path": str(config_path),
+      "relative_path": config_path.name,  # In root directory
+      "size": 0,
+      "is_valid_yaml": False,
+      "agent_name": None,
+      "agent_class": None,
+      "has_sub_agents": False,
+      "has_tools": False,
+  }
+
+  try:
+    info["size"] = config_path.stat().st_size
+
+    # Try to parse YAML to extract basic info
+    import yaml
+
+    with open(config_path, "r", encoding="utf-8") as f:
+      content = yaml.safe_load(f)
+
+    if isinstance(content, dict):
+      info["is_valid_yaml"] = True
+      info["agent_name"] = content.get("name")
+      info["agent_class"] = content.get("agent_class", "LlmAgent")
+      info["has_sub_agents"] = bool(content.get("sub_agents"))
+      info["has_tools"] = bool(content.get("tools"))
+
+  except Exception:
+    # File exists but couldn't be parsed
+    pass
+
+  return info
+
+
+def _build_directory_tree(
+    root_path: Path, max_depth: int = 3
+) -> Dict[str, Any]:
+  """Build a directory tree representation."""
+
+  def build_tree_recursive(
+      path: Path, current_depth: int = 0
+  ) -> Dict[str, Any]:
+    if current_depth > max_depth:
+      return {"truncated": True}
+
+    tree = {
+        "name": path.name,
+        "type": "directory" if path.is_dir() else "file",
+        "path": str(path.relative_to(root_path)),
+    }
+
+    if path.is_dir():
+      children = []
+      try:
+        for child in sorted(path.iterdir()):
+          # Skip hidden files and common ignore patterns
+          if not child.name.startswith(".") and child.name not in [
+              "__pycache__",
+              "node_modules",
+          ]:
+            children.append(build_tree_recursive(child, current_depth + 1))
+        tree["children"] = children
+      except PermissionError:
+        tree["error"] = "Permission denied"
+    else:
+      tree["size"] = path.stat().st_size if path.exists() else 0
+
+    return tree
+
+  return build_tree_recursive(root_path)
+
+
+def _generate_path_suggestions(
+    root_path: Path, existing_configs: List[Dict[str, Any]]
+) -> Dict[str, Any]:
+  """Generate suggested file paths for new components."""
+
+  # Suggest main agent names if none exist
+  root_agent_suggestions = []
+  if not any(
+      config.get("agent_class") != "LlmAgent"
+      or not config.get("has_sub_agents", False)
+      for config in existing_configs
+  ):
+    root_agent_suggestions = [
+        "root_agent.yaml",
+    ]
+
+  # Directory suggestions
+  directories = {
+      "tools": {
+          "path": str(root_path / "tools"),
+          "exists": (root_path / "tools").exists(),
+          "purpose": "Custom tool implementations",
+          "example_files": [
+              "custom_email.py",
+              "database_connector.py",
+          ],
+      },
+      "callbacks": {
+          "path": str(root_path / "callbacks"),
+          "exists": (root_path / "callbacks").exists(),
+          "purpose": "Custom callback functions",
+          "example_files": ["logging.py", "security.py"],
+      },
+  }
+
+  return {
+      "root_agent_configs": root_agent_suggestions,
+      "sub_agent_patterns": [
+          "{purpose}_agent.yaml",
+          "{domain}_{action}_agent.yaml",
+          "{workflow_step}_agent.yaml",
+      ],
+      "directories": directories,
+  }
+
+
+def _get_naming_conventions() -> Dict[str, Any]:
+  """Get ADK naming conventions and best practices."""
+  return {
+      "agent_files": {
+          "format": "snake_case with .yaml extension",
+          "examples": ["main_agent.yaml", "email_processor.yaml"],
+          "location": "Root directory of the project",
+          "avoid": ["camelCase.yaml", "spaces in names.yaml", "UPPERCASE.yaml"],
+      },
+      "agent_names": {
+          "format": "snake_case, descriptive, no spaces",
+          "examples": ["customer_service_coordinator", "email_classifier"],
+          "avoid": ["Agent1", "my agent", "CustomerServiceAgent"],
+      },
+      "directory_structure": {
+          "recommended": {
+              "root": "All .yaml agent configuration files",
+              "tools/": "Custom tool implementations (.py files)",
+              "callbacks/": "Custom callback functions (.py files)",
+          }
+      },
+  }