fix: validate tavily integer options · openclaw/openclaw@...

Recent Commits to openclaw:main

steipete · 2026-05-29 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ import type { OpenClawPluginToolContext } from "openclaw/plugin-sdk/plugin-entry`
`3`	`3`	`import type { OpenClawPluginApi } from "openclaw/plugin-sdk/plugin-runtime";`
`4`	`4`	`import {`
`5`	`5`	`jsonResult,`
`6`		`-readNumberParam,`
	`6`	`+readPositiveIntegerParam,`
`7`	`7`	`readStringParam,`
`8`	`8`	`} from "openclaw/plugin-sdk/provider-web-search";`
`9`	`9`	`import { Type } from "typebox";`
`@@ -38,7 +38,7 @@ const TavilyExtractToolSchema = Type.Object(`
`38`	`38`	`description: '"basic" (default) or "advanced" (for JS-heavy pages).',`
`39`	`39`	`}),`
`40`	`40`	`chunks_per_source: Type.Optional(`
`41`		`-Type.Number({`
	`41`	`+Type.Integer({`
`42`	`42`	`description: "Chunks per URL (1-5, requires query).",`
`43`	`43`	`minimum: 1,`
`44`	`44`	`maximum: 5,`
`@@ -69,8 +69,9 @@ export function createTavilyExtractTool(api: OpenClawPluginApi, ctx?: TavilyTool`
`69`	`69`	`}`
`70`	`70`	`const query = readStringParam(rawParams, "query") \|\| undefined;`
`71`	`71`	`const extractDepth = readStringParam(rawParams, "extract_depth") \|\| undefined;`
`72`		`-const chunksPerSource = readNumberParam(rawParams, "chunks_per_source", {`
`73`		`-integer: true,`
	`72`	`+const chunksPerSource = readPositiveIntegerParam(rawParams, "chunks_per_source", {`
	`73`	`+max: 5,`
	`74`	`+message: "chunks_per_source must be an integer from 1 to 5.",`
`74`	`75`	`});`
`75`	`76`	`if (chunksPerSource !== undefined && !query) {`
`76`	`77`	`throw new Error("tavily_extract requires query when chunks_per_source is set.");`

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ import type { OpenClawPluginToolContext } from "openclaw/plugin-sdk/plugin-entry`
`3`	`3`	`import type { OpenClawPluginApi } from "openclaw/plugin-sdk/plugin-runtime";`
`4`	`4`	`import {`
`5`	`5`	`jsonResult,`
`6`		`-readNumberParam,`
	`6`	`+readPositiveIntegerParam,`
`7`	`7`	`readStringParam,`
`8`	`8`	`} from "openclaw/plugin-sdk/provider-web-search";`
`9`	`9`	`import { Type } from "typebox";`
`@@ -32,7 +32,7 @@ const TavilySearchToolSchema = Type.Object(`
`32`	`32`	`description: 'Search topic: "general" (default), "news", or "finance".',`
`33`	`33`	`}),`
`34`	`34`	`max_results: Type.Optional(`
`35`		`-Type.Number({`
	`35`	`+Type.Integer({`
`36`	`36`	`description: "Number of results to return (1-20).",`
`37`	`37`	`minimum: 1,`
`38`	`38`	`maximum: 20,`
`@@ -71,7 +71,10 @@ export function createTavilySearchTool(api: OpenClawPluginApi, ctx?: TavilyToolC`
`71`	`71`	`const query = readStringParam(rawParams, "query", { required: true });`
`72`	`72`	`const searchDepth = readStringParam(rawParams, "search_depth") \|\| undefined;`
`73`	`73`	`const topic = readStringParam(rawParams, "topic") \|\| undefined;`
`74`		`-const maxResults = readNumberParam(rawParams, "max_results", { integer: true });`
	`74`	`+const maxResults = readPositiveIntegerParam(rawParams, "max_results", {`
	`75`	`+max: 20,`
	`76`	`+message: "max_results must be an integer from 1 to 20.",`
	`77`	`+});`
`75`	`78`	`const includeAnswer = rawParams.include_answer === true;`
`76`	`79`	`const timeRange = readStringParam(rawParams, "time_range") \|\| undefined;`
`77`	`80`	`const includeDomains = Array.isArray(rawParams.include_domains)`

Original file line number	Diff line number	Diff line change
`@@ -297,6 +297,41 @@ describe("tavily tools", () => {`
`297`	`297`	`expect(runTavilyExtract).not.toHaveBeenCalled();`
`298`	`298`	`});`
`299`	`299`
	`300`	`+it("rejects fractional and out-of-range integer options before Tavily calls", async () => {`
	`301`	`+const searchTool = createTavilySearchTool(fakeApi());`
	`302`	`+await expect(`
	`303`	`+searchTool.execute("search-call", {`
	`304`	`+query: "openclaw",`
	`305`	`+max_results: 5.5,`
	`306`	`+}),`
	`307`	`+).rejects.toThrow("max_results must be an integer from 1 to 20.");`
	`308`	`+await expect(`
	`309`	`+searchTool.execute("search-call", {`
	`310`	`+query: "openclaw",`
	`311`	`+max_results: 21,`
	`312`	`+}),`
	`313`	`+).rejects.toThrow("max_results must be an integer from 1 to 20.");`
	`314`	`+`
	`315`	`+const extractTool = createTavilyExtractTool(fakeApi());`
	`316`	`+await expect(`
	`317`	`+extractTool.execute("extract-call", {`
	`318`	`+urls: ["https://example.com"],`
	`319`	`+query: "pricing",`
	`320`	`+chunks_per_source: 2.5,`
	`321`	`+}),`
	`322`	`+).rejects.toThrow("chunks_per_source must be an integer from 1 to 5.");`
	`323`	`+await expect(`
	`324`	`+extractTool.execute("extract-call", {`
	`325`	`+urls: ["https://example.com"],`
	`326`	`+query: "pricing",`
	`327`	`+chunks_per_source: 6,`
	`328`	`+}),`
	`329`	`+).rejects.toThrow("chunks_per_source must be an integer from 1 to 5.");`
	`330`	`+`
	`331`	`+expect(runTavilySearch).not.toHaveBeenCalled();`
	`332`	`+expect(runTavilyExtract).not.toHaveBeenCalled();`
	`333`	`+});`
	`334`	`+`
`300`	`335`	`it("reads plugin web search config and prefers it over env defaults", () => {`
`301`	`336`	`vi.stubEnv("TAVILY_API_KEY", "env-key");`
`302`	`337`	`vi.stubEnv("TAVILY_BASE_URL", "https://env.tavily.test");`

Original file line number	Diff line number	Diff line change
`@@ -102,6 +102,12 @@ describe("readNumberParam", () => {`
`102`	`102`	`message: "timeoutMs must be a positive integer in milliseconds.",`
`103`	`103`	`}),`
`104`	`104`	`).toThrow("timeoutMs must be a positive integer in milliseconds.");`
	`105`	`+expect(() =>`
	`106`	`+readPositiveIntegerParam({ maxResults: 21 }, "maxResults", {`
	`107`	`+max: 20,`
	`108`	`+message: "maxResults must be an integer from 1 to 20",`
	`109`	`+}),`
	`110`	`+).toThrow("maxResults must be an integer from 1 to 20");`
`105`	`111`	`});`
`106`	`112`	`});`
`107`	`113`

Original file line number	Diff line number	Diff line change
`@@ -211,6 +211,7 @@ export function readPositiveIntegerParam(`
`211`	`211`	`key: string,`
`212`	`212`	`options: {`
`213`	`213`	`message?: string;`
	`214`	`+max?: number;`
`214`	`215`	`} = {},`
`215`	`216`	`): number \| undefined {`
`216`	`217`	`const value = readNumberParam(params, key, {`
`@@ -220,6 +221,9 @@ export function readPositiveIntegerParam(`
`220`	`221`	`if (value === undefined && readParamRaw(params, key) !== undefined) {`
`221`	`222`	throw new ToolInputError(options.message ?? `${key} must be a positive integer`);
`222`	`223`	`}`
	`224`	`+if (value !== undefined && options.max !== undefined && value > options.max) {`
	`225`	+throw new ToolInputError(options.message ?? `${key} must be a positive integer`);
	`226`	`+}`
`223`	`227`	`return value;`
`224`	`228`	`}`
`225`	`229`

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ import type {`
`10`	`10`	`export {`
`11`	`11`	`jsonResult,`
`12`	`12`	`readNumberParam,`
	`13`	`+readPositiveIntegerParam,`
`13`	`14`	`readStringArrayParam,`
`14`	`15`	`readStringParam,`
`15`	`16`	`} from "../agents/tools/common.js";`

此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。原文来自 — 版权归原作者所有。

推荐订阅源

Recent Commits to openclaw:main