refactor: split models list row sources · openclaw/opencl...

Recent Commits to openclaw:main

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

Original file line number	Diff line number	Diff line change
`@@ -4,14 +4,8 @@ import type { RuntimeEnv } from "../../runtime.js";`
`4`	`4`	`import { normalizeLowercaseStringOrEmpty } from "../../shared/string-coerce.js";`
`5`	`5`	`import { resolveConfiguredEntries } from "./list.configured.js";`
`6`	`6`	`import { formatErrorWithStack } from "./list.errors.js";`
`7`		`-import {`
`8`		`-appendCatalogSupplementRows,`
`9`		`-appendConfiguredProviderRows,`
`10`		`-appendConfiguredRows,`
`11`		`-appendDiscoveredRows,`
`12`		`-appendProviderCatalogRows,`
`13`		`-loadListModelRegistry,`
`14`		`-} from "./list.rows.js";`
	`7`	`+import { loadListModelRegistry } from "./list.registry-load.js";`
	`8`	`+import { appendAllModelRowSources, appendConfiguredModelRowSources } from "./list.row-sources.js";`
`15`	`9`	`import { printModelTable } from "./list.table.js";`
`16`	`10`	`import type { ModelRow } from "./list.types.js";`
`17`	`11`	`import { loadModelsConfigWithSource } from "./load-config.js";`
`@@ -98,40 +92,20 @@ export async function modelsListCommand(`
`98`	`92`	`};`
`99`	`93`
`100`	`94`	`if (opts.all) {`
`101`		`-const seenKeys = appendDiscoveredRows({`
	`95`	`+await appendAllModelRowSources({`
`102`	`96`	`rows,`
`103`		`-models: modelRegistry?.getAll() ?? [],`
`104`	`97`	`context: rowContext,`
	`98`	`+ modelRegistry,`
	`99`	`+ useProviderCatalogFastPath,`
`105`	`100`	`});`
`106`		`-`
`107`		`-appendConfiguredProviderRows({`
`108`		`- rows,`
`109`		`-context: rowContext,`
`110`		`- seenKeys,`
`111`		`-});`
`112`		`-`
`113`		`-if (modelRegistry) {`
`114`		`-await appendCatalogSupplementRows({`
`115`		`- rows,`
`116`		`- modelRegistry,`
`117`		`-context: rowContext,`
`118`		`- seenKeys,`
`119`		`-});`
`120`		`-} else if (useProviderCatalogFastPath) {`
`121`		`-await appendProviderCatalogRows({`
`122`		`- rows,`
`123`		`-context: rowContext,`
`124`		`- seenKeys,`
`125`		`-});`
`126`		`-}`
`127`	`101`	`} else {`
`128`	`102`	`const registry = modelRegistry;`
`129`	`103`	`if (!registry) {`
`130`	`104`	`runtime.error("Model registry unavailable.");`
`131`	`105`	`process.exitCode = 1;`
`132`	`106`	`return;`
`133`	`107`	`}`
`134`		`-appendConfiguredRows({`
	`108`	`+appendConfiguredModelRowSources({`
