fix: filter thinking parts from agenttool result#696
Open
dmora wants to merge 1 commit intogoogle:mainfrom
Open
fix: filter thinking parts from agenttool result#696dmora wants to merge 1 commit intogoogle:mainfrom
dmora wants to merge 1 commit intogoogle:mainfrom
Conversation
agenttool.Run() collects all Part.Text without checking Part.Thought, leaking thinking tokens into the tool result map. This mirrors the fix applied to remoteagent in google#655 and aligns with genai.Text() behavior.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Please ensure you have read the contribution guide before creating a pull request.
Link to Issue or Description of Change
1. Link to an existing issue (if applicable):
2. Or, if no issue exists, describe the change:
Problem:
agenttool.Run()collects allPart.Textfrom the sub-agent's final response without checkingPart.Thought. When thinking models (Gemini 2.5/3 withIncludeThoughts: true) are used as sub-agents, their internal reasoning tokens leak into the tool resultmap[string]anythat the calling agent sees.This is the same class of bug fixed for
remoteagentin #655.Compare
agenttool.Run()(before this fix):With
genai.GenerateContentResponse.Text()which correctly filters thoughts:Solution:
Add
&& !part.Thoughtto the text extraction loop inagenttool.Run(), matching thegenai.Text()behavior.Testing Plan
Unit Tests:
New tests added:
TestAgentTool_Run_FiltersThoughtParts— mixed thought + text parts, with edge case{Text: "", Thought: true}, verifies only non-thought text is returnedTestAgentTool_Run_AllThoughtPartsReturnsEmpty— all-thought response returns empty mapTestAgentTool_Run_FiltersThoughtParts_WithOutputSchema— thought parts mixed with JSON output, verifies clean unmarshalling whenOutputSchemais setManual End-to-End (E2E) Tests:
Verified locally with a real Gemini 2.5 Flash model with
ThinkingConfig{IncludeThoughts: true, ThinkingBudget: 2048}. The sub-agent was asked "What is 7 * 8?" and the tool result contained only"56"— no thinking tokens leaked through.Also verified that reverting the fix causes the mock test to fail with thinking text concatenated into the result:
Checklist
Additional context
Aligned with how
genai.GenerateContentResponse.Text()handles thought parts intypes.go.Generated with Claude Code