Merge branch 'google:main' into feat/openai-responses-api-3209

Author: FrigaZzz

.agents/skills/adk-issue/SKILL.md

@@ -0,0 +1,139 @@
+---
+name: adk-issue
+description: Analyze and triage GitHub issues for the adk-python repository. Use this skill when the user provides an issue number or link to investigate whether the issue is legitimate, whether it should be fixed, and if there is an existing PR addressing it. Triggers on "analyze issue", "issue #", "github issue", "github.com/google/adk-python/issues/".
+---
+
+# ADK Issue Analyzer & Triager
+
+This skill provides a structured workflow for analyzing, verifying, and triaging GitHub issues from the `google/adk-python` repository. When a user provides a GitHub issue number or link, use this skill to perform deep investigation and report your findings.
+
+> [!IMPORTANT]
+> ## CRITICAL EXECUTION RULE: STOP AFTER STEP 2
+> * **Phase 1 (Triage & Report) is strictly read-only**: Do NOT modify any code, create new branches, or write any implementation in your first response.
+> * **STOP and ask**: You must present the analysis report first and explicitly ask the user:
+>   > "Would you like me to create and implement a fix for this issue in the workspace? (Note: The changes and tests will be created in a new branch but NOT committed, so you can review and iterate on them.)"
+> * **Wait for Approval**: Only proceed with Phase 2 (Step 3: Implementation) in a subsequent turn *after* the user explicitly approves the recommendation.
+
+## Phase 1: Triage and Analysis (Read-Only)
+
+### Step 1: Retrieve and Parse the Issue
+1. **Extract the issue number**: Parse the number from the link or prompt (e.g., `https://github.com/google/adk-python/issues/5882` -> `5882`).
+2. **Fetch issue details**: Use the `gh` CLI tool to fetch issue details in JSON format:
+   ```bash
+   gh issue view <issue_number> --repo google/adk-python --json number,title,body,state,labels,comments,assignees,createdAt,closedAt
+   ```
+   *If the `gh` CLI is not available or errors out, use `read_url_content` to fetch the public GitHub issue page:*
+   ```
+   https://github.com/google/adk-python/issues/<issue_number>
+   ```
+
+---
+
+### Step 2: Deep Investigation & Analysis
+Address the following four critical questions and present your findings in a structured, premium report.
+
+#### 1. What is broken?
+Explain the root cause of the issue or failure:
+- **Trace the execution flow**: Identify which components, classes, or functions are malfunctioning.
+- **Pinpoint the bug**: Detail why the system is behaving incorrectly and where the failure originates (e.g. incorrect logic, missing configuration, unhandled states).
+
+#### 2. Is the issue legitimate?
+Inspect the codebase to confirm if the issue represents a real problem:
+- **Examine the description**: Identify the component, class, function, or file referenced.
+- **Search the codebase**: Use `grep_search` to locate the relevant files/functions in the local workspace.
+- **Inspect the code**: Open the files using `view_file` to analyze the code's current logic.
+- **Verify the bug**:
+  - Is the reported problem actually present in the code?
+  - Does it produce the reported error or behavior under the current version (ADK 2.0)?
+  - Is it a documentation typo, setup discrepancy, or a genuine code/logic bug?
+- **Document your code evidence**: Reference specific file paths and line ranges (using clickable markdown file links, e.g., `[skill_toolset.py](file:///path/to/file#L123)`) in your report.
+
+#### 3. Should we fix it?
+Formulate a recommendation on whether the issue should be addressed:
+- **Assess the impact**:
+  - Does it break core functionality?
+  - Does it affect standard developer workflows or introduce brittle workarounds?
+  - Is it a high-priority bug or a low-impact cosmetic/feature request?
+- **Check alignment**:
+  - Does the suggested solution align with `adk-architecture` and `adk-style`?
+  - Is it consistent with Python idioms and Pydantic validation rules?
+- **Evaluate workarounds**: Is there a clean workaround, or is a core fix necessary?
+- **Final Recommendation**: Clearly declare whether we should fix it, along with the reasoning and estimated complexity/scope of the fix.
+
+#### 4. Is there a linked PR that fixes this issue?
+Search for any existing pull requests that attempt to resolve the issue:
+- **Search PRs**: Run `gh pr list --repo google/adk-python --search "<issue_number>"` to list pull requests mentioning the issue number in the branch name, title, or body.
+- **Verify the PR details**: If PRs are found, fetch their details:
+  ```bash
+  gh pr view <pr_number> --repo google/adk-python --json number,title,state,url,body,author
+  ```
+- **Analyze progress**: Check if the PR is open, merged, or closed, and if it successfully fixes the issue according to the repository's testing patterns.
+- **Present the structured report**: Format and present your findings structured as a premium report following the **Report Template** below.
+- **Offer to create a fix**: If no existing PR is found, you MUST explicitly ask the user: "Would you like me to create and implement a fix for this issue in the workspace? (Note: The changes and tests will be created in a new branch but NOT committed, so you can review and iterate on them.)"
+
+---
+
+## Phase 2: Implementation (After User Approval)
+
+### Step 3: Propose and Implement Fix
+Once the user has approved the implementation of the fix in the workspace, follow these rules:
+   - **Do NOT commit the changes**: Leave them uncommitted in the workspace so the user can review and iterate on them.
+   - **Base the branch on remote HEAD**: When creating the new branch, ensure it is based on the remote tracking branch HEAD (`origin/main`), not the current local branch. For example:
+     ```bash
+     git checkout -b fix/<issue_number>-<desc> origin/main
+     ```
+   - **Follow these implementation steps**:
+     1. **Create the fix**: Modify the necessary source files implementing clean, robust logic following `adk-style` and `adk-architecture`.
+     2. **Add or update unittests**: Write comprehensive unit tests to verify the behavior and prevent regressions.
+     3. **Update documentation**: Update `/docs/design` and `/docs/guides` if applicable to the changes.
+     4. **Update samples**: Update `/contributing/samples` if applicable to demonstrate the new capability or updated behavior.
+
+---
+
+## Report Template
+
+Present your final analysis as a high-quality markdown response using the following structure:
+
+```markdown
+# GitHub Issue #<issue_number> Analysis: <Issue Title>
+
+## Detailed Analysis
+
+### 1. Root Cause Analysis ("What is broken?")
+- Explanation of the failure or bug (what is failing and why).
+- Pinpoint the exact file, function, or design component that is malfunctioning.
+
+### 2. Legitimacy Analysis
+- **Status**: [Legitimate Bug / Feature Request / Duplicate / Invalid / Not Reproducible]
+- **Evidence**:
+  - Code references: [filename.py](file:///absolute/path/to/file#L100-L120)
+  - Analysis of code behavior and why the issue occurs.
+
+### 3. Fix Recommendation
+- **Recommendation**: [Should Fix (High Priority) / Should Fix (Medium/Low Priority) / Won't Fix / Needs Discussion]
+- **Rationale**:
+  - Impact on user experience, workflows, or architecture.
+  - Implementation complexity and risk of side effects.
+
+### 4. Existing Pull Requests
+- **Linked PR**: [None / Pull Request #<pr_number> - <PR Title> (<state>)]
+- **PR URL**: <PR URL>
+- **Analysis**: Brief summary of the PR's approach and status (e.g., "Fixes the bug by implementing X in Y, currently awaiting review").
+
+---
+
+## Executive Summary
+1. **What is broken?** [Brief explanation of the root cause or error]
+2. **Is the issue legitimate?** [Yes / No - brief explanation]
+3. **Should we fix it?** [Yes / No / Needs Discussion - priority & brief reasoning]
+4. **Is there a linked PR that fixes this issue?** [None / Yes, PR #<pr_number> - <state>]
+```
+
+---
+
+## Tips & Best Practices
+> [!TIP]
+> Always use explicit repository qualifiers (`--repo google/adk-python`) when running `gh` commands to avoid failures due to custom internal or local git remotes.
+
+> [!IMPORTANT]
+> When presenting code files and lines, always use markdown file links that point directly to the files in the workspace. Make sure the link is clickable and formatted as `[filename.py](file:///absolute/path/to/file#L100-L120)` without surrounding backticks around the brackets.

