Chrome DevTools for coding agents
refactor: use default Error for toolSchema (#2822)
Nikolay Vitkov8b2768ddbbac
diff --git a/src/ToolHandler.ts b/src/ToolHandler.tsindex d82883da..2df3a290 100644--- a/src/ToolHandler.ts+++ b/src/ToolHandler.ts@@ -71,26 +71,6 @@ function isPageScopedTool(return 'pageScoped' in tool && tool.pageScoped === true;}-function formatArgumentNames(names: string[]): string {- return names.map(name => `"${name}"`).join(', ');-}--function buildUnknownArgumentsMessage(- toolName: string,- unknownArgumentNames: string[],- expectedArgumentNames: string[],-): string {- const unknownLabel =- unknownArgumentNames.length === 1 ? 'argument' : 'arguments';- const expectedArguments = expectedArgumentNames.length- ? `Expected arguments: ${formatArgumentNames(expectedArgumentNames)}.`- : 'This tool does not accept any arguments.';- const correction =- unknownArgumentNames.length === 1 ? 'Remove it' : 'Remove them';-- return `Unknown ${unknownLabel} for tool "${toolName}": ${formatArgumentNames(unknownArgumentNames)}. ${expectedArguments} ${correction} and retry.`;-}-async function validateAndResolvePathOrUrl(filePathOrUrl: string,context: McpContext,@@ -167,7 +147,7 @@ export class ToolHandler {readonly inputSchema: zod.ZodRawShape;readonly registeredInputSchema: zod.ZodObject<zod.ZodRawShape,- zod.core.$loose+ zod.core.$strict>;readonly disabled: boolean;private readonly disabledReason?: string;@@ -183,13 +163,7 @@ export class ToolHandler {this.disabled = disabled && !serverArgs.viaCli;this.inputSchema = tool.schema;- this.registeredInputSchema = zod.object(this.inputSchema).loose();- }-- unknownArgumentNames(params: Record<string, unknown>): string[] {- return Object.keys(params).filter(- key => !Object.hasOwn(this.inputSchema, key),- );+ this.registeredInputSchema = zod.object(this.inputSchema).strict();}handle = async (params: Record<string, unknown>): Promise<CallToolResult> => {@@ -207,23 +181,6 @@ export class ToolHandler {};}- const unknownArgumentNames = this.unknownArgumentNames(params);- if (unknownArgumentNames.length) {- return {- content: [- {- type: 'text',- text: buildUnknownArgumentsMessage(- this.tool.name,- unknownArgumentNames,- Object.keys(this.inputSchema),- ),- },- ],- isError: true,- };- }-const startTime = Date.now();let success = false;let devToolsData: DevToolsData | undefined;diff --git a/tests/ToolHandler.test.ts b/tests/ToolHandler.test.tsindex 859fb34e..ab02f269 100644--- a/tests/ToolHandler.test.ts+++ b/tests/ToolHandler.test.ts@@ -251,10 +251,9 @@ describe('ToolHandler', () => {}});- it('reports unknown registered tool arguments clearly', async () => {- let handlerCalled = false;+ it('rejects unknown registered tool arguments and sets additionalProperties to false', () => {const tool: ToolDefinition = {- name: 'lenient_tool',+ name: 'strict_tool',description: 'A tool with a required argument',annotations: {category: ToolCategory.NAVIGATION,@@ -266,7 +265,7 @@ describe('ToolHandler', () => {blockedByDialog: false,verifyFilesSchema: {},handler: async () => {- handlerCalled = true;+ return;},};@@ -284,20 +283,26 @@ describe('ToolHandler', () => {toolMutex,);- const params = {url: 'https://example.com', description: 'open the page'};- assert.strictEqual(- toolHandler.registeredInputSchema.safeParse(params).success,- true,+ const params = {+ url: 123,+ description: 'open the page',+ extra: true,+ };+ const parseResult = toolHandler.registeredInputSchema.safeParse(params);+ assert.strictEqual(parseResult.success, false);+ assert.strictEqual(parseResult.error.issues.length, 2);+ assert.deepStrictEqual(+ parseResult.error.issues.map(issue => issue.message),+ [+ 'Invalid input: expected string, received number',+ 'Unrecognized keys: "description", "extra"',+ ],);- const result = await toolHandler.handle(params);-- assert.strictEqual(result.isError, true);- assert.match(- result.content[0].type === 'text' ? result.content[0].text : '',- /Unknown argument for tool "lenient_tool": "description"\. Expected arguments: "url"\./,- );- assert.strictEqual(handlerCalled, false);+ const jsonSchema = zod.toJSONSchema(toolHandler.registeredInputSchema, {+ io: 'input',+ });+ assert.strictEqual(jsonSchema.additionalProperties, false);});it('sets disabled to true and returns disabled reason when category is disabled', async () => {diff --git a/tests/e2e/chrome-devtools-commands.test.ts b/tests/e2e/chrome-devtools-commands.test.tsindex 451300e6..862c55ba 100644--- a/tests/e2e/chrome-devtools-commands.test.ts+++ b/tests/e2e/chrome-devtools-commands.test.ts@@ -138,13 +138,20 @@ describe('chrome-devtools', () => {);const initScriptResult = await runCli(- ['navigate_page', '1', '--initScript', 'alert(1)'],+ [+ 'navigate_page',+ '1',+ '--initScript',+ 'alert(1)',+ '--timeout',+ 'invalid',+ ],sessionId,);assert.strictEqual(initScriptResult.status, 0);assert(initScriptResult.stdout.includes(- 'Unknown argument for tool "navigate_page": "initScript"',+ 'Input validation error: Invalid arguments for tool navigate_page: timeout: Invalid input: expected number, received null, Unrecognized key: "initScript"',),'error message is unexpected: ' + initScriptResult.stdout,);