fix(codemode): validate tool arguments against Zod schema before execution#962
Merged
mattzcarey merged 6 commits intoFeb 24, 2026
Merged
Conversation
…ution createCodeTool() extracted execute functions from tools but discarded their Zod schemas. This meant sandboxed code could call tool functions with arbitrary JSON payloads that bypass the schema constraints defined by tool authors, since ToolDispatcher.call() passes JSON.parse'd args directly to fn() without validation. Now each execute function is wrapped with its corresponding Zod schema (inputSchema or parameters) so arguments are validated before reaching the tool function. Invalid payloads throw a ZodError caught by the existing error handler in ToolDispatcher. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
🦋 Changeset detectedLatest commit: cd015da The changes in this PR will be included in the next version bump. This PR includes changesets to release 1 package
Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
commit: |
Contributor
|
thanks for this. will look at getting it merged |
mattzcarey
self-requested a review
February 23, 2026 10:50
MCP tools use AI SDK's jsonSchema() wrapper which doesn't have a .parse() method. Only apply Zod validation to schemas that actually have .parse().
Replace manual Zod duck-typing (.parse check) with the AI SDK's asSchema() which handles Zod v3/v4, Standard Schema, and JSON Schema uniformly. No new dependencies — asSchema is exported from `ai`.
Merged
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
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
createCodeTool()extracts.executefunctions from tools but discards their Zod schemas, passing them unwrapped toToolDispatcherToolDispatcher.call()doesJSON.parse(argsJson) → fn(args)with no schema validation, so sandboxed code can invoke tool functions with arbitrary JSON payloads that bypass the constraints defined by tool authorsexecutefunction with its corresponding Zod schema (inputSchemaorparameters) so arguments are validated before reaching the tool function — invalid payloads throw aZodErrorcaught by the existing error handlerRoot cause
In
tool.ts:101-111(before this patch):The Zod schemas (
t.inputSchema/t.parameters) are available but never extracted. When the sandbox calls a tool viaToolDispatcher.call(), the rawJSON.parse'd payload reaches the tool function directly.Fix
🤖 Generated with Claude Code