fix: skip runtime normalization for broad model lists · openclaw/openclaw@9682f39

Recent Commits to openclaw:main

shakkernerd · 2026-04-28 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,7 @@ type DiscoveredProviderRuntimeModelLike = Omit<ProviderRuntimeModelLike, "api">`
`35`	`35`
`36`	`36`	`type DiscoverModelsOptions = {`
`37`	`37`	`providerFilter?: string;`
	`38`	`+normalizeModels?: boolean;`
`38`	`39`	`};`
`39`	`40`
`40`	`41`	`type InMemoryAuthStorageBackendLike = {`
`@@ -149,17 +150,24 @@ function createOpenClawModelRegistry(`
`149`	`150`	`const providerFilter = options?.providerFilter ? normalizeProviderId(options.providerFilter) : "";`
`150`	`151`	`const matchesProviderFilter = (entry: Model<Api>) =>`
`151`	`152`	`!providerFilter \|\| normalizeProviderId(entry.provider) === providerFilter;`
	`153`	`+const shouldNormalize = options?.normalizeModels !== false;`
`152`	`154`
`153`		`-registry.getAll = () =>`
`154`		`-getAll()`
`155`		`-.filter((entry: Model<Api>) => matchesProviderFilter(entry))`
`156`		`-.map((entry: Model<Api>) => normalizeDiscoveredPiModel(entry, agentDir));`
`157`		`-registry.getAvailable = () =>`
`158`		`-getAvailable()`
`159`		`-.filter((entry: Model<Api>) => matchesProviderFilter(entry))`
`160`		`-.map((entry: Model<Api>) => normalizeDiscoveredPiModel(entry, agentDir));`
	`155`	`+registry.getAll = () => {`
	`156`	`+const entries = getAll().filter((entry: Model<Api>) => matchesProviderFilter(entry));`
	`157`	`+return shouldNormalize`
	`158`	`+ ? entries.map((entry: Model<Api>) => normalizeDiscoveredPiModel(entry, agentDir))`
	`159`	`+ : entries;`
	`160`	`+};`
	`161`	`+registry.getAvailable = () => {`
	`162`	`+const entries = getAvailable().filter((entry: Model<Api>) => matchesProviderFilter(entry));`
	`163`	`+return shouldNormalize`
	`164`	`+ ? entries.map((entry: Model<Api>) => normalizeDiscoveredPiModel(entry, agentDir))`
	`165`	`+ : entries;`
	`166`	`+};`
`161`	`167`	`registry.find = (provider: string, modelId: string) =>`
`162`		`-normalizeDiscoveredPiModel(find(provider, modelId), agentDir);`
	`168`	`+shouldNormalize`
	`169`	`+ ? normalizeDiscoveredPiModel(find(provider, modelId), agentDir)`
	`170`	`+ : find(provider, modelId);`
`163`	`171`
`164`	`172`	`return registry;`
`165`	`173`	`}`

Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ function installModelsListCommandForwardCompatMocks() {`
`153`	`153`	`vi.doMock("./list.registry-load.js", () => ({`
`154`	`154`	`loadListModelRegistry: async (`
`155`	`155`	`cfg: unknown,`
`156`		`-opts?: { providerFilter?: string },`
	`156`	`+opts?: { providerFilter?: string; normalizeModels?: boolean },`
`157`	`157`	`): Promise<{`
`158`	`158`	`models: Array<{ provider: string; id: string }>;`
`159`	`159`	`availableKeys?: Set<string>;`
`@@ -173,7 +173,7 @@ function installModelsListCommandForwardCompatMocks() {`
`173`	`173`	`loadConfiguredListModelRegistry: (`
`174`	`174`	`_cfg: unknown,`
`175`	`175`	`_entries: unknown,`
`176`		`-opts?: { providerFilter?: string },`
	`176`	`+opts?: { providerFilter?: string; normalizeModels?: boolean },`
`177`	`177`	`) => {`
`178`	`178`	`mocks.loadModelRegistry(mocks.resolvedConfig, opts);`
`179`	`179`	`return {`
`@@ -618,6 +618,7 @@ describe("modelsListCommand forward-compat", () => {`
`618`	`618`
`619`	`619`	`expect(mocks.loadModelRegistry).toHaveBeenCalledWith(mocks.resolvedConfig, {`
`620`	`620`	`providerFilter: undefined,`
	`621`	`+normalizeModels: false,`
`621`	`622`	`});`
`622`	`623`	`expect(mocks.loadProviderCatalogModelsForList).not.toHaveBeenCalled();`
`623`	`624`	`expect(mocks.resolveModelWithRegistry).not.toHaveBeenCalled();`
`@@ -653,6 +654,7 @@ describe("modelsListCommand forward-compat", () => {`
`653`	`654`	`mocks.resolvedConfig,`
`654`	`655`	`expect.objectContaining({`
`655`	`656`	`providerFilter: "openai-codex",`
	`657`	`+normalizeModels: true,`
`656`	`658`	`}),`
`657`	`659`	`);`
`658`	`660`	`expect(mocks.loadProviderCatalogModelsForList).toHaveBeenNthCalledWith(1, {`

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,10 @@ export async function modelsListCommand(`
`92`	`92`	`const shouldLoadRegistry = sourcePlan?.requiresInitialRegistry ?? false;`
`93`	`93`	`const loadRegistryState = async () => {`
`94`	`94`	`const { loadListModelRegistry } = await loadRegistryLoadModule();`
`95`		`-const loaded = await loadListModelRegistry(cfg, { providerFilter });`
	`95`	`+const loaded = await loadListModelRegistry(cfg, {`
	`96`	`+ providerFilter,`
	`97`	`+normalizeModels: Boolean(providerFilter),`
	`98`	`+});`
`96`	`99`	`modelRegistry = loaded.registry;`
`97`	`100`	`discoveredKeys = loaded.discoveredKeys;`
`98`	`101`	`availableKeys = loaded.availableKeys;`

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import { modelKey } from "./shared.js";`
`10`	`10`
`11`	`11`	`export async function loadListModelRegistry(`
`12`	`12`	`cfg: OpenClawConfig,`
`13`		`-opts?: { providerFilter?: string },`
	`13`	`+opts?: { providerFilter?: string; normalizeModels?: boolean },`
`14`	`14`	`) {`
`15`	`15`	`const loaded = await loadModelRegistry(cfg, opts);`
`16`	`16`	`return {`

Original file line number	Diff line number	Diff line change
`@@ -107,11 +107,15 @@ function loadAvailableModels(registry: ModelRegistry, cfg: OpenClawConfig): Mode`
`107`	`107`	`}`
`108`	`108`	`}`
`109`	`109`
`110`		`-export async function loadModelRegistry(cfg: OpenClawConfig, opts?: { providerFilter?: string }) {`
	`110`	`+export async function loadModelRegistry(`
	`111`	`+cfg: OpenClawConfig,`
	`112`	`+opts?: { providerFilter?: string; normalizeModels?: boolean },`
	`113`	`+) {`
`111`	`114`	`const agentDir = resolveOpenClawAgentDir();`
`112`	`115`	`const authStorage = discoverAuthStorage(agentDir, { readOnly: true });`
`113`	`116`	`const registry = discoverModels(authStorage, agentDir, {`
`114`	`117`	`providerFilter: opts?.providerFilter,`
	`118`	`+normalizeModels: opts?.normalizeModels,`
`115`	`119`	`});`
`116`	`120`	`const models = registry.getAll().filter(`
`117`	`121`	`(model) =>`

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

推荐订阅源

Recent Commits to openclaw:main