`135`	`109`	`rows,`
`136`	`110`	`entries,`
`137`	`111`	`modelRegistry: registry,`

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,14 @@`
	`1`	`+import type { OpenClawConfig } from "../../config/types.openclaw.js";`
	`2`	`+import { loadModelRegistry } from "./list.registry.js";`
	`3`	`+import { modelKey } from "./shared.js";`
	`4`	`+`
	`5`	`+export async function loadListModelRegistry(`
	`6`	`+cfg: OpenClawConfig,`
	`7`	`+opts?: { providerFilter?: string },`
	`8`	`+) {`
	`9`	`+const loaded = await loadModelRegistry(cfg, opts);`
	`10`	`+return {`
	`11`	`+ ...loaded,`
	`12`	`+discoveredKeys: new Set(loaded.models.map((model) => modelKey(model.provider, model.id))),`
	`13`	`+};`
	`14`	`+}`

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,58 @@`
	`1`	`+import type { ModelRegistry } from "@mariozechner/pi-coding-agent";`
	`2`	`+import {`
	`3`	`+appendCatalogSupplementRows,`
	`4`	`+appendConfiguredProviderRows,`
	`5`	`+appendConfiguredRows,`
	`6`	`+appendDiscoveredRows,`
	`7`	`+appendProviderCatalogRows,`
	`8`	`+type RowBuilderContext,`
	`9`	`+} from "./list.rows.js";`
	`10`	`+import type { ConfiguredEntry, ModelRow } from "./list.types.js";`
	`11`	`+`
	`12`	`+type AllModelRowSources = {`
	`13`	`+rows: ModelRow[];`
	`14`	`+context: RowBuilderContext;`
	`15`	`+modelRegistry?: ModelRegistry;`
	`16`	`+useProviderCatalogFastPath: boolean;`
	`17`	`+};`
	`18`	`+`
	`19`	`+export async function appendAllModelRowSources(params: AllModelRowSources): Promise<void> {`
	`20`	`+const seenKeys = appendDiscoveredRows({`
	`21`	`+rows: params.rows,`
	`22`	`+models: params.modelRegistry?.getAll() ?? [],`
	`23`	`+context: params.context,`
	`24`	`+});`
	`25`	`+`
	`26`	`+appendConfiguredProviderRows({`
	`27`	`+rows: params.rows,`
	`28`	`+context: params.context,`
	`29`	`+ seenKeys,`
	`30`	`+});`
	`31`	`+`
	`32`	`+if (params.modelRegistry) {`
	`33`	`+await appendCatalogSupplementRows({`
	`34`	`+rows: params.rows,`
	`35`	`+modelRegistry: params.modelRegistry,`
	`36`	`+context: params.context,`
	`37`	`+ seenKeys,`
	`38`	`+});`
	`39`	`+return;`
	`40`	`+}`
	`41`	`+`
	`42`	`+if (params.useProviderCatalogFastPath) {`
	`43`	`+await appendProviderCatalogRows({`
	`44`	`+rows: params.rows,`
	`45`	`+context: params.context,`
	`46`	`+ seenKeys,`
	`47`	`+});`
	`48`	`+}`
	`49`	`+}`
	`50`	`+`
	`51`	`+export function appendConfiguredModelRowSources(params: {`
	`52`	`+rows: ModelRow[];`
	`53`	`+entries: ConfiguredEntry[];`
	`54`	`+modelRegistry: ModelRegistry;`
	`55`	`+context: RowBuilderContext;`
	`56`	`+}): void {`
	`57`	`+appendConfiguredRows(params);`
	`58`	`+}`

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import { normalizeProviderId } from "../../agents/provider-id.js";`
`7`	`7`	`import type { ModelDefinitionConfig, ModelProviderConfig } from "../../config/types.models.js";`
`8`	`8`	`import type { OpenClawConfig } from "../../config/types.openclaw.js";`
`9`	`9`	`import type { ListRowModel } from "./list.model-row.js";`
`10`		`-import { loadModelRegistry, toModelRow } from "./list.registry.js";`
	`10`	`+import { toModelRow } from "./list.registry.js";`
`11`	`11`	`import {`
`12`	`12`	`loadModelCatalog,`
`13`	`13`	`loadProviderCatalogModelsForList,`
`@@ -23,7 +23,7 @@ type RowFilter = {`
`23`	`23`	`local?: boolean;`
`24`	`24`	`};`
`25`	`25`
`26`		`-type RowBuilderContext = {`
	`26`	`+export type RowBuilderContext = {`
`27`	`27`	`cfg: OpenClawConfig;`
`28`	`28`	`agentDir: string;`
`29`	`29`	`authStore: AuthProfileStore;`
`@@ -114,17 +114,6 @@ function shouldListConfiguredProviderModel(params: {`
`114`	`114`	`);`
`115`	`115`	`}`
`116`	`116`
`117`		`-export async function loadListModelRegistry(`
`118`		`-cfg: OpenClawConfig,`
`119`		`-opts?: { providerFilter?: string },`
`120`		`-) {`
`121`		`-const loaded = await loadModelRegistry(cfg, opts);`
`122`		`-return {`
`123`		`- ...loaded,`
`124`		`-discoveredKeys: new Set(loaded.models.map((model) => modelKey(model.provider, model.id))),`
`125`		`-};`
`126`		`-}`
`127`		`-`
`128`	`117`	`export function appendDiscoveredRows(params: {`
`129`	`118`	`rows: ModelRow[];`
`130`	`119`	`models: Model<Api>[];`

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

推荐订阅源

Recent Commits to openclaw:main