feat: remove MCP SERVERS section from system prompt #10895
Conversation
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
MCP tools are now included in the native tools array sent with API requests, so the system prompt no longer needs a separate MCP SERVERS section. - Delete src/core/prompts/sections/mcp-servers.ts - Remove getMcpServersSection export from sections/index.ts - Remove MCP section from system.ts prompt template - Update related tests and snapshots
dosubot
bot
added
the
size:L
Contributor
Reviewed the changes and found no blocking issues. The PR correctly removes the MCP SERVERS section from the system prompt since MCP tools are now included in the native tools array via Verified:
No issues found. Mention @roomote in a comment to request specific changes to this pull request or fix all unresolved issues. |
![roomote[bot]](https://avatars.githubusercontent.com/in/1546624?s=60&v=4){kind=small}
mrubens
approved these changes
Jan 23, 2026
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.
Summary
Removes the MCP SERVERS section from the system prompt since MCP tools are now included in the native tools array sent with API requests.
Problem
MCP tools were being duplicated in two places:
getMcpServerTools())getMcpServersSection())This duplication was unnecessary and added extra tokens to the system prompt.
Solution
src/core/prompts/sections/mcp-servers.tsgetMcpServersSectionexport fromsections/index.tssystem.tsprompt templateMCP tools continue to work via the native tools array sent in API requests.
Test Plan
Resolves COM-550
Important
Removes MCP SERVERS section from system prompt, consolidating MCP tools into the native tools array.
system.tsprompt template.getMcpServersSectionfromsections/index.tsandmcp-servers.ts.add-custom-instructions.spec.tsto reflect removal.mcp-server-creation-enabled.snapand updates others to reflect changes.This description was created by
for 492233b. You can customize this summary. It will automatically update as commits are pushed.