fix(models): strip remaining provider self prefixes (#887...

Recent Commits to openclaw:main

charles-open · 2026-06-01 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ import {`
`3`	`3`	`collectManifestModelIdNormalizationPolicies,`
`4`	`4`	`normalizeConfiguredProviderCatalogModelId,`
`5`	`5`	`normalizeStaticProviderModelIdWithPolicies,`
	`6`	`+stripSelfProviderModelPrefix,`
`6`	`7`	`} from "./provider-model-id-normalization.js";`
`7`	`8`
`8`	`9`	`describe("provider model id policy normalization", () => {`
`@@ -37,13 +38,50 @@ describe("provider model id policy normalization", () => {`
`37`	`38`
`38`	`39`	`it("normalizes native Anthropic catalog refs without retaining the provider prefix", () => {`
`39`	`40`	`expect(`
`40`		`-normalizeStaticProviderModelIdWithPolicies(`
`41`		`-"anthropic",`
`42`		`-"anthropic/claude-haiku-4-5",`
`43`		`-),`
	`41`	`+normalizeStaticProviderModelIdWithPolicies("anthropic", "anthropic/claude-haiku-4-5"),`
`44`	`42`	`).toBe("claude-haiku-4-5");`
`45`	`43`	`expect(`
`46`	`44`	`normalizeConfiguredProviderCatalogModelId("anthropic", "anthropic/claude-haiku-4-5"),`
`47`	`45`	`).toBe("claude-haiku-4-5");`
`48`	`46`	`});`
	`47`	`+`
	`48`	`+it("normalizes provider-prefixed native catalog refs without stripping catalog prefixes", () => {`
	`49`	`+expect(normalizeStaticProviderModelIdWithPolicies("google", "google/gemini-2.0-flash")).toBe(`
	`50`	`+"google/gemini-2.0-flash",`
	`51`	`+);`
	`52`	`+expect(`
	`53`	`+normalizeStaticProviderModelIdWithPolicies(`
	`54`	`+"google-gemini-cli",`
	`55`	`+"google-gemini-cli/gemini-2.0-flash",`
	`56`	`+),`
	`57`	`+).toBe("google-gemini-cli/gemini-2.0-flash");`
	`58`	`+expect(`
	`59`	`+normalizeStaticProviderModelIdWithPolicies(`
	`60`	`+"google-vertex",`
	`61`	`+"google-vertex/gemini-3-pro-preview",`
	`62`	`+),`
	`63`	`+).toBe("google-vertex/gemini-3-pro-preview");`
	`64`	`+expect(normalizeStaticProviderModelIdWithPolicies("xai", "xai/grok-4-fast-reasoning")).toBe(`
	`65`	`+"xai/grok-4-fast-reasoning",`
	`66`	`+);`
	`67`	`+expect(normalizeStaticProviderModelIdWithPolicies("openai", "openai/gpt-5.4")).toBe(`
	`68`	`+"openai/gpt-5.4",`
	`69`	`+);`
	`70`	`+expect(`
	`71`	`+normalizeStaticProviderModelIdWithPolicies("vercel-ai-gateway", "vercel-ai-gateway/opus-4.6"),`
	`72`	`+).toBe("vercel-ai-gateway/opus-4.6");`
	`73`	`+});`
	`74`	`+`
	`75`	`+it("strips self provider model prefixes before runtime provider calls", () => {`
	`76`	`+expect(stripSelfProviderModelPrefix("google", "google/gemini-2.0-flash")).toBe(`
	`77`	`+"gemini-2.0-flash",`
	`78`	`+);`
	`79`	`+expect(stripSelfProviderModelPrefix("xai", "xai/grok-4-fast-reasoning")).toBe(`
	`80`	`+"grok-4-fast-reasoning",`
	`81`	`+);`
	`82`	`+expect(stripSelfProviderModelPrefix("openai", "openai/gpt-5.4")).toBe("gpt-5.4");`
	`83`	`+expect(stripSelfProviderModelPrefix("vercel-ai-gateway", "vercel-ai-gateway/opus-4.6")).toBe(`
	`84`	`+"opus-4.6",`
	`85`	`+);`
	`86`	`+});`
`49`	`87`	`});`

Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,14 @@ function formatPrefixedModelId(prefix: string, modelId: string): string {`
`58`	`58`	return `${prefix.replace(/\/+$/u, "")}/${modelId.replace(/^\/+/u, "")}`;
`59`	`59`	`}`
`60`	`60`
	`61`	`+export function stripSelfProviderModelPrefix(provider: string, model: string): string {`
	`62`	+const prefix = `${normalizeLowercaseStringOrEmpty(provider)}/`;
	`63`	`+const trimmed = model.trim();`
	`64`	`+return normalizeLowercaseStringOrEmpty(trimmed).startsWith(prefix)`
	`65`	`+ ? trimmed.slice(prefix.length)`
	`66`	`+ : model;`
	`67`	`+}`
	`68`	`+`
`61`	`69`	`export function normalizeProviderModelIdWithPolicies(params: {`
`62`	`70`	`provider: string;`
`63`	`71`	`policies: ReadonlyMap<string, ManifestModelIdNormalizationProvider>;`
`@@ -157,6 +165,9 @@ export function normalizeBuiltInProviderModelId(provider: string, model: string)`
`157`	`165`	`};`
`158`	`166`	`return xaiAliases[normalizeLowercaseStringOrEmpty(model)] ?? model;`
`159`	`167`	`}`
	`168`	`+if (normalizedProvider === "openai") {`
	`169`	`+return model;`
	`170`	`+}`
`160`	`171`	`if (normalizedProvider === "together") {`
`161`	`172`	`return normalizeTogetherModelId(model);`
`162`	`173`	`}`

Original file line number	Diff line number	Diff line change
`@@ -1787,33 +1787,33 @@ describe("runWithModelFallback", () => {`
`1787`	`1787`	`]);`
`1788`	`1788`	`});`
`1789`	`1789`
`1790`		`-it("normalizes prefixed Anthropic fallback candidates independently", () => {`
	`1790`	`+it("normalizes self-prefixed fallback candidates independently", () => {`
`1791`	`1791`	`const cfg = makeCfg({`
`1792`	`1792`	`agents: {`
`1793`	`1793`	`defaults: {`
`1794`	`1794`	`model: {`
`1795`		`-primary: "anthropic/claude-sonnet-4-6",`
`1796`		`-fallbacks: ["anthropic/claude-haiku-4-5", "anthropic/claude-opus-4-7"],`
	`1795`	`+primary: "google/gemini-2.0-flash",`
	`1796`	`+fallbacks: ["xai/grok-4-fast-reasoning", "openai/gpt-5.4"],`
`1797`	`1797`	`},`
`1798`	`1798`	`models: {`
`1799`		`-"anthropic/claude-sonnet-4-6": {},`
`1800`		`-"anthropic/claude-haiku-4-5": {},`
`1801`		`-"anthropic/claude-opus-4-7": {},`
	`1799`	`+"google/gemini-2.0-flash": {},`
	`1800`	`+"xai/grok-4-fast": {},`
	`1801`	`+"openai/gpt-5.4": {},`
`1802`	`1802`	`},`
`1803`	`1803`	`},`
`1804`	`1804`	`},`
`1805`	`1805`	`});`
`1806`	`1806`
`1807`	`1807`	`const candidates = testing.resolveFallbackCandidates({`
`1808`	`1808`	`cfg,`
`1809`		`-provider: "anthropic",`
`1810`		`-model: "anthropic/claude-sonnet-4-6",`
	`1809`	`+provider: "google",`
	`1810`	`+model: "google/gemini-2.0-flash",`
`1811`	`1811`	`});`
`1812`	`1812`
`1813`	`1813`	`expect(candidates).toEqual([`
`1814`		`-{ provider: "anthropic", model: "claude-sonnet-4-6" },`
`1815`		`-{ provider: "anthropic", model: "claude-haiku-4-5" },`
`1816`		`-{ provider: "anthropic", model: "claude-opus-4-7" },`
	`1814`	`+{ provider: "google", model: "gemini-2.0-flash" },`
	`1815`	`+{ provider: "xai", model: "grok-4-fast" },`
	`1816`	`+{ provider: "openai", model: "gpt-5.4" },`
`1817`	`1817`	`]);`
`1818`	`1818`	`});`
`1819`	`1819`

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ import {`
`4`	`4`	`normalizeProviderId as normalizeProviderIdCore,`
`5`	`5`	`normalizeProviderIdForAuth as normalizeProviderIdForAuthCore,`
`6`	`6`	`} from "@openclaw/model-catalog-core/provider-id";`
	`7`	`+import { stripSelfProviderModelPrefix } from "@openclaw/model-catalog-core/provider-model-id-normalization";`
`7`	`8`	`import { normalizeLowercaseStringOrEmpty } from "@openclaw/normalization-core/string-coerce";`
`8`	`9`	`import type { PluginManifestRecord } from "../plugins/manifest-registry.js";`
`9`	`10`	`import { modelKey as sharedModelKey, normalizeStaticProviderModelId } from "./model-ref-shared.js";`
`@@ -63,7 +64,8 @@ function normalizeProviderModelId(`
`63`	`64`	`allowPluginNormalization?: boolean;`
`64`	`65`	`},`
`65`	`66`	`): string {`
`66`		`-const staticModelId = normalizeStaticProviderModelId(provider, model, {`
	`67`	`+const providerModel = stripSelfProviderModelPrefix(provider, model);`
	`68`	`+const staticModelId = normalizeStaticProviderModelId(provider, providerModel, {`
`67`	`69`	`allowManifestNormalization: options?.allowManifestNormalization,`
`68`	`70`	`manifestPlugins: options?.manifestPlugins,`
`69`	`71`	`});`

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

推荐订阅源

Recent Commits to openclaw:main