fix(agents): clean Gemini tool schemas by model id (#9155...

Recent Commits to openclaw:main

Pick-cat · 2026-06-23 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -29,13 +29,17 @@ function resolveToolParameterSchemaCacheKey(`
`29`	`29`	`): string {`
`30`	`30`	`const normalizedProvider = normalizeLowercaseStringOrEmpty(options?.modelProvider);`
`31`	`31`	`const normalizedModelId = normalizeLowercaseStringOrEmpty(options?.modelId);`
	`32`	`+const toolSchemaProfile = normalizeLowercaseStringOrEmpty(`
	`33`	`+options?.modelCompat?.toolSchemaProfile,`
	`34`	`+);`
`32`	`35`	`const unsupportedKeywords = Array.from(`
`33`	`36`	`resolveUnsupportedToolSchemaKeywords(options?.modelCompat),`
`34`	`37`	`).toSorted();`
`35`	`38`	`const omitEmptyArrayItems = shouldOmitEmptyArrayItems(options?.modelCompat);`
`36`	`39`	`return JSON.stringify([`
`37`	`40`	`normalizedProvider,`
`38`	`41`	`normalizedModelId,`
	`42`	`+toolSchemaProfile,`
`39`	`43`	`unsupportedKeywords,`
`40`	`44`	`omitEmptyArrayItems,`
`41`	`45`	`]);`
`@@ -57,6 +61,10 @@ function rememberCachedToolParameterSchema(schema: object, key: string, value: T`
`57`	`61`	`return value;`
`58`	`62`	`}`
`59`	`63`
	`64`	`+function isGeminiModelId(modelId: string): boolean {`
	`65`	`+return /(?:^\|[/:])gemini(?:$\|[-/:.])/.test(modelId);`
	`66`	`+}`
	`67`	`+`
`60`	`68`	`function extractEnumValues(schema: unknown): unknown[] \| undefined {`
`61`	`69`	`if (!schema \|\| typeof schema !== "object") {`
`62`	`70`	`return undefined;`
`@@ -769,8 +777,15 @@ function normalizeToolParameterSchemaUncached(`
`769`	`777`	`//`
`770`	`778`	// Normalize once here so callers can always pass `tools` through unchanged.
`771`	`779`	`const normalizedProvider = normalizeLowercaseStringOrEmpty(options?.modelProvider);`
	`780`	`+const normalizedModelId = normalizeLowercaseStringOrEmpty(options?.modelId);`
	`781`	`+const normalizedToolSchemaProfile = normalizeLowercaseStringOrEmpty(`
	`782`	`+options?.modelCompat?.toolSchemaProfile,`
	`783`	`+);`
`772`	`784`	`const isGeminiProvider =`
`773`		`-normalizedProvider.includes("google") \|\| normalizedProvider.includes("gemini");`
	`785`	`+normalizedProvider.includes("google") \|\|`
	`786`	`+normalizedProvider.includes("gemini") \|\|`
	`787`	`+isGeminiModelId(normalizedModelId) \|\|`
	`788`	`+normalizedToolSchemaProfile === "gemini";`
`774`	`789`	`const isAnthropicProvider = normalizedProvider.includes("anthropic");`
`775`	`790`	`const unsupportedToolSchemaKeywords = resolveUnsupportedToolSchemaKeywords(options?.modelCompat);`
`776`	`791`	`const omitEmptyArrayItems = shouldOmitEmptyArrayItems(options?.modelCompat);`
`@@ -781,7 +796,13 @@ function normalizeToolParameterSchemaUncached(`
`781`	`796`	`? stripEmptyArrayItemsFromArraySchemas(normalizedSchema)`
`782`	`797`	`: normalizedSchema;`
`783`	`798`	`if (isGeminiProvider && !isAnthropicProvider) {`
`784`		`-return cleanSchemaForGemini(arrayItemsCompatibleSchema);`
	`799`	`+const geminiCompatibleSchema = cleanSchemaForGemini(arrayItemsCompatibleSchema);`
	`800`	`+return unsupportedToolSchemaKeywords.size > 0`
	`801`	`+ ? (stripUnsupportedSchemaKeywords(`
	`802`	`+geminiCompatibleSchema,`
	`803`	`+unsupportedToolSchemaKeywords,`
	`804`	`+) as TSchema)`
	`805`	`+ : geminiCompatibleSchema;`
`785`	`806`	`}`
`786`	`807`	`if (unsupportedToolSchemaKeywords.size > 0) {`
`787`	`808`	`return stripUnsupportedSchemaKeywords(`

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,93 @@ describe("normalizeToolParameterSchema", () => {`
`43`	`43`	`expect(providerSpecific).toEqual(first);`
`44`	`44`	`});`
`45`	`45`
	`46`	`+it("uses Gemini cleanup for OpenAI-compatible providers when the model id is Gemini", () => {`
	`47`	`+const schema = {`
	`48`	`+type: "object",`
	`49`	`+properties: {`
	`50`	`+sessionKey: {`
	`51`	`+description: "Explicit session key, or null to clear it",`
	`52`	`+anyOf: [{ type: "string" }, { type: "null" }],`
	`53`	`+},`
	`54`	`+},`
	`55`	`+};`
	`56`	`+`
	`57`	`+expect(`
	`58`	`+normalizeToolParameterSchema(schema, {`
	`59`	`+modelProvider: "jjcc",`
	`60`	`+modelId: "gemini-3.1-pro-preview",`
	`61`	`+}),`
	`62`	`+).toEqual({`
	`63`	`+type: "object",`
	`64`	`+properties: {`
	`65`	`+sessionKey: {`
	`66`	`+type: "string",`
	`67`	`+description: "Explicit session key, or null to clear it",`
	`68`	`+},`
	`69`	`+},`
	`70`	`+});`
	`71`	`+expect(`
	`72`	`+normalizeToolParameterSchema(schema, {`
	`73`	`+modelProvider: "stepfun",`
	`74`	`+modelId: "step-router-v1",`
	`75`	`+}),`
	`76`	`+).toEqual(schema);`
	`77`	`+});`
	`78`	`+`
	`79`	`+it("keeps normalized tool-schema profile behavior aligned with the cache key", () => {`
	`80`	`+const schema = {`
	`81`	`+type: "object",`
	`82`	`+properties: {`
	`83`	`+sessionKey: {`
	`84`	`+anyOf: [{ type: "string" }, { type: "null" }],`
	`85`	`+},`
	`86`	`+},`
	`87`	`+};`
	`88`	`+`
	`89`	`+const defaultSchema = normalizeToolParameterSchema(schema, {`
	`90`	`+modelProvider: "openai-compatible",`
	`91`	`+modelId: "custom-model",`
	`92`	`+});`
	`93`	`+const mixedCaseGeminiProfileSchema = normalizeToolParameterSchema(schema, {`
	`94`	`+modelProvider: "openai-compatible",`
	`95`	`+modelId: "custom-model",`
	`96`	`+modelCompat: { toolSchemaProfile: "Gemini" },`
	`97`	`+});`
	`98`	`+`
	`99`	`+expect(defaultSchema).toEqual(schema);`
	`100`	`+expect(mixedCaseGeminiProfileSchema).toEqual({`
	`101`	`+type: "object",`
	`102`	`+properties: {`
	`103`	`+sessionKey: { type: "string" },`
	`104`	`+},`
	`105`	`+});`
	`106`	`+});`
	`107`	`+`
	`108`	`+it("applies explicit unsupported keyword stripping after Gemini cleanup", () => {`
	`109`	`+expect(`
	`110`	`+normalizeToolParameterSchema(`
	`111`	`+{`
	`112`	`+type: "object",`
	`113`	`+properties: {`
	`114`	`+count: {`
	`115`	`+anyOf: [{ type: "integer", vendorOnly: true }, { type: "null" }],`
	`116`	`+},`
	`117`	`+},`
	`118`	`+},`
	`119`	`+{`
	`120`	`+modelProvider: "jjcc",`
	`121`	`+modelId: "gemini-3.1-pro-preview",`
	`122`	`+modelCompat: { unsupportedToolSchemaKeywords: ["vendorOnly"] },`
	`123`	`+},`
	`124`	`+),`
	`125`	`+).toEqual({`
	`126`	`+type: "object",`
	`127`	`+properties: {`
	`128`	`+count: { type: "integer" },`
	`129`	`+},`
	`130`	`+});`
	`131`	`+});`
	`132`	`+`
`46`	`133`	`it("normalizes truly empty schemas to type:object with properties:{}", () => {`
`47`	`134`	`expect(normalizeToolParameterSchema({})).toEqual({`
`48`	`135`	`type: "object",`

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,10 @@ describe("createCronToolSchema", () => {`
`33`	`33`	`const providerSchemaRecord = normalizeToolParameterSchema(createCronToolSchema(), {`
`34`	`34`	`modelProvider: "gemini",`
`35`	`35`	`}) as unknown as Record<string, unknown>;`
	`36`	`+const jjccGeminiSchemaRecord = normalizeToolParameterSchema(createCronToolSchema(), {`
	`37`	`+modelProvider: "jjcc",`
	`38`	`+modelId: "gemini-3.1-pro-preview",`
	`39`	`+}) as unknown as Record<string, unknown>;`
`36`	`40`
`37`	`41`	`// Regression: models like GPT-5.4 rely on these fields to populate job/patch.`
`38`	`42`	`// If a field is removed from this list the test must be updated intentionally.`
`@@ -254,6 +258,22 @@ describe("createCronToolSchema", () => {`
`254`	`258`	`expect(patchProps?.payload?.properties?.model?.description).toMatch(/null to clear/i);`
`255`	`259`	`});`
`256`	`260`
	`261`	`+it("projects nullable cron fields for Gemini models behind OpenAI-compatible providers", () => {`
	`262`	`+expect(propertyAt(jjccGeminiSchemaRecord, "job.agentId")).toMatchObject({`
	`263`	`+type: "string",`
	`264`	`+});`
	`265`	`+expect(propertyAt(jjccGeminiSchemaRecord, "job.sessionKey")).toMatchObject({`
	`266`	`+type: "string",`
	`267`	`+});`
	`268`	`+expect(propertyAt(jjccGeminiSchemaRecord, "patch.payload.toolsAllow")).toMatchObject({`
	`269`	`+type: "array",`
	`270`	`+});`
	`271`	`+expect(propertyAt(jjccGeminiSchemaRecord, "patch.delivery.channel")).toMatchObject({`
	`272`	`+type: "string",`
	`273`	`+});`
	`274`	`+expect(JSON.stringify(jjccGeminiSchemaRecord)).not.toContain('"anyOf"');`
	`275`	`+});`
	`276`	`+`
`257`	`277`	`// Regression guard: ensure no OpenAPI 3.0 incompatible keywords leak into the`
`258`	`278`	`// serialized provider-facing cron tool schema.`
`259`	`279`	`it("serialized provider schema contains no type-array or not/const keywords", () => {`

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

推荐订阅源

Recent Commits to openclaw:main