fix: map LiteLLM thought parts to reasoning_content

- Treat Part(thought=True) as reasoning_content when building assistant messages.
- Add unit tests for thought-only and thought+text cases.

Close #4069

Co-authored-by: George Weale <gweale@google.com>
PiperOrigin-RevId: 853790274

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

@@ -16,7 +16,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Set up Python
         uses: actions/setup-python@v6

.github/workflows/check-file-contents.yml

@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 2
 

.github/workflows/discussion_answering.yml

@@ -15,7 +15,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Set up Python
         uses: actions/setup-python@v6
@@ -24,7 +24,7 @@ jobs:
 
       - name: Authenticate to Google Cloud
         id: auth
-        uses: 'google-github-actions/auth@v2'
+        uses: 'google-github-actions/auth@v3'
         with:
           credentials_json: '${{ secrets.ADK_GCP_SA_KEY }}'
 

.github/workflows/isort.yml

@@ -26,7 +26,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 2
 

.github/workflows/pr-triage.yml

@@ -20,7 +20,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Set up Python
         uses: actions/setup-python@v6

.github/workflows/pyink.yml

@@ -26,7 +26,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 2
 

.github/workflows/python-unit-tests.yml

@@ -29,7 +29,7 @@ jobs:
 
     steps:
     - name: Checkout code
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
 
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v6

.github/workflows/stale-bot.yml

@@ -1,3 +1,17 @@
+# 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.
+
 name: ADK Stale Issue Auditor
 
 on:
@@ -18,7 +32,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Set up Python
         uses: actions/setup-python@v6

.github/workflows/triage.yml

@@ -24,7 +24,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Set up Python
         uses: actions/setup-python@v6

.github/workflows/upload-adk-docs-to-vertex-ai-search.yml

@@ -13,7 +13,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Clone adk-docs repository
         run: git clone https://github.com/google/adk-docs.git /tmp/adk-docs
@@ -28,7 +28,7 @@ jobs:
 
       - name: Authenticate to Google Cloud
         id: auth
-        uses: 'google-github-actions/auth@v2'
+        uses: 'google-github-actions/auth@v3'
         with:
           credentials_json: '${{ secrets.ADK_GCP_SA_KEY }}'
 

.gitignore

@@ -101,6 +101,7 @@ Thumbs.db
 
 # AI Coding Tools - Project-specific configs
 # Developers should symlink or copy AGENTS.md and add their own overrides locally
+.adk/
 .claude/
 CLAUDE.md
 .cursor/

CHANGELOG.md

@@ -1,5 +1,75 @@
 # Changelog
 