.agents/skills/adk-review/SKILL.md

@@ -0,0 +1,76 @@
+---
+name: adk-review
+description: Reviews all local changes in the repository for errors, styling compliance, unintended outcomes, and necessary documentation/test/sample updates. Generates a report and assists in fixing identified issues on-demand. Triggers on "adk-review", "review changes", "pr review", "check code style", "verify changes".
+---
+
+# ADK Change Reviewer (adk-review)
+
+This skill guides AI assistants in performing a comprehensive, rigorous review of local repository changes before they are committed or submitted. It evaluates code correctness, style guidelines, architectural impact, and checks if associated tests, samples, and documentation need updates. It generates a detailed report and, upon explicit user request, assists in automatically fixing the identified issues.
+
+> [!NOTE]
+> Always read this skill and follow its steps when asked to review local changes or before finalizing a PR/commit.
+
+---
+
+## Review Checklist Dimensions
+
+### 1. Code Correctness & Errors
+- **Syntax & Types**: Ensure the code is free of syntax errors and conforms to strong typing guidelines. Avoid using `Any`, and prefer specific/abstract types. Use `X | None` instead of `Optional[X]`.
+- **Imports**: Verify there are no circular imports. Ensure absolute imports are used where appropriate.
+- **Exception Handling**: Avoid bare `except:`. Always catch specific exceptions and log them properly with context.
+- **Visibility**: Ensure internal modules and package-private attributes use proper naming (e.g., prefixed with `_`) per ADK rules.
+- **Edge Cases & Defensive Programming**:
+  - **Type & Attribute Discrimination**: Explicitly verify an object's type (e.g., using `isinstance`) before checking type-specific or custom attributes (e.g., checking if a node is an `LlmAgent` before inspecting its `mode`), avoiding errors on unexpected types.
+  - **Boundary and Null Conditions**: Ensure robust handling for boundary conditions and null values (e.g., `None`, empty collections, zero, or empty strings) using validation or fallback defaults.
+  - **Preconditions & Invariants**: Validate that preconditions and state invariants are checked before performing core logic.
+
+### 2. Style and Convention Compliance
+- **ADK Style Guide**: Cross-reference all code changes with the guidelines in the `adk-style` skill (including Pydantic v2 patterns, lazy logging evaluation, and file structure).
+- **Pre-commit Hooks**: Ensure changed files are formatted and linted. Remind the user to run `pre-commit run --files <files>` if hooks like `isort`, `pyink`, `addlicense`, or `mdformat` are not configured automatically.
+
+### 3. Architectural Integrity & Unintended Outcomes
+- **Public API Stability**: Verify whether changes modify, remove, or restrict public-facing interfaces, classes, methods, argument lists, or CLI structures (e.g., in the public package namespaces under `src/google/adk/`). Breaking changes are unacceptable without a formal deprecation cycle under Semantic Versioning.
+- **Execution & Resumption**: If changing workflows, nodes, or state management, ensure compatibility with the ADK 2.0 event execution lifecycle and session resumption (HITL/checkpoints).
+- **Concurrency & Safety**: Check for race conditions or resource leaks. Ensure long-running or shared resources (like plugins, exporters, and connections) are closed/disposed of safely.
+
+### 4. Documentation Impact (`docs/design` and `docs/guides`)
+- **Design & Architecture**: Determine if the change updates a core design contract. If so, check if design docs under `docs/design/` require updates or new documents need to be written.
+- **Guides**: If the changes introduce a new feature or change a public API/workflow pattern, check if the guides under `docs/guides/` need updates.
+
+### 5. Sample Compatibility & Updates
+- **Sample Integrity**: Verify if existing samples under `contributing/samples/` are affected by the change.
+- **New Samples**: If the changes introduce a key new capability, assess whether a new sample should be added to demonstrate the feature (following `adk-sample-creator` conventions).
+
+### 6. Test Coverage & Quality
+- **Coverage**: Ensure that all modified or new code paths have corresponding unit or integration tests under `tests/`.
+- **ADK Test Rules**: Ensure test implementations adhere to the 9 rules in the `adk-style` testing reference (e.g., using deterministic IDs, event normalization, and clean up utilities).
+
+---
+
+## Execution Workflow
+
+When the `adk-review` skill is triggered, you MUST execute the following steps:
+
+### Step 1: Retrieve Local Changes
+Run `git status` and `git diff` to identify exactly which files have been modified, added, or deleted.
+
+### Step 2: Perform the Multi-Dimensional Review
+Analyze the retrieved diffs file-by-file against the six dimensions in the Checklist. Identify any errors, deviations, or missing files (such as docs, tests, or samples).
+
+### Step 3: Generate and Present a Review Report
+Generate a clear, beautifully formatted Markdown report categorized by priority:
+- 🔴 **Critical Errors / Bugs**: Syntax, type safety violations, race conditions, or resource leaks.
+- 🟡 **Style & Conventions**: Lints, formatting issues, non-lazy logging, or typing mismatches.
+- 🔵 **Documentation, Tests, & Samples**: Missing or stale test coverage, design docs, or user guides.
+
+Include the specific filename and line number/context for each finding.
+
+### Step 4: Present Findings and Stop
+Stop execution here. Do **NOT** call any code editing tools or modify the codebase automatically. Present the generated review report clearly to the user, highlighting key takeaways, and stop.
+
+Do **NOT** ask the user if they want you to fix the issues, and do **NOT** offer interactive fixing options by default. Simply stop and wait for the user to explicitly command or ask you to fix the changes.
+
+### Step 5 (Optional): Implement Authorized Fixes & Verify
+If, and only if, the user explicitly instructs or requests you to apply a fix for some or all of the identified findings:
+1. Perform the necessary edits using precise code editing tools. Ensure all fixes strictly comply with the established `adk-style` and `adk-architecture` rules.
+2. Verify correctness by running associated unit and integration tests (e.g., via `pytest` or pre-commit hooks) before concluding.

AGENTS.md

@@ -14,6 +14,10 @@ For all matters regarding ADK development, please use the appropriate skill:
   - Read `.agents/skills/adk-git/SKILL.md` for full instructions.
 - **`adk-sample-creator`**: Use this skill when creating new samples demonstrating features or agent patterns, or when adding examples to subdirectories under `contributing/`.
   - Read `.agents/skills/adk-sample-creator/SKILL.md` for full instructions.
+- **`adk-review`**: Use this skill to review local changes for errors, style compliance, unintended outcomes, and to check if associated design docs, guides, samples, or tests need updates.
+  - Read `.agents/skills/adk-review/SKILL.md` for full instructions.
+- **`adk-issue`**: Use this skill when analyzing and triaging GitHub issues for the adk-python repository to verify legitimacy, recommend fixes, and check for existing PRs.
+  - Read `.agents/skills/adk-issue/SKILL.md` for full instructions.
 
 ## Project Overview
 

contributing/samples/core/abort/README.md

@@ -0,0 +1,91 @@
+# Abort Agent Sample
+
+## Overview
+
+This sample demonstrates a standalone ADK agent designed specifically to showcase cooperative task cancellation on client disconnections.
+
+The agent leverages a custom tool that counts from 1 to a target number requested by the user, pausing 1 second between each count and printing the progress directly to the server's stdout terminal. This delay allows you to easily trigger connection drops (by cancelling client requests mid-execution) and visually observe that background agent execution halts immediately in the server terminal, resolving resource leaks.
+
+## Sample Inputs
+
+- `Count to 10 seconds`
+
+  The agent will call the `count_seconds` tool with a target count of 10, pausing 1 second between each increment.
+
+- `Please count up to 20`
+
+  The agent will invoke the tool to count to 20. If you close the client connection (such as pressing `Ctrl+C` in a cURL window or closing your browser tab) while the loop is running, counting halts immediately.
+
+## Graph
+
+```mermaid
+graph TD
+    START --> AbortAgent
+    AbortAgent --> |"Invoke Tool"| count_seconds
+    count_seconds --> |"Abort if Disconnected / Done"| AbortAgent
+    AbortAgent --> ANSWER
+```
+
+## How To
+
+### 1. Running Locally via the CLI
+
+To interact with the agent in your local shell terminal:
+
+```bash
+adk run contributing/samples/core/abort/
+```
+
+Type `count to 10` at the `[user]:` prompt. Pressing `Ctrl+C` mid-run will abort counting and exit.
+
+### 2. Running via HTTP Server and cURL
+
+To verify connection-drop abortion over network protocols (e.g. simple HTTP REST request):
+
+1. Start the local development server to watch the sample workspace:
+   ```bash
+   adk web --allow_origins=http://localhost:4200 contributing/samples/
+   ```
+1. In a separate terminal, register the test session (local CLI development servers run with `--auto_create_session` set to `False` by default):
+   ```bash
+   curl -X POST http://localhost:8000/apps/abort_agent/users/user/sessions \
+     -H "Content-Type: application/json" \
+     -d '{"session_id": "8b24e6ed-1fff-4f0c-a06a-e065692a446e"}'
+   ```
+1. Initiate the count request (this blocks waiting for a response):
+   ```bash
+   curl -X POST http://localhost:8000/run \
+     -H "Content-Type: application/json" \
+     -d '{
+       "app_name": "abort_agent",
+       "user_id": "user",
+       "session_id": "8b24e6ed-1fff-4f0c-a06a-e065692a446e",
+       "new_message": {
+         "role": "user",
+         "parts": [{"text": "count to 100"}]
+       }
+     }'
+   ```
+1. Observe your `adk web` terminal window. You will see the counting progress logging.
+1. **Trigger the Abort**: Press `Ctrl+C` in your cURL terminal window to close the client connection.
+1. Observe the server console window. Counting halts instantly and prints:
+   ```text
+   [Counting Tool] Count was ABORTED mid-run at progress: X/100 (Client Disconnected)!
+   ```
+
+### 3. Running and Testing via ADK Web (Dev UI)
+
+To observe cooperative aborts interactively in the web-based developer interface:
+
+1. Start the local development server:
+   ```bash
+   adk web --allow_origins=http://localhost:4200 contributing/samples/
+   ```
+1. Open the ADK Web interface (`http://localhost:4200`) in your web browser.
+1. Select the **`abort_agent`** app from the left sidebar panel.
+1. Type `count to 100` in the message input box and click submit.
+1. **Trigger the Abort**: Simply close your browser tab, refresh the page, or navigate away from the chat panel.
+1. Observe the server's stdout terminal console. You will see that counting halts immediately and logs:
+   ```text
+   [Counting Tool] Count was ABORTED mid-run (Client Disconnected)!
+   ```

contributing/samples/core/abort/__init__.py

@@ -0,0 +1,15 @@
+# Copyright 2026 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.
+
+from . import agent