Fix agent being able to execute tools that are turned off - #54863
Merged
bennetbo merged 3 commits intoMay 5, 2026
Merged
Conversation
cla-bot
Bot
added
the
cla-signed
zed-community-bot
Bot
added
the
guild
maxdeviant
changed the title
SomeoneToIgnore
added
the
area:ai
bennetbo
enabled auto-merge
May 5, 2026 16:13
ebaah46
pushed a commit
to ebaah46/zed
that referenced
this pull request
May 6, 2026
…ries#54863) #### Closes zed-industries#54741 Fix disabled context server tools being callable in profiles with `enable_all_context_servers: true` `AgentProfileSettings::is_context_server_tool_enabled` short-circuited on `enable_all_context_servers` and ignored explicit per-tool `false` entries in `context_servers`, so agents could still call tools the user had disabled in their profile. The filter now matches what the tool picker UI already does (`tool_picker.rs:357-371`): the explicit per-tool setting wins, and `enable_all_context_servers` is only consulted as a fallback when the tool has no explicit entry. ### Self-Review Checklist: - [x] I've reviewed my own diff for quality, security, and reliability - [x] Unsafe blocks (if any) have justifying comments - [x] The content is consistent with the [UI/UX checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) - [x] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable Screenshots : When turned false <img width="1920" height="1042" alt="1" src="https://github.com/user-attachments/assets/ccc9093b-b0c7-4061-9349-f6a2e8170698" /> When true <img width="1920" height="1042" alt="2" src="https://github.com/user-attachments/assets/f3e085cb-2b7d-4dab-9f89-4c735d809207" /> Release Notes: - Fixed agent profiles with `enable_all_context_servers: true` ignoring per-tool `false` overrides in `context_servers`, allowing agents to call tools the user had explicitly disabled. Co-authored-by: Bennet Bo Fenner <bennet@zed.dev>
This was referenced May 13, 2026
jonx
pushed a commit
to jonx/zed-aros
that referenced
this pull request
Jul 17, 2026
…ries#54863) #### Closes zed-industries#54741 Fix disabled context server tools being callable in profiles with `enable_all_context_servers: true` `AgentProfileSettings::is_context_server_tool_enabled` short-circuited on `enable_all_context_servers` and ignored explicit per-tool `false` entries in `context_servers`, so agents could still call tools the user had disabled in their profile. The filter now matches what the tool picker UI already does (`tool_picker.rs:357-371`): the explicit per-tool setting wins, and `enable_all_context_servers` is only consulted as a fallback when the tool has no explicit entry. ### Self-Review Checklist: - [x] I've reviewed my own diff for quality, security, and reliability - [x] Unsafe blocks (if any) have justifying comments - [x] The content is consistent with the [UI/UX checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) - [x] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable Screenshots : When turned false <img width="1920" height="1042" alt="1" src="https://github.com/user-attachments/assets/ccc9093b-b0c7-4061-9349-f6a2e8170698" /> When true <img width="1920" height="1042" alt="2" src="https://github.com/user-attachments/assets/f3e085cb-2b7d-4dab-9f89-4c735d809207" /> Release Notes: - Fixed agent profiles with `enable_all_context_servers: true` ignoring per-tool `false` overrides in `context_servers`, allowing agents to call tools the user had explicitly disabled. Co-authored-by: Bennet Bo Fenner <bennet@zed.dev>
jolutz
pushed a commit
to jolutz/zed
that referenced
this pull request
Aug 8, 2026
…ries#54863) #### Closes zed-industries#54741 Fix disabled context server tools being callable in profiles with `enable_all_context_servers: true` `AgentProfileSettings::is_context_server_tool_enabled` short-circuited on `enable_all_context_servers` and ignored explicit per-tool `false` entries in `context_servers`, so agents could still call tools the user had disabled in their profile. The filter now matches what the tool picker UI already does (`tool_picker.rs:357-371`): the explicit per-tool setting wins, and `enable_all_context_servers` is only consulted as a fallback when the tool has no explicit entry. ### Self-Review Checklist: - [x] I've reviewed my own diff for quality, security, and reliability - [x] Unsafe blocks (if any) have justifying comments - [x] The content is consistent with the [UI/UX checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) - [x] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable Screenshots : When turned false <img width="1920" height="1042" alt="1" src="https://github.com/user-attachments/assets/ccc9093b-b0c7-4061-9349-f6a2e8170698" /> When true <img width="1920" height="1042" alt="2" src="https://github.com/user-attachments/assets/f3e085cb-2b7d-4dab-9f89-4c735d809207" /> Release Notes: - Fixed agent profiles with `enable_all_context_servers: true` ignoring per-tool `false` overrides in `context_servers`, allowing agents to call tools the user had explicitly disabled. Co-authored-by: Bennet Bo Fenner <bennet@zed.dev>
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
4 participants
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.
Closes #54741
Fix disabled context server tools being callable in profiles with
enable_all_context_servers: trueAgentProfileSettings::is_context_server_tool_enabledshort-circuited onenable_all_context_serversand ignored explicit per-toolfalseentries incontext_servers, so agents could still call tools the user had disabled in their profile.The filter now matches what the tool picker UI already does (
tool_picker.rs:357-371): the explicit per-tool setting wins, andenable_all_context_serversis only consulted as a fallback when the tool has no explicit entry.Self-Review Checklist:
Screenshots :
When turned false
When true
Release Notes:
enable_all_context_servers: trueignoring per-toolfalseoverrides incontext_servers, allowing agents to call tools the user had explicitly disabled.