+## [1.21.0](https://github.com/google/adk-python/compare/v1.20.0...v1.21.0) (2025-12-11)
+
+### Features
+* **[Interactions API Support]**
+  * The newly released Gemini [Interactions API](https://ai.google.dev/gemini-api/docs/interactions) is supported in ADK now. To use it:
+  ```Python
+  Agent(
+    model=Gemini(
+        model="gemini-3-pro-preview",
+        use_interactions_api=True,
+    ),
+    name="...",
+    description="...",
+    instruction="...",
+  )
+  ```
+  see [samples](https://github.com/google/adk-python/tree/main/contributing/samples/interactions_api) for details
+
+
+* **[Services]**
+  * Add `add_session_to_memory` to `CallbackContext` and `ToolContext` to explicitly save the current session to memory ([7b356dd](https://github.com/google/adk-python/commit/7b356ddc1b1694d2c8a9eee538f3a41cf5518e42))
+
+* **[Plugins]**
+  * Add location for table in agent events in plugin BigQueryAgentAnalytics ([507424a](https://github.com/google/adk-python/commit/507424acb9aabc697fc64ef2e9a57875f25f0a21))
+  * Upgrade BigQueryAgentAnalyticsPlugin to v2.0 with improved performance, multimodal support, and reliability ([7b2fe14](https://github.com/google/adk-python/commit/7b2fe14dab96440ee25b66dae9e66eadba629a56))
+
+
+* **[A2A]**
+  * Adds ADK EventActions to A2A response ([32e87f6](https://github.com/google/adk-python/commit/32e87f6381ff8905a06a9a43a0207d758a74299d))
+
+* **[Tools]**
+  * Add `header_provider` to `OpenAPIToolset` and `RestApiTool` ([e1a7593](https://github.com/google/adk-python/commit/e1a7593ae8455d51cdde46f5165410217400d3c9))
+  * Allow overriding connection template ([cde7f7c](https://github.com/google/adk-python/commit/cde7f7c243a7cdc8c7b886f68be55fd59b1f6d5a))
+  * Add SSL certificate verification configuration to OpenAPI tools using the `verify` parameter ([9d2388a](https://github.com/google/adk-python/commit/9d2388a46f7a481ea1ec522f33641a06c64394ed))
+  * Use json schema for function tool declaration when feature enabled ([cb3244b](https://github.com/google/adk-python/commit/cb3244bb58904ab508f77069b436f85b442d3299))
+
+* **[Models]**
+  * Add Gemma3Ollama model integration and a sample ([e9182e5](https://github.com/google/adk-python/commit/e9182e5eb4a37fb5219fc607cd8f06d7e6982e83))
+
+
+### Bug Fixes
+
+* Install dependencies for py 3.10 ([9cccab4](https://github.com/google/adk-python/commit/9cccab453706138826f313c47118812133e099c4))
+* Refactor LiteLLM response schema formatting for different models ([894d8c6](https://github.com/google/adk-python/commit/894d8c6c2652492324c428e8dae68a8646b17485))
+* Resolve project and credentials before creating Spanner client ([99f893a](https://github.com/google/adk-python/commit/99f893ae282a04c67cce5f80e87d3bfadd3943e6))
+* Avoid false positive "App name mismatch" warnings in Runner ([6388ba3](https://github.com/google/adk-python/commit/6388ba3b2054e60d218eae6ec8abc621ed0a1139))
+* Update the code to work with either 1 event or more than 1 events ([4f54660](https://github.com/google/adk-python/commit/4f54660d6de54ddde0fec6e09fdd68890ce657ca))
+* OpenAPI schema generation by skipping JSON schema for judge_model_config ([56775af](https://github.com/google/adk-python/commit/56775afc48ee54e9cbea441a6e0fa6c8a12891b9))
+* Add tool_name_prefix support to OpenAPIToolset ([82e6623](https://github.com/google/adk-python/commit/82e6623fa97fb9cbc6893b44e228f4da098498da))
+* Pass context to client interceptors ([143ad44](https://github.com/google/adk-python/commit/143ad44f8c5d1c56fc92dd691589aaa0b788e485))
+* Yield event with error code when agent run raised A2AClientHTTPError ([b7ce5e1](https://github.com/google/adk-python/commit/b7ce5e17b6653074c5b41d08b2027b5e9970a671))
+* Handle string function responses in LiteLLM conversion ([2b64715](https://github.com/google/adk-python/commit/2b6471550591ee7fc5f70f79e66a6e4080df442b))
+* ApigeeLLM support for Built-in tools like GoogleSearch, BuiltInCodeExecutor when calling Gemini models through Apigee ([a9b853f](https://github.com/google/adk-python/commit/a9b853fe364d08703b37914a89cf02293b5c553b))
+* Extract and propagate task_id in RemoteA2aAgent ([82bd4f3](https://github.com/google/adk-python/commit/82bd4f380bd8b4822191ea16e6140fe2613023ad))
+* Update FastAPI and Starlette to fix CVE-2025-62727 (ReDoS vulnerability) ([c557b0a](https://github.com/google/adk-python/commit/c557b0a1f2aac9f0ef7f1e0f65e3884007407e30))
+* Add client id to token exchange ([f273517](https://github.com/google/adk-python/commit/f2735177f195b8d7745dba6360688ddfebfed31a))
+
+### Improvements
+
+* Normalize multipart content for LiteLLM's ollama_chat provider ([055dfc7](https://github.com/google/adk-python/commit/055dfc79747aa365db8441908d4994f795e94a68))
+* Update adk web, fixes image not rendering, state not updating, update drop down box width and trace icons ([df86847](https://github.com/google/adk-python/commit/df8684734bbfd5a8afe3b4362574fe93dcb43048))
+* Add sample agent for interaction api integration ([68d7048](https://github.com/google/adk-python/commit/68d70488b9340251a9d37e8ae3a9166870f26aa1))
+* Update genAI SDK version ([f0bdcab](https://github.com/google/adk-python/commit/f0bdcaba449f21bd8c27cde7dbedc03bf5ec5349))
+* Introduce `build_function_declaration_with_json_schema` to use pydantic to generate json schema for FunctionTool ([51a638b](https://github.com/google/adk-python/commit/51a638b6b85943d4aaec4ee37c95a55386ebac90))
+* Update component definition for triaging agent ([ee743bd](https://github.com/google/adk-python/commit/ee743bd19a8134129111fc4769ec24e40a611982))
+* Migrate Google tools to use the new feature decorator ([bab5729](https://github.com/google/adk-python/commit/bab57296d553cb211106ece9ee2c226c64a60c57))
+* Migrate computer to use the new feature decorator ([1ae944b](https://github.com/google/adk-python/commit/1ae944b39d9cf263e15b36c76480975fe4291d22))
+* Add Spanner execute sql query result mode using list of dictionaries ([f22bac0](https://github.com/google/adk-python/commit/f22bac0b202cd8f273bf2dee9fff57be1b40730d))
+* Improve error message for missing `invocation_id` and `new_message` in `run_async` ([de841a4](https://github.com/google/adk-python/commit/de841a4a0982d98ade4478f10481c817a923faa2))
+
 ## [1.20.0](https://github.com/google/adk-python/compare/v1.19.0...v1.20.0) (2025-12-01)
 
 
@@ -282,7 +352,7 @@
 
 * Returns dict as result from McpTool to comply with BaseTool expectations ([4df9263](https://github.com/google/adk-python/commit/4df926388b6e9ebcf517fbacf2f5532fd73b0f71))
 * Fixes the identity prompt to be one line ([7d5c6b9](https://github.com/google/adk-python/commit/7d5c6b9acf0721dd230f08df919c7409eed2b7d0))
-* Fix the broken langchain importing caused their 1.0.0 release ([c850da3](https://github.com/google/adk-python/commit/c850da3a07ec1441037ced1b654d8aacacd277ab))
+* Fix the broken langchain importing caused by their 1.0.0 release ([c850da3](https://github.com/google/adk-python/commit/c850da3a07ec1441037ced1b654d8aacacd277ab))
 * Fix BuiltInCodeExecutor to support visualizations ([ce3418a](https://github.com/google/adk-python/commit/ce3418a69de56570847d45f56ffe7139ab0a47aa))
 * Relax runner app-name enforcement and improve agent origin inference ([dc4975d](https://github.com/google/adk-python/commit/dc4975dea9fb79ad887460659f8f397a537ee38f))
 * Improve error message when adk web is run in wrong directory ([4a842c5](https://github.com/google/adk-python/commit/4a842c5a1334c3ee01406f796651299589fe12ab))
@@ -559,7 +629,7 @@
 ### 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)
+* Fixes root_agent.yaml in tool_mcp_stdio_notion_config for Agent Config sample and adds 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)

CONTRIBUTING.md

@@ -56,14 +56,14 @@ information on using pull requests.
 
 ### Requirement for PRs
 
--   All PRs, other than small documentation or typo fixes, should have a Issue
+-   All PRs, other than small documentation or typo fixes, should have an Issue
     associated. If a relevant issue doesn't exist, please create one first or
     you may instead describe the bug or feature directly within the PR
     description, following the structure of our issue templates.
 -   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
+-   Please include a `testing plan` section in your PR to describe how you
     will test. This will save time for PR review. See `Testing Requirements`
     section for more details.
 
@@ -126,7 +126,7 @@ Depending on your change:
 
 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
+[adk-docs](https://github.com/google/adk-docs) repository to update the relevant
 part before or alongside your code PR.
 
 ## Development Setup
@@ -160,7 +160,11 @@ part before or alongside your code PR.
     source .venv/bin/activate
     ```
 
-    **windows** `shell source .\.venv\Scripts\activate`
+    **Windows**
+
+    ```shell
+    source .\.venv\Scripts\activate
+    ```
 
 4.  **Install dependencies:**
 
@@ -230,7 +234,7 @@ part before or alongside your code PR.
 ## Contributing Resources
 
 [Contributing folder](https://github.com/google/adk-python/tree/main/contributing)
-has resources that is helpful for contributors.
+has resources that are helpful for contributors.
 
 ## Vibe Coding
 

README.md

@@ -158,13 +158,13 @@ We welcome contributions from the community! Whether it's bug reports, feature r
 
 ## Community Repo
 
-We have [adk-python-community repo](https://github.com/google/adk-python-community)that is home to a growing ecosystem of community-contributed tools, third-party
+We have [adk-python-community repo](https://github.com/google/adk-python-community) that is home to a growing ecosystem of community-contributed tools, third-party
 service integrations, and deployment scripts that extend the core capabilities
 of the ADK.
 
 ## Vibe Coding
 
-If you are to develop agent via vibe coding the [llms.txt](./llms.txt) and the [llms-full.txt](./llms-full.txt) can be used as context to LLM. While the former one is a summarized one and the later one has the full information in case your LLM has big enough context window.
+If you want to develop agent via vibe coding the [llms.txt](./llms.txt) and the [llms-full.txt](./llms-full.txt) can be used as context to LLM. While the former one is a summarized one and the later one has the full information in case your LLM has big enough context window.
 
 ## Community Events
 

contributing/README.md

@@ -1,6 +1,6 @@
 # Contributing Resources
 
-This folder host resources for ADK contributors, for example, testing samples etc.
+This folder hosts resources for ADK contributors, for example, testing samples etc.
 
 ## Samples
 
@@ -13,4 +13,4 @@ Samples folder host samples to test different features. The samples are usually
 The [adk_project_overview_and_architecture.md](adk_project_overview_and_architecture.md) describes the ADK project overview and its technical architecture from high-level.
 
 This is helpful for contributors to understand the project and design philosophy.
- It can also be feed into LLMs for vibe-coding.
+ It can also be fed into LLMs for vibe-coding.

contributing/adk_project_overview_and_architecture.md

@@ -34,7 +34,7 @@ my_adk_project/
     └── my_app/
         ├── agents/
         │   ├── my_agent/
-        │   │   ├── __init__.py   # Must contain: from. import agent \
+        │   │   ├── __init__.py   # Must contain: from . import agent \
         │   │   └── agent.py      # Must contain: root_agent = Agent(...) \
         │   └── another_agent/
         │       ├── __init__.py
@@ -43,7 +43,7 @@ my_adk_project/
 
 agent.py: Must define the agent and assign it to a variable named root_agent. This is how ADK's tools find it.
 
-`__init__.py`: In each agent directory, it must contain from. import agent to make the agent discoverable.
+`__init__.py`: In each agent directory, it must contain `from . import agent` to make the agent discoverable.
 
 ## Local Development & Debugging
 
@@ -69,7 +69,7 @@ We expose agents as production APIs using FastAPI.
 
 - Custom Endpoints: We can add our own routes (e.g., /health) to the app object returned by the helper.
 
-Python
+```Python
 
 from google.adk.cli.fast_api import get_fast_api_app
 app = get_fast_api_app(agent_dir="./agents")
@@ -77,6 +77,7 @@ app = get_fast_api_app(agent_dir="./agents")
 @app.get("/health")
 async def health_check():
     return {"status": "ok"}
+```
 
 
 ## Deployment to Production

contributing/samples/adk_documentation/adk_docs_updater/main.py

@@ -24,13 +24,14 @@ from adk_documentation.settings import DOC_OWNER
 from adk_documentation.settings import DOC_REPO
 from adk_documentation.tools import get_issue
 from adk_documentation.utils import call_agent_async
+from adk_documentation.utils import parse_suggestions
 from google.adk.cli.utils import logs
 from google.adk.runners import InMemoryRunner
 
 APP_NAME = "adk_docs_updater"
 USER_ID = "adk_docs_updater_user"
 
-logs.setup_adk_logger(level=logging.DEBUG)
+logs.setup_adk_logger(level=logging.INFO)
 
 
 def process_arguments():
@@ -68,23 +69,84 @@ async def main():
     print(f"Failed to get issue {issue_number}: {get_issue_response}\n")
     return
   issue = get_issue_response["issue"]
+  issue_title = issue.get("title", "")
+  issue_body = issue.get("body", "")
+
+  # Parse numbered suggestions from issue body
+  suggestions = parse_suggestions(issue_body)
+
+  if not suggestions:
+    print(f"No numbered suggestions found in issue #{issue_number}.")
+    print("Falling back to processing the entire issue as a single task.")
+    suggestions = [(1, issue_body)]
+
+  print(f"Found {len(suggestions)} suggestion(s) in issue #{issue_number}.")
+  print("=" * 80)
 
   runner = InMemoryRunner(
       agent=agent.root_agent,
       app_name=APP_NAME,
   )
-  session = await runner.session_service.create_session(
-      app_name=APP_NAME,
-      user_id=USER_ID,
-  )
 
-  response = await call_agent_async(
-      runner,
-      USER_ID,
-      session.id,
-      f"Please update the ADK docs according to the following issue:\n{issue}",
+  results = []
+  for suggestion_num, suggestion_text in suggestions:
+    print(f"\n>>> Processing suggestion #{suggestion_num}...")
+    print("-" * 80)
+
+    # Create a new session for each suggestion to avoid context interference
+    session = await runner.session_service.create_session(
+        app_name=APP_NAME,
+        user_id=USER_ID,
+    )
+
+    prompt = f"""
+      Please update the ADK docs according to suggestion #{suggestion_num} from issue #{issue_number}.
+
+      Issue title: {issue_title}
+
+      Suggestion to process:
+      {suggestion_text}
+
+      Note: Focus only on this specific suggestion. Create exactly one pull request for this suggestion.
+    """
+
+    try:
+      response = await call_agent_async(
+          runner,
+          USER_ID,
+          session.id,
+          prompt,
+      )
+      results.append({
+          "suggestion_num": suggestion_num,
+          "status": "success",
+          "response": response,
+      })
+      print(f"<<<< Suggestion #{suggestion_num} completed.")
+    except Exception as e:
+      results.append({
+          "suggestion_num": suggestion_num,
+          "status": "error",
+          "error": str(e),
+      })
+      print(f"<<<< Suggestion #{suggestion_num} failed: {e}")
+
+    print("-" * 80)
+
+  # Print summary
+  print("\n" + "=" * 80)
+  print("SUMMARY")
+  print("=" * 80)
+  successful = [r for r in results if r["status"] == "success"]
+  failed = [r for r in results if r["status"] == "error"]
+  print(
+      f"Total: {len(results)}, Success: {len(successful)}, Failed:"
+      f" {len(failed)}"
   )
-  print(f"<<<< Agent Final Output: {response}\n")
+  if failed:
+    print("\nFailed suggestions:")
+    for r in failed:
+      print(f"  - Suggestion #{r['suggestion_num']}: {r['error']}")
 
 
 if __name__ == "__main__":

contributing/samples/adk_documentation/utils.py

@@ -12,9 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import re
 from typing import Any
 from typing import Dict
 from typing import List
+from typing import Tuple
 
 from adk_documentation.settings import GITHUB_TOKEN
 from google.adk.agents.run_config import RunConfig
@@ -96,3 +98,47 @@ async def call_agent_async(
           final_response_text += text
 
   return final_response_text
+
+
+def parse_suggestions(issue_body: str) -> List[Tuple[int, str]]:
+  """Parse numbered suggestions from issue body.
+
+  Supports multiple formats:
+  - Format A (markdown headers): "### 1. Title"
+  - Format B (numbered list with bold): "1. **Title**"
+
+  Args:
+      issue_body: The body text of the GitHub issue.
+
+  Returns:
+      A list of tuples, where each tuple contains:
+      - The suggestion number (1-based)
+      - The full text of that suggestion
+  """
+  # Try different patterns in order of preference
+  patterns = [
+      # Format A: "### 1. Title" (markdown header with number)
+      (r"(?=^###\s+\d+\.)", r"^###\s+(\d+)\."),
+      # Format B: "1. **Title**" (numbered list with bold)
+      (r"(?=^\d+\.\s+\*\*)", r"^(\d+)\.\s+\*\*"),
+  ]
+
+  for split_pattern, match_pattern in patterns:
+    parts = re.split(split_pattern, issue_body, flags=re.MULTILINE)
+
+    suggestions = []
+    for part in parts:
+      part = part.strip()
+      if not part:
+        continue
+
+      match = re.match(match_pattern, part)
+      if match:
+        suggestion_num = int(match.group(1))
+        suggestions.append((suggestion_num, part))
+
+    # If we found suggestions with this pattern, return them
+    if suggestions:
+      return suggestions
+
+  return []

contributing/samples/adk_stale_agent/PROMPT_INSTRUCTION.txt

@@ -45,7 +45,7 @@ Your job is to analyze a specific issue and report findings before taking action
             - **IF True**: The user edited the description silently, and we haven't alerted yet.
               -> **Action**: Call `alert_maintainer_of_edit`.
               -> **Report**: "Analysis for Issue #[number]: ACTIVE. Silent update detected (Description Edit). Alerted maintainer."
-            - **IF False**: 
+            - **IF False**:
               -> **Report**: "Analysis for Issue #[number]: ACTIVE. Last action was by user. No action."
 
     - **Check Role**: If `last_action_role` is 'maintainer':
@@ -53,16 +53,21 @@ Your job is to analyze a specific issue and report findings before taking action
 
 **STEP 3: ANALYZE MAINTAINER INTENT**
 - **Context**: The last person to act was a Maintainer.
-- **Action**: Read the text in `last_comment_text`.
-    - **Question Check**: Does the text ask a question, request clarification, ask for logs, or suggest trying a fix?
+- **Action**: Analyze `last_comment_text` using `maintainers` list and `last_actor_name`.
+
+    - **Internal Discussion Check**: Does the comment mention or address any username found in the `maintainers` list (other than the speaker `last_actor_name`)?
+        - **Verdict**: **ACTIVE** (Internal Team Discussion).
+        - **Report**: "Analysis for Issue #[number]: ACTIVE. Maintainer is discussing with another maintainer. No action."
+
+    - **Question Check**: Does the text ask a question, request clarification, ask for logs, or give suggestions?
     - **Time Check**: Is `days_since_activity` > {stale_threshold_days}?
 
     - **DECISION**:
-        - **IF (Question == YES) AND (Time == YES)**:
+        - **IF (Question == YES) AND (Time == YES) AND (Internal Discussion Check == FALSE):**
             - **Action**: Call `add_stale_label_and_comment`.
-            - **Check**: If '{REQUEST_CLARIFICATION_LABEL}' is not in `current_labels`, call `add_label_to_issue` for it.
+            - **Check**: If '{REQUEST_CLARIFICATION_LABEL}' is not in `current_labels`, call `add_label_to_issue` with '{REQUEST_CLARIFICATION_LABEL}'.
             - **Report**: "Analysis for Issue #[number]: STALE. Maintainer asked question [days_since_activity] days ago. Marking stale."
         - **IF (Question == YES) BUT (Time == NO)**:
             - **Report**: "Analysis for Issue #[number]: PENDING. Maintainer asked question, but threshold not met yet. No action."
-        - **IF (Question == NO)** (e.g., "I am working on this"):
-            - **Report**: "Analysis for Issue #[number]: ACTIVE. Maintainer gave status update (not a question). No action."
+        - **IF (Question == NO) OR (Internal Discussion Check == TRUE):**
+            - **Report**: "Analysis for Issue #[number]: ACTIVE. Maintainer gave status update or internal discussion detected. No action."

contributing/samples/adk_stale_agent/agent.py

@@ -49,6 +49,7 @@ logger = logging.getLogger("google_adk." + __name__)
 BOT_ALERT_SIGNATURE = (
     "**Notification:** The author has updated the issue description"
 )
+BOT_NAME = "adk-bot"
 
 # --- Global Cache ---
 _MAINTAINERS_CACHE: Optional[List[str]] = None
@@ -246,8 +247,9 @@ def _build_history_timeline(
     if BOT_ALERT_SIGNATURE in c_body:
       if last_bot_alert_time is None or c_time > last_bot_alert_time:
         last_bot_alert_time = c_time
+      continue
 
-    if actor and not actor.endswith("[bot]"):
+    if actor and not actor.endswith("[bot]") and actor != BOT_NAME:
       # Use edit time if available, otherwise creation time
       e_time = c.get("lastEditedAt")
       actual_time = dateutil.parser.isoparse(e_time) if e_time else c_time
@@ -263,7 +265,7 @@ def _build_history_timeline(
     if not e:
       continue
     actor = e.get("editor", {}).get("login")
-    if actor and not actor.endswith("[bot]"):
+    if actor and not actor.endswith("[bot]") and actor != BOT_NAME:
       history.append({
           "type": "edited_description",
           "actor": actor,
@@ -285,7 +287,7 @@ def _build_history_timeline(
         label_events.append(time_val)
       continue
 
-    if actor and not actor.endswith("[bot]"):
+    if actor and not actor.endswith("[bot]") and actor != BOT_NAME:
       pretty_type = (
           "renamed_title" if etype == "RenamedTitleEvent" else "reopened"
       )
@@ -318,11 +320,13 @@ def _replay_history_to_find_state(
           - last_activity_time (datetime): Timestamp of the last human action.
           - last_action_type (str): The type of the last action (e.g., 'commented').
           - last_comment_text (Optional[str]): The text of the last comment.
+          - last_actor_name (str): The specific username of the last actor.
   """
   last_action_role = "author"
   last_activity_time = history[0]["time"]
   last_action_type = "created"
   last_comment_text = None
+  last_actor_name = issue_author
 
   for event in history:
     actor = event["actor"]
@@ -337,6 +341,7 @@ def _replay_history_to_find_state(
     last_action_role = role
     last_activity_time = event["time"]
     last_action_type = etype
+    last_actor_name = actor
 
     # Only store text if it was a comment (resets on other events like labels/edits)
     if etype == "commented":
@@ -349,6 +354,7 @@ def _replay_history_to_find_state(
       "last_activity_time": last_activity_time,
       "last_action_type": last_action_type,
       "last_comment_text": last_comment_text,
+      "last_actor_name": last_actor_name,
   }
 
 
@@ -428,6 +434,7 @@ def get_issue_state(item_number: int) -> Dict[str, Any]:
         "status": "success",
         "last_action_role": state["last_action_role"],
         "last_action_type": state["last_action_type"],
+        "last_actor_name": state["last_actor_name"],
         "maintainer_alert_needed": maintainer_alert_needed,
         "is_stale": is_stale,
         "days_since_activity": days_since_activity,
@@ -436,6 +443,8 @@ def get_issue_state(item_number: int) -> Dict[str, Any]:
         "current_labels": labels_list,
         "stale_threshold_days": STALE_HOURS_THRESHOLD / 24,
         "close_threshold_days": CLOSE_HOURS_AFTER_STALE_THRESHOLD / 24,
+        "maintainers": maintainers,
+        "issue_author": issue_author,
     }
 
   except RequestException as e: