Skip to content

fix(codemode): validate tool arguments against Zod schema before execution #962

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tumberger wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −3
Open

fix(codemode): validate tool arguments against Zod schema before execution #962

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions packages/codemode/src/tool.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { tool, type Tool } from "ai";
import { z } from "zod";
import { z, type ZodType } from "zod";
import type { ToolSet } from "ai";
import * as acorn from "acorn";
import { generateTypes, sanitizeToolName, type ToolDescriptors } from "./types";
Expand Down Expand Up @@ -97,7 +97,9 @@ export function createCodeTool(
description,
inputSchema: codeSchema,
execute: async ({ code }) => {
// Extract execute functions from tools, keyed by name
// Extract execute functions from tools, keyed by name.
// Wrap each with its Zod schema so arguments from the sandbox
// are validated before reaching the tool function.
const fns: Record<string, (...args: unknown[]) => Promise<unknown>> = {};

for (const [name, t] of Object.entries(tools)) {
Expand All @@ -106,7 +108,16 @@ export function createCodeTool(
? (t.execute as (args: unknown) => Promise<unknown>)
: undefined;
if (execute) {
fns[sanitizeToolName(name)] = execute;
const schema: ZodType | undefined =
"inputSchema" in t
? (t.inputSchema as ZodType)
: "parameters" in t
? ((t as Record<string, unknown>).parameters as ZodType)
: undefined;

fns[sanitizeToolName(name)] = schema
? async (args: unknown) => execute(schema.parse(args))
: execute;
}
}

Expand Down