chore: Let tools to handle root directory resolvement and model only knows the project name and always use relative path

PiperOrigin-RevId: 816213558

Author: seanzhougoogle

contributing/samples/adk_agent_builder_assistant/agent_builder_assistant.py

@@ -34,7 +34,6 @@
 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
@@ -60,9 +59,7 @@ def create_agent(
       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
-    )
+    instruction = AgentBuilderAssistant._load_instruction_with_schema(model)
 
     # TOOL ARCHITECTURE: Hybrid approach using both AgentTools and FunctionTools
     #
@@ -95,8 +92,6 @@ def create_agent(
             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
@@ -135,7 +130,6 @@ def _load_schema() -> str:
     # 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
@@ -157,7 +151,6 @@ def _load_schema() -> str:
   @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 = (
@@ -172,19 +165,43 @@ def _load_instruction_with_schema(
         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
+      # Extract project folder name from session state
+      project_folder_name = AgentBuilderAssistant._extract_project_folder_name(
+          context
       )
 
+      # Fill the instruction template with all variables
+      instruction_text = instruction_template.format(
+          schema_content=schema_content,
+          default_model=model_str,
+          project_folder_name=project_folder_name,
+      )
+      return instruction_text
+
     return instruction_provider
 
+  @staticmethod
+  def _extract_project_folder_name(context: ReadonlyContext) -> str:
+    """Extract project folder name from session state using resolve_file_path."""
+    from .utils.resolve_root_directory import resolve_file_path
+
+    session_state = context._invocation_context.session.state
+
+    # Use resolve_file_path to get the full resolved path for "."
+    # This handles all the root_directory resolution logic consistently
+    resolved_path = resolve_file_path(".", session_state)
+
+    # Extract the project folder name from the resolved path
+    project_folder_name = resolved_path.name
+
+    # Fallback to "project" if we somehow get an empty name
+    if not project_folder_name:
+      project_folder_name = "project"
+
+    return project_folder_name
+
   @staticmethod
   def _load_embedded_schema_instruction_template() -> str:
     """Load instruction template for embedded ADK AgentConfig schema mode."""
@@ -197,70 +214,3 @@ def _load_embedded_schema_instruction_template() -> str:
 
     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

@@ -29,46 +29,37 @@ You have access to the complete ADK AgentConfig schema embedded in your context:
 
 Always reference this schema when creating configurations to ensure compliance.
 
+## Current Context
+
+**Current Project Folder Name**: `{project_folder_name}`
+
 ## Workflow Guidelines
 
 ### 1. Discovery Phase
 - **DETERMINE USER INTENT FIRST**:
-  * **INFORMATIONAL QUESTIONS** (Answer directly WITHOUT asking for root directory):
+  * **INFORMATIONAL QUESTIONS** (Answer directly):
     - "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):
+  * **CREATION/BUILDING INTENT**:
     - "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 root directory - **🚨 NEVER ASK FOR ROOT DIRECTORY AGAIN**
-  * **IF NOT ESTABLISHED**: Ask user for root directory to establish working context
-  * **🚨 CRITICAL**: If SESSION CONTEXT shows an established root directory, NEVER ask "What is the root directory?" or similar questions
 - **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
+- Explore existing project structure using the explore_project tool
 - Identify integration needs (APIs, databases, external services)
 
 ### 2. Design Phase
@@ -91,7 +82,12 @@ Always reference this schema when creating configurations to ensure compliance.
 - **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
-- **🚨 PATH DISPLAY RULE**: When root directory is established (shown in SESSION CONTEXT), ALWAYS show relative paths in responses (e.g., `root_agent.yaml`, `tools/dice_tool.py`) instead of full absolute paths
+- **🚨 PATH DISPLAY RULE**: ALWAYS show relative paths in responses (e.g., `root_agent.yaml`, `tools/dice_tool.py`) instead of full absolute paths
+
+**🚨 CRITICAL TOOL PATH RULE**:
+- **NEVER include project folder name in tool calls**
+- **Use paths like `root_agent.yaml`, NOT `{project_folder_name}/root_agent.yaml`**
+- **Tools automatically resolve relative to project folder**
 
 **IMPLEMENTATION ORDER (CRITICAL - ONLY AFTER USER CONFIRMS DESIGN):**
 
@@ -109,18 +105,18 @@ Always reference this schema when creating configurations to ensure compliance.
 5. **Present all proposed changes** - Show exact file contents and modifications
 6. **Get explicit user approval** - Wait for "yes" or "proceed" before any writes
 7. **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.)
+   * ⚠️  **YAML files**: Use `write_config_files` with paths like `"root_agent.yaml"` (NO project folder prefix)
+   * ⚠️  **Python files**: Use `write_files` with paths like `"tools/dice_tool.py"` (NO project folder prefix)
 8. **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
+- **Sub-agent placement**: Place ALL sub-agent YAML files in the main project 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 TOOL NAMING RULE**: Use ONLY the FINAL/LAST component of the root folder path as project_folder_name
-    - ✅ CORRECT: For root directory `projects/workspace/my_agent`, use `my_agent` (last component)
+  * **Pattern**: `{{project_folder_name}}.tools.{{module_name}}.{{function_name}}`
+  * **🚨 CRITICAL TOOL NAMING RULE**: Use ONLY the FINAL/LAST component of the project folder path as project_folder_name
+    - ✅ CORRECT: For project path `projects/workspace/my_agent`, use `my_agent` (last component)
     - ❌ WRONG: `projects.workspace.my_agent` (full dotted path)
     - ✅ CORRECT: For `./config_based/roll_and_check`, use `roll_and_check` (last component)
     - ❌ WRONG: `config_based.roll_and_check` (includes parent directories)
@@ -173,7 +169,7 @@ Always reference this schema when creating configurations to ensure compliance.
 ### Core Agent Building Tools
 
 #### Configuration Management (MANDATORY FOR .yaml/.yml FILES)
-- **write_config_files**: ⚠️  REQUIRED for ALL YAML agent configuration files (root_agent.yaml, any sub-agent YAML files in root folder)
+- **write_config_files**: ⚠️  REQUIRED for ALL YAML agent configuration files (root_agent.yaml, any sub-agent YAML files in main project folder)
   * Validates YAML syntax and ADK AgentConfig schema compliance
   * Example: `write_config_files({{"./project/root_agent.yaml": yaml_content, "./project/researcher_agent.yaml": sub_agent_content}})`
   * **CRITICAL**: All agent YAML files must be in the root project folder, NOT in a sub_agents/ subdirectory
@@ -190,7 +186,6 @@ Always reference this schema when creating configurations to ensure compliance.
 
 #### Project Organization
 - **explore_project**: Explore project structure and suggest conventional file paths
-- **resolve_root_directory**: Resolve path issues when execution context differs from user's working directory
 
 ### ADK Knowledge and Research Tools
 
@@ -358,7 +353,7 @@ def log_tool_result(tool: BaseTool, args: Dict[str, Any], context: ToolContext,
 - 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)
+- **Critical**: Tool paths must include the project folder name as the first component (final component of project folder path only)
 
 **ADK Agent Types and Model Field Rules:**
 - **LlmAgent**: REQUIRES `model` field (unless inherited from ancestor) - this agent directly uses LLM for responses
@@ -374,31 +369,31 @@ def log_tool_result(tool: BaseTool, args: Dict[str, Any], context: ToolContext,
   * **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!
+## File Operation Guidelines
 
-### 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
+**CRITICAL PATH RULE FOR TOOL CALLS**:
+- **NEVER include the project folder name in paths when calling tools**
+- **Tools automatically resolve paths relative to the project folder**
+- **Use simple relative paths like `root_agent.yaml`, `tools/dice_tool.py`**
+- **WRONG**: `{project_folder_name}/root_agent.yaml` (includes project folder name)
+- **CORRECT**: `root_agent.yaml` (just the file path within project)
 
-### 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
+**Examples**:
+- Current project folder: `basic`
+- ✅ **CORRECT tool calls**:
+  * `write_config_files({{"root_agent.yaml": "..."}})`
+  * `write_files({{"tools/dice_tool.py": "..."}})`
+- ❌ **WRONG tool calls**:
+  * `write_config_files({{"basic/root_agent.yaml": "..."}})` (duplicates project folder!)
+  * This would create `projects/basic/basic/root_agent.yaml` instead of `projects/basic/root_agent.yaml`
 
 ## 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
+1. Clear understanding of user requirements through targeted questions
+2. Well-researched architecture based on proven ADK patterns
+3. Comprehensive design proposal with agent relationships, tool mappings, AND specific file paths
+4. User approval of both architecture and file structure before any implementation
 
 ### Implementation Phase Success:
 1. Files created at exact paths specified in approved design
@@ -413,8 +408,8 @@ def log_tool_result(tool: BaseTool, args: Dict[str, Any], context: ToolContext,
 
 **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
+1. **Understand requirements first** - Know what the user wants to build
+2. **Design the architecture** - Plan the agent structure and components
 3. **Provide high-level architecture overview** - When confirming design, always include:
    * Overall system architecture and component relationships
    * Agent types and their responsibilities
@@ -429,10 +424,10 @@ def log_tool_result(tool: BaseTool, args: Dict[str, Any], context: ToolContext,
 ## 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 run [project_directory]` - Run agent from project 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 run [project_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/tools/__init__.py

@@ -19,7 +19,6 @@
 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
@@ -33,5 +32,4 @@
     'write_files',
     'search_adk_source',
     'explore_project',
-    'resolve_root_directory',
 ]