fix: merge user-provided disallowedTools instead of overwriting#295
Merged
benbrandt merged 2 commits intoagentclientprotocol:mainfrom Feb 7, 2026
Merged
Conversation
User-provided disallowedTools from _meta.claudeCode.options were silently overwritten by ACP's internal list. This follows the same merge pattern already used for hooks and mcpServers. Fixes agentclientprotocol#294
|
We require contributors to sign our Contributor License Agreement, and we don't have @blimmer on file. You can sign our CLA at https://zed.dev/cla. Once you've signed, post a comment here that says '@cla-bot check'. |
Contributor
Author
|
@cla-bot check |
|
We require contributors to sign our Contributor License Agreement, and we don't have @blimmer on file. You can sign our CLA at https://zed.dev/cla. Once you've signed, post a comment here that says '@cla-bot check'. |
|
The cla-bot has been summoned, and re-checked this pull request! |
|
We require contributors to sign our Contributor License Agreement, and we don't have @blimmer on file. You can sign our CLA at https://zed.dev/cla. Once you've signed, post a comment here that says '@cla-bot check'. |
Contributor
Author
|
@cla-bot check |
|
The cla-bot has been summoned, and re-checked this pull request! |
blimmer
added a commit
to blimmer/claude-code-acp
that referenced
this pull request
Feb 20, 2026
The disallowedTools merge fix from agentclientprotocol#295 was regressed by agentclientprotocol#316 when the options object was restructured. Restore the merge behavior and add regression tests for all three documented merge fields (disallowedTools, hooks, mcpServers). Fixes agentclientprotocol#334
blimmer
added a commit
to blimmer/claude-code-acp
that referenced
this pull request
Feb 20, 2026
The disallowedTools merge fix from agentclientprotocol#295 was regressed by agentclientprotocol#316 when the options object was restructured. Restore the merge behavior and add regression tests for all three documented merge fields (disallowedTools, hooks, mcpServers). Fixes agentclientprotocol#334
blimmer
added a commit
to blimmer/claude-code-acp
that referenced
this pull request
Feb 20, 2026
The disallowedTools merge fix from agentclientprotocol#295 was regressed by agentclientprotocol#316 when the options object was restructured. Restore the merge behavior and add regression tests for all three documented merge fields (disallowedTools, hooks, mcpServers). Fixes agentclientprotocol#334
blimmer
added a commit
to blimmer/claude-code-acp
that referenced
this pull request
Feb 20, 2026
The disallowedTools merge fix from agentclientprotocol#295 was regressed by agentclientprotocol#316 when the options object was restructured. Restore the merge behavior and add regression tests for all three documented merge fields (disallowedTools, hooks, mcpServers). Fixes agentclientprotocol#334
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
2 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.
Summary
disallowedToolsfrom_meta.claudeCode.optionswere silently overwritten by ACP's internal listhooksandmcpServersNewSessionMetaJSDoc to document the merge behaviorFixes #294