fix: merge user-provided disallowedTools instead of overwriting#335
Merged
benbrandt merged 1 commit intozed-industries:mainfrom Feb 20, 2026
Merged
Conversation
blimmer
commented
Feb 20, 2026
| import type { ClaudeAcpAgent as ClaudeAcpAgentType } from "../acp-agent.js"; | ||
|
|
||
| let capturedOptions: Options | undefined; | ||
| vi.mock("@anthropic-ai/claude-agent-sdk", async () => { |
Contributor
Author
There was a problem hiding this comment.
To avoid this regression again in the future, I wanted to add some tests for this behavior.
I took the approach of a more integration-style test. However, if you prefer a more unit-style approach, we could also extract a utility method to build this object and test that.
I definitely don't feel strongly on the approach, so feel free to guide in the direction you'd prefer!
f57e3af to
95b4e9d
Compare
benbrandt
approved these changes
Feb 20, 2026
The disallowedTools merge fix from zed-industries#295 was regressed by zed-industries#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 zed-industries#334
95b4e9d to
5ca946c
Compare
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.
The disallowedTools merge fix from #295 was regressed by #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 #334