fix: normalize per-agent gemini config refs · openclaw/openclaw@38bab38

Recent Commits to openclaw:main

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

Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,7 @@ Docs: https://docs.openclaw.ai`
`51`	`51`	- Google/Gemini: normalize retired Gemini 3 Pro Preview ids in provider catalog rows when API-key onboarding only reapplies the agent default, so emitted config keeps testing `google/gemini-3.1-pro-preview`.
`52`	`52`	- Google/Gemini: canonicalize provider-qualified retired Gemini 3 Pro Preview refs during Google forward-compatible model resolution, so emitted config uses `google/gemini-3.1-pro-preview` for Gemini 3.1 testing.
`53`	`53`	- Google/Gemini: normalize proxy-prefixed retired Gemini 3 Pro Preview catalog rows, so emitted configs use `google/gemini-3.1-pro-preview` for Gemini 3.1 testing.
	`54`	+- Google/Gemini: normalize retired Gemini 3 Pro Preview ids inside per-agent model overrides before writing config, so agent-specific config emits `google/gemini-3.1-pro-preview` for Gemini 3.1 testing.
`54`	`55`	- Docs/subagents: document `agents.defaults.subagents.announceTimeoutMs` in the sub-agent and configuration references. (#75509) Thanks @akrimm702.
`55`	`56`	- Cron: add direct `cron.get`, `openclaw cron get <id>`, and agent-tool `get` support for inspecting one stored cron job by id. (#75117) Thanks @samzong.
`56`	`57`	`- Agents/tools: add per-sender tool policies with canonical channel-scoped sender keys, so operators can restrict dangerous tools by requester identity across global, agent, group, core, bundled, and plugin tool surfaces. (#66933) Thanks @JerranC.`

Original file line number	Diff line number	Diff line change
`@@ -183,6 +183,20 @@ describe("config io write prepare", () => {`
`183`	`183`	`},`
`184`	`184`	`},`
`185`	`185`	`},`
	`186`	`+list: [`
	`187`	`+{`
	`188`	`+id: "ops",`
	`189`	`+model: {`
	`190`	`+primary: "google/gemini-3-pro-preview",`
	`191`	`+fallbacks: ["google/gemini-3-pro-preview"],`
	`192`	`+},`
	`193`	`+models: {`
	`194`	`+"google/gemini-3-pro-preview": {`
	`195`	`+alias: "Ops Gemini",`
	`196`	`+},`
	`197`	`+},`
	`198`	`+},`
	`199`	`+],`
`186`	`200`	`},`
`187`	`201`	`gateway: { port: 18789 },`
`188`	`202`	`};`
`@@ -199,6 +213,20 @@ describe("config io write prepare", () => {`
`199`	`213`	`},`
`200`	`214`	`},`
`201`	`215`	`},`
	`216`	`+list: [`
	`217`	`+{`
	`218`	`+id: "ops",`
	`219`	`+model: {`
	`220`	`+primary: "google/gemini-3.1-pro-preview",`
	`221`	`+fallbacks: ["google/gemini-3.1-pro-preview"],`
	`222`	`+},`
	`223`	`+models: {`
	`224`	`+"google/gemini-3.1-pro-preview": {`
	`225`	`+alias: "Ops Gemini",`
	`226`	`+},`
	`227`	`+},`
	`228`	`+},`
	`229`	`+],`
`202`	`230`	`},`
`203`	`231`	`gateway: { port: 18789 },`
`204`	`232`	`};`
`@@ -220,6 +248,15 @@ describe("config io write prepare", () => {`
`220`	`248`	`alias: "Gemini",`
`221`	`249`	`},`
`222`	`250`	`});`
	`251`	`+expect(persisted.agents?.list?.[0]?.model).toEqual({`
	`252`	`+primary: "google/gemini-3.1-pro-preview",`
	`253`	`+fallbacks: ["google/gemini-3.1-pro-preview"],`
	`254`	`+});`
	`255`	`+expect(persisted.agents?.list?.[0]?.models).toEqual({`
	`256`	`+"google/gemini-3.1-pro-preview": {`
	`257`	`+alias: "Ops Gemini",`
	`258`	`+},`
	`259`	`+});`
`223`	`260`	`expect(persisted.gateway?.port).toBe(18888);`
`224`	`261`	`});`
`225`	`262`

Original file line number	Diff line number	Diff line change
`@@ -355,6 +355,39 @@ function normalizeAgentDefaultModelRefsForWrite(config: unknown): unknown {`
`355`	`355`	`return next;`
`356`	`356`	`}`
`357`	`357`
	`358`	`+function normalizeAgentListModelRefsForWrite(config: unknown): unknown {`
	`359`	`+const list = getPathValue(config, ["agents", "list"]);`
	`360`	`+if (!Array.isArray(list)) {`
	`361`	`+return config;`
	`362`	`+}`
	`363`	`+`
	`364`	`+let mutated = false;`
	`365`	`+const nextList = list.map((agent) => {`
	`366`	`+if (!isRecord(agent)) {`
	`367`	`+return agent;`
	`368`	`+}`
	`369`	`+`
	`370`	`+let nextAgent = agent;`
	`371`	`+if (Object.prototype.hasOwnProperty.call(agent, "model")) {`
	`372`	`+const normalizedModel = normalizeAgentModelConfigForWrite(agent.model);`
	`373`	`+if (normalizedModel !== agent.model) {`
	`374`	`+nextAgent = { ...nextAgent, model: normalizedModel };`
	`375`	`+mutated = true;`
	`376`	`+}`
	`377`	`+}`
	`378`	`+if (isRecord(agent.models)) {`
	`379`	`+const normalizedModels = normalizeAgentModelMapForConfig(agent.models);`
	`380`	`+if (normalizedModels !== agent.models) {`
	`381`	`+nextAgent = { ...nextAgent, models: normalizedModels };`
	`382`	`+mutated = true;`
	`383`	`+}`
	`384`	`+}`
	`385`	`+return nextAgent;`
	`386`	`+});`
	`387`	`+`
	`388`	`+return mutated ? setPathValue(config, ["agents", "list"], nextList) : config;`
	`389`	`+}`
	`390`	`+`
`358`	`391`	`function normalizeModelProviderCatalogRefsForWrite(config: unknown): unknown {`
`359`	`392`	`const providers = getPathValue(config, ["models", "providers"]);`
`360`	`393`	`if (!isRecord(providers)) {`
`@@ -395,7 +428,9 @@ function normalizeModelProviderCatalogRefsForWrite(config: unknown): unknown {`
`395`	`428`	`}`
`396`	`429`
`397`	`430`	`function normalizeModelRefsForWrite(config: unknown): unknown {`
`398`		`-return normalizeModelProviderCatalogRefsForWrite(normalizeAgentDefaultModelRefsForWrite(config));`
	`431`	`+return normalizeModelProviderCatalogRefsForWrite(`
	`432`	`+normalizeAgentListModelRefsForWrite(normalizeAgentDefaultModelRefsForWrite(config)),`
	`433`	`+);`
`399`	`434`	`}`
`400`	`435`
`401`	`436`	`function preserveUntouchedIncludes(params: {`

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

推荐订阅源

Recent Commits to openclaw:main