Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(maker-core): recognize localized cache field rejections
Yash K280d2dafafbc
diff --git a/packages/maker-core/src/agents/pi/__tests__/pi-translator.test.ts b/packages/maker-core/src/agents/pi/__tests__/pi-translator.test.tsindex f7f9da7231..9d7f568079 100644--- a/packages/maker-core/src/agents/pi/__tests__/pi-translator.test.ts+++ b/packages/maker-core/src/agents/pi/__tests__/pi-translator.test.ts@@ -487,7 +487,12 @@ describe('pi translator', () => {}));});- it('classifies a prompt_cache_retention rejection for provider compat self-heal', () => {+ it.each([+ ['English', '400: {"param":"prompt_cache_retention","type":"invalid_request_error","message":'+ + '"prompt_cache_retention is not supported by this endpoint; use prompt_cache_options"}'],+ ['Chinese (#6649)', '400: {"code":"UNKNOWN_FIELD","message":"未知请求字段:prompt_cache_retention",'+ + '"data":{"field":"prompt_cache_retention"}}'],+ ])('classifies a %s prompt_cache_retention rejection for provider compat self-heal', (_label, errorMessage) => {const ctx = createPiTranslateContext(noopLogger);const { queue, events } = makeQueue();translatePiEvent(ev({ type: 'agent_start' }), queue, ctx);@@ -498,9 +503,7 @@ describe('pi translator', () => {role: 'assistant',content: [],stopReason: 'error',- errorMessage:- '400: {"param":"prompt_cache_retention","type":"invalid_request_error","message":'- + '"prompt_cache_retention is not supported by this endpoint; use prompt_cache_options"}',+ errorMessage,usage: { input: 0, output: 0 },},}),diff --git a/packages/maker-core/src/agents/shared/unsupported-request-option-error.test.ts b/packages/maker-core/src/agents/shared/unsupported-request-option-error.test.tsindex 6eebb44c2a..5b2b13399b 100644--- a/packages/maker-core/src/agents/shared/unsupported-request-option-error.test.ts+++ b/packages/maker-core/src/agents/shared/unsupported-request-option-error.test.ts@@ -53,6 +53,34 @@ describe('unsupported request option error', () => {).toBe(true);});+ // #6649: these gateways identify an unknown field in Chinese or in code/data.field.+ it.each([+ '400: {"code":"UNKNOWN_FIELD","message":"未知请求字段:prompt_cache_retention","data":{"field":"prompt_cache_retention"}}',+ '400: {"message":"未知请求字段:`prompt_cache_key`"}',+ '400: {"code":"UNKNOWN_FIELD","message":"Request validation failed","data":{"field":"prompt_cache_retention"}}',+ '400: {"error":{"code":"UNKNOWN_FIELD","message":"Request validation failed","data":{"field":"prompt_cache_key"}}}',+ ])('maps an explicitly rejected cache field to the existing compat fix: %s', (message) => {+ expect(isUnsupportedRequestOptionErrorMessage(message)).toBe(true);+ expect(unsupportedRequestOptionCompatOverride(message)).toEqual({ supportsLongCacheRetention: false });+ });++ it.each([+ '401: {"code":"UNKNOWN_FIELD","message":"未知请求字段:prompt_cache_retention","data":{"field":"prompt_cache_retention"}}',+ '429: {"code":"UNKNOWN_FIELD","message":"未知请求字段:prompt_cache_retention","data":{"field":"prompt_cache_retention"}}',+ '400: {"type":"authentication_error","code":"UNKNOWN_FIELD","message":"未知请求字段:prompt_cache_retention","data":{"field":"prompt_cache_retention"}}',+ '400: {"param":"temperature","code":"UNKNOWN_FIELD","message":"未知请求字段:prompt_cache_retention","data":{"field":"prompt_cache_retention"}}',+ '400: {"code":"UNKNOWN_FIELD","message":"未知请求字段:prompt_cache_retention","data":{"field":"temperature"}}',+ '400: {"code":"UNKNOWN_FIELD","message":"Request validation failed","data":{"field":"prompt_cache_keyword"}}',+ '400: {"code":"UNKNOWN_FIELD","message":"Request validation failed","data":{"field":null}}',+ '400: {"code":"INVALID_VALUE","message":"Invalid value for prompt_cache_retention","data":{"field":"prompt_cache_retention"}}',+ '400: {"message":"未知请求字段:temperature;prompt_cache_key 已转发"}',+ '400: {"message":"未知请求字段:prompt_cache_retention_policy"}',+ '{"code":"UNKNOWN_FIELD","message":"Request validation failed","data":{"field":"prompt_cache_retention"}}',+ ])('does not learn cache compatibility from an unrelated rejection: %s', (message) => {+ expect(isUnsupportedRequestOptionErrorMessage(message)).toBe(false);+ expect(unsupportedRequestOptionCompatOverride(message)).toBeUndefined();+ });+// #6570: a nullable param means no parameter was specified, as does an omitted key.describe.each(['prompt_cache_key', 'prompt_cache_retention'])('structured rejection of %s', (field) => {describe.each([false, true])('wrapped in error: %s', (wrapped) => {diff --git a/packages/maker-core/src/agents/shared/unsupported-request-option-error.ts b/packages/maker-core/src/agents/shared/unsupported-request-option-error.tsindex bf696fb4b5..c2e2ade299 100644--- a/packages/maker-core/src/agents/shared/unsupported-request-option-error.ts+++ b/packages/maker-core/src/agents/shared/unsupported-request-option-error.ts@@ -1,16 +1,19 @@/**- * Upstream 对「可选的请求增强字段」的确定性拒收(invalid_request_error)。+ * Upstream 对「可选的请求增强字段」的确定性拒收(HTTP 400)。*- * 已确认的两种形态:+ * 已确认的三种形态:* 1. Console Go / OpenCode Zen-Go 的 GLM 上游(2026-09-20):* `"prompt_cache_retention" is not supported by this endpoint; use "prompt_cache_options"`。* 2. 政企/内网自定义 OpenAI 兼容网关(issue #5878,2026-10-12,Pi 1.0.2 实测复现):* `Validation: Unsupported parameter(s): `prompt_cache_key``。*- * 两种都是 400 而非网络/容量问题,原样重试必败;恢复动作是让 host 记住该 provider/model+ * 3. 自定义网关(issue #6649):`未知请求字段:prompt_cache_retention`,+ * 或 HTTP 400 下 `UNKNOWN_FIELD` + `data.field` 精确点名缓存字段。+ *+ * 这些都是 400 而非网络/容量问题,原样重试必败;恢复动作是让 host 记住该 provider/model* 不接受该字段,改写 models.json 的 compat 后重放同一轮请求(PI provider compat 自愈)。*- * 判据只认「被点名的可选字段 + 明确的 not supported/unsupported 措辞」同时出现:+ * 判据只认「被点名的可选字段 + 明确的 not supported/unsupported/未知请求字段 措辞或结构化 UNKNOWN_FIELD」同时出现:* 普通 400(鉴权/参数值错误/未点名已知字段)不满足;结构化错误的 `param` 缺省或为 null* 表示未指定参数;非 null 时必须点名这两类字段之一,避免误判其他参数错误。*/@@ -26,7 +29,7 @@ const CACHE_FIELDS = ['prompt_cache_retention', 'prompt_cache_key'] as const;// `\b` 边界防止误匹配 prompt_cache_keyword / prompt_cache_retention_policy 之类的长字段。const CACHE_FIELD_RE = /\bprompt_cache_(?:retention|key)\b/i;// A relationship in the same short clause, not two keywords anywhere in the error.-const REJECTED_FIELD_RE = /(?:unsupported\s+(?:request\s+)?parameters?(?:\(s\))?\s*:\s*[\x60"'\\\s]*(prompt_cache_(?:retention|key))\b|\b(prompt_cache_(?:retention|key))\b[\x60"'\\\s]*(?:is\s+(?:not\s+supported|unsupported)|isn't\s+supported))/i;+const REJECTED_FIELD_RE = /(?:unsupported\s+(?:request\s+)?parameters?(?:\(s\))?\s*:\s*[\x60"'\\\s]*(prompt_cache_(?:retention|key))\b|\b(prompt_cache_(?:retention|key))\b[\x60"'\\\s]*(?:is\s+(?:not\s+supported|unsupported)|isn't\s+supported)|未知请求字段\s*[::][\x60"'\\\s]*(prompt_cache_(?:retention|key))\b)/i;export function isUnsupportedRequestOptionErrorMessage(message: string): boolean {if (typeof message !== 'string' || message.length === 0 || message.length > 64 * 1024) return false;@@ -42,6 +45,12 @@ export function isUnsupportedRequestOptionErrorMessage(message: string): booleanconst error = value as Record<string, unknown>;if (Object.hasOwn(error, 'param') && error.param !== null && !CACHE_FIELDS.some((field) => field === error.param)) return false;if (error.type !== undefined && !['invalid_request_error', 'unsupported_parameter'].includes(String(error.type))) return false;+ const data = error.data;+ if (error.code === 'UNKNOWN_FIELD' && data && typeof data === 'object' && 'field' in data) {+ const rejectedField = data.field;+ if (!CACHE_FIELDS.some((field) => field === rejectedField)) return false;+ if (status?.[1] === '400') return true;+ }if (typeof error.message === 'string') { text = error.message; break; }value = error.error;}