fix: prevent System Prompt duplication on recursive MCP tool calls #12643
+193
−0
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.
What this PR does
Before this PR:
When using prompt-based tool calling (for models without native function call support), the System Prompt containing MCP tool definitions was duplicated on each recursive call after tool execution. This caused token consumption to multiply with each tool call.
After this PR:
The System Prompt remains unique throughout the conversation, regardless of how many tool calls are made. Tool definitions are only added once during the initial call.
Fixes #12638
Why we need it and why it was done in this way
The following tradeoffs were made:
isRecursiveCallcheck intransformParamsto skip system prompt rebuilding on recursive calls. This is the minimal change needed to fix the issue.The following alternatives were considered:
buildRecursiveParamsto exclude the system field - would require changes to StreamEventManager and could affect other behaviors.The chosen approach is the simplest fix that directly addresses the root cause.
Breaking changes
None. This is a bug fix that corrects unintended behavior.
Special notes for your reviewer
Key changes:
packages/aiCore/src/core/plugins/built-in/toolUsePlugin/promptToolUsePlugin.ts- Added check forcontext.isRecursiveCallbefore rebuilding system promptChecklist
Release note