惯性聚合 高效追踪和阅读你感兴趣的博客、新闻、科技资讯
阅读原文 在惯性聚合中打开

推荐订阅源

D
DataBreaches.Net
钛媒体:引领未来商业与生活新知
钛媒体:引领未来商业与生活新知
云风的 BLOG
云风的 BLOG
B
Blog
博客园 - Franky
I
InfoQ
A
About on SuperTechFans
博客园_首页
L
LangChain Blog
量子位
腾讯CDC
Microsoft Security Blog
Microsoft Security Blog
博客园 - 【当耐特】
美团技术团队
V
V2EX
Apple Machine Learning Research
Apple Machine Learning Research
雷峰网
雷峰网
MongoDB | Blog
MongoDB | Blog
Microsoft Azure Blog
Microsoft Azure Blog
月光博客
月光博客
T
The Blog of Author Tim Ferriss
P
Proofpoint News Feed
G
Google Developers Blog
Last Week in AI
Last Week in AI

Recent Commits to openclaw:main

test: merge chat side-result checks · openclaw/openclaw@ddd2c2a test: merge cron history checks · openclaw/openclaw@f7eb746 test: merge responsive navigation shell checks · openclaw/openclaw@c2e4b47 docs(changelog): add codex oauth fixes · openclaw/openclaw@628e6cd test: merge navigation routing cases · openclaw/openclaw@5d8cecb Tests: mock channel registry bundled fallback · openclaw/openclaw@2b08233 Secrets: avoid broad web search discovery for single plugin config · openclaw/openclaw@a464f59 test: merge config view browser checks · openclaw/openclaw@20cf511 fix(status): align oauth health with runtime · openclaw/openclaw@eed7116 feat: add macOS screen snapshots for monitor preview (#67954) thanks … · openclaw/openclaw@f377db1 fix: report shared auth scopes in hello-ok (#67810) thanks @BunsDev · openclaw/openclaw@0b6c39b Auto-reply: avoid eager bundled route fallback · openclaw/openclaw@3ea1bf4 Tests: narrow session binding contract setup · openclaw/openclaw@54e4e16 fix(macOS): enable undo/redo in webchat composer text input (#34962) · openclaw/openclaw@00951dc Tests: speed up channel setup promotion · openclaw/openclaw@82b529a Docs: refresh agent instructions · openclaw/openclaw@5775fe2 fix(auth): serialize OAuth refresh across agents to fix #26322 (#67876) · openclaw/openclaw@8e79080 test: allow ollama public surface boundary test · openclaw/openclaw@7d4f1a6 Docs: add test performance guardrails · openclaw/openclaw@89706d3 Tests: restore context-engine usage proof · openclaw/openclaw@e4c4f95 Tests: slim context engine runtime coverage · openclaw/openclaw@74c198f ci: retry failed custom checkouts · openclaw/openclaw@0ee5baf test: trim duplicate provider auth onboarding cases · openclaw/openclaw@1ffc02e matrix: fix sessions_spawn --thread subagent session spawning (#67643) · openclaw/openclaw@1ce2596 test: reduce auth choice fixture churn · openclaw/openclaw@857b9cd test: mock health status config boundaries · openclaw/openclaw@9d5ab4a test: mock onboard config io boundary · openclaw/openclaw@299694d test: mock legacy state plugin boundaries · openclaw/openclaw@2713089 test: mock channel install boundaries · openclaw/openclaw@b945248 test: mock doctor preview channel boundaries · openclaw/openclaw@b1a3ad4
refactor: use source plan for models list · openclaw/open...
shakkernerd · 2026-04-27 · via Recent Commits to openclaw:main

@@ -1,6 +1,5 @@

11

import type { ModelRegistry } from "@mariozechner/pi-coding-agent";

22

import { parseModelRef } from "../../agents/model-selection.js";

3-

import type { NormalizedModelCatalogRow } from "../../model-catalog/index.js";

43

import type { RuntimeEnv } from "../../runtime.js";

54

import { normalizeLowercaseStringOrEmpty } from "../../shared/string-coerce.js";

65

import { resolveConfiguredEntries } from "./list.configured.js";

@@ -14,11 +13,11 @@ const DISPLAY_MODEL_PARSE_OPTIONS = { allowPluginNormalization: false } as const

14131514

type RegistryLoadModule = typeof import("./list.registry-load.js");

1615

type RowSourcesModule = typeof import("./list.row-sources.js");

17-

type ProviderCatalogModule = typeof import("./list.provider-catalog.js");

16+

type SourcePlanModule = typeof import("./list.source-plan.js");

18171918

let registryLoadModulePromise: Promise<RegistryLoadModule> | undefined;

2019

let rowSourcesModulePromise: Promise<RowSourcesModule> | undefined;

21-

let providerCatalogModulePromise: Promise<ProviderCatalogModule> | undefined;

20+

let sourcePlanModulePromise: Promise<SourcePlanModule> | undefined;

22212322

function loadRegistryLoadModule(): Promise<RegistryLoadModule> {

2423

registryLoadModulePromise ??= import("./list.registry-load.js");

@@ -30,25 +29,9 @@ function loadRowSourcesModule(): Promise<RowSourcesModule> {

3029

return rowSourcesModulePromise;

3130

}

323133-

function loadProviderCatalogModule(): Promise<ProviderCatalogModule> {

34-

providerCatalogModulePromise ??= import("./list.provider-catalog.js");

35-

return providerCatalogModulePromise;

36-

}

37-38-

function modelRowSourcesRequireRegistry(params: {

39-

all?: boolean;

40-

providerFilter?: string;

41-

useManifestCatalogFastPath: boolean;

42-

useProviderCatalogFastPath: boolean;

43-

useProviderIndexCatalogFastPath: boolean;

44-

}): boolean {

45-

if (!params.all) {

46-

return false;

47-

}

48-

if (params.providerFilter) {

49-

return false;

50-

}

51-

return true;

32+

function loadSourcePlanModule(): Promise<SourcePlanModule> {

33+

sourcePlanModulePromise ??= import("./list.source-plan.js");

34+

return sourcePlanModulePromise;

5235

}

53365437

export async function modelsListCommand(

@@ -98,38 +81,15 @@ export async function modelsListCommand(

9881

let availabilityErrorMessage: string | undefined;

9982

const { entries } = resolveConfiguredEntries(cfg);

10083

const configuredByKey = new Map(entries.map((entry) => [entry.key, entry]));

101-

let manifestCatalogRows: readonly NormalizedModelCatalogRow[] = [];

102-

let providerIndexCatalogRows: readonly NormalizedModelCatalogRow[] = [];

103-

if (opts.all && providerFilter) {

104-

const { loadStaticManifestCatalogRowsForList } = await import("./list.manifest-catalog.js");

105-

manifestCatalogRows = loadStaticManifestCatalogRowsForList({ cfg, providerFilter });

106-

}

107-

const useManifestCatalogFastPath = manifestCatalogRows.length > 0;

108-

if (!useManifestCatalogFastPath && opts.all && providerFilter) {

109-

const { loadProviderIndexCatalogRowsForList } =

110-

await import("./list.provider-index-catalog.js");

111-

providerIndexCatalogRows = loadProviderIndexCatalogRowsForList({ cfg, providerFilter });

112-

}

113-

const useProviderIndexCatalogFastPath = providerIndexCatalogRows.length > 0;

114-

const useProviderCatalogFastPath = await (async () => {

115-

if (

116-

useManifestCatalogFastPath ||

117-

useProviderIndexCatalogFastPath ||

118-

!opts.all ||

119-

!providerFilter

120-

) {

121-

return false;

122-

}

123-

const { hasProviderStaticCatalogForFilter } = await loadProviderCatalogModule();

124-

return hasProviderStaticCatalogForFilter({ cfg, providerFilter });

125-

})();

126-

const shouldLoadRegistry = modelRowSourcesRequireRegistry({

127-

all: opts.all,

128-

providerFilter,

129-

useManifestCatalogFastPath,

130-

useProviderCatalogFastPath,

131-

useProviderIndexCatalogFastPath,

132-

});

84+

const sourcePlanModule = opts.all ? await loadSourcePlanModule() : undefined;

85+

const sourcePlan = sourcePlanModule

86+

? await sourcePlanModule.planAllModelListSources({

87+

all: opts.all,

88+

providerFilter,

89+

cfg,

90+

})

91+

: undefined;

92+

const shouldLoadRegistry = sourcePlan?.requiresInitialRegistry ?? false;

13393

const loadRegistryState = async () => {

13494

const { loadListModelRegistry } = await loadRegistryLoadModule();

13595

const loaded = await loadListModelRegistry(cfg, { providerFilter });

@@ -170,18 +130,15 @@ export async function modelsListCommand(

170130171131

if (opts.all) {

172132

const { appendAllModelRowSources } = await loadRowSourcesModule();

173-

let rowContext = buildRowContext(

174-

useManifestCatalogFastPath || useProviderCatalogFastPath || useProviderIndexCatalogFastPath,

175-

);

133+

if (!sourcePlan || !sourcePlanModule) {

134+

throw new Error("models list source plan was not initialized");

135+

}

136+

let rowContext = buildRowContext(sourcePlan.skipRuntimeModelSuppression);

176137

const initialAppend = await appendAllModelRowSources({

177138

rows,

178139

context: rowContext,

179140

modelRegistry,

180-

manifestCatalogRows,

181-

providerIndexCatalogRows,

182-

useManifestCatalogFastPath,

183-

useProviderCatalogFastPath,

184-

useProviderIndexCatalogFastPath,

141+

sourcePlan,

185142

});

186143

if (initialAppend.requiresRegistryFallback) {

187144

try {

@@ -197,11 +154,7 @@ export async function modelsListCommand(

197154

rows,

198155

context: rowContext,

199156

modelRegistry,

200-

manifestCatalogRows: [],

201-

providerIndexCatalogRows: [],

202-

useManifestCatalogFastPath: false,

203-

useProviderCatalogFastPath: false,

204-

useProviderIndexCatalogFastPath: false,

157+

sourcePlan: sourcePlanModule.createRegistryModelListSourcePlan(),

205158

});

206159

}

207160

} else {