acmcarther/qwen-code
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 6

Update edit tool validation function to override validateToolParams (#667)

Browse source
This commit is contained in:
Leo 2025-06-01 19:18:43 +01:00 • committed by GitHub
parent 9dae07784b
commit edc12e416d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
packages/core/src/tools/edit.test.ts
View file

@ -178,14 +178,14 @@ describe('EditTool', () => {
}); });
}); });
describe('validateParams', () => { describe('validateToolParams', () => {
it('should return null for valid params', () => { it('should return null for valid params', () => {
const params: EditToolParams = { const params: EditToolParams = {
file_path: path.join(rootDir, 'test.txt'), file_path: path.join(rootDir, 'test.txt'),
old_string: 'old', old_string: 'old',
new_string: 'new', new_string: 'new',
}; };
expect(tool.validateParams(params)).toBeNull(); expect(tool.validateToolParams(params)).toBeNull();
}); });
it('should return error for relative path', () => { it('should return error for relative path', () => {
@ -194,7 +194,9 @@ describe('EditTool', () => {
old_string: 'old', old_string: 'old',
new_string: 'new', new_string: 'new',
}; };
expect(tool.validateParams(params)).toMatch(/File path must be absolute/); expect(tool.validateToolParams(params)).toMatch(
/File path must be absolute/,
);
}); });
it('should return error for path outside root', () => { it('should return error for path outside root', () => {
@ -203,7 +205,7 @@ describe('EditTool', () => {
old_string: 'old', old_string: 'old',
new_string: 'new', new_string: 'new',
}; };
expect(tool.validateParams(params)).toMatch( expect(tool.validateToolParams(params)).toMatch(
/File path must be within the root directory/, /File path must be within the root directory/,
); );
}); });

4
packages/core/src/tools/edit.ts
View file

@ -126,7 +126,7 @@ Expectation for parameters:
* @param params Parameters to validate * @param params Parameters to validate
* @returns Error message string or null if valid * @returns Error message string or null if valid
*/ */
validateParams(params: EditToolParams): string | null { validateToolParams(params: EditToolParams): string | null {
if ( if (
this.schema.parameters && this.schema.parameters &&
!SchemaValidator.validate( !SchemaValidator.validate(
@ -372,7 +372,7 @@ Expectation for parameters:
params: EditToolParams, params: EditToolParams,
_signal: AbortSignal, _signal: AbortSignal,
): Promise<ToolResult> { ): Promise<ToolResult> {
const validationError = this.validateParams(params); const validationError = this.validateToolParams(params);
if (validationError) { if (validationError) {
return { return {
llmContent: `Error: Invalid parameters provided. Reason: ${validationError}`, llmContent: `Error: Invalid parameters provided. Reason: ${validationError}`,