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

推荐订阅源

B
Blog
D
Docker
J
Java Code Geeks
腾讯CDC
Blog — PlanetScale
Blog — PlanetScale
G
Google Developers Blog
M
MIT News - Artificial intelligence
L
LangChain Blog
T
The Blog of Author Tim Ferriss
P
Proofpoint News Feed
MyScale Blog
MyScale Blog
博客园 - Franky
GbyAI
GbyAI
Hugging Face - Blog
Hugging Face - Blog
aimingoo的专栏
aimingoo的专栏
Last Week in AI
Last Week in AI
OSCHINA 社区最新新闻
OSCHINA 社区最新新闻
博客园 - 聂微东
N
Netflix TechBlog - Medium
B
Blog RSS Feed
Y
Y Combinator Blog
阮一峰的网络日志
阮一峰的网络日志
奇客Solidot–传递最新科技情报
奇客Solidot–传递最新科技情报
Google DeepMind News
Google DeepMind News

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
fix(models): avoid registry for configured list · opencla...
vincentkoc · 2026-04-26 · via Recent Commits to openclaw:main

@@ -5,20 +5,52 @@ import type { RuntimeEnv } from "../../runtime.js";

55

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

66

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

77

import { formatErrorWithStack } from "./list.errors.js";

8-

import { hasProviderStaticCatalogForFilter } from "./list.provider-catalog.js";

9-

import { loadConfiguredListModelRegistry, loadListModelRegistry } from "./list.registry-load.js";

10-

import {

11-

appendAllModelRowSources,

12-

appendConfiguredModelRowSources,

13-

modelRowSourcesRequireRegistry,

14-

} from "./list.row-sources.js";

158

import { printModelTable } from "./list.table.js";

169

import type { ModelRow } from "./list.types.js";

1710

import { loadModelsConfigWithSource } from "./load-config.js";

1811

import { DEFAULT_PROVIDER, ensureFlagCompatibility } from "./shared.js";

19122013

const DISPLAY_MODEL_PARSE_OPTIONS = { allowPluginNormalization: false } as const;

211415+

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

16+

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

17+

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

18+19+

let registryLoadModulePromise: Promise<RegistryLoadModule> | undefined;

20+

let rowSourcesModulePromise: Promise<RowSourcesModule> | undefined;

21+

let providerCatalogModulePromise: Promise<ProviderCatalogModule> | undefined;

22+23+

function loadRegistryLoadModule(): Promise<RegistryLoadModule> {

24+

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

25+

return registryLoadModulePromise;

26+

}

27+28+

function loadRowSourcesModule(): Promise<RowSourcesModule> {

29+

rowSourcesModulePromise ??= import("./list.row-sources.js");

30+

return rowSourcesModulePromise;

31+

}

32+33+

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;

52+

}

53+2254

export async function modelsListCommand(

2355

opts: {

2456

all?: boolean;

@@ -48,12 +80,16 @@ export async function modelsListCommand(

4880

if (providerFilter === null) {

4981

return;

5082

}

51-

const { ensureAuthProfileStore, resolveOpenClawAgentDir } = await import("./list.runtime.js");

83+

const [{ loadAuthProfileStoreWithoutExternalProfiles }, { resolveOpenClawAgentDir }] =

84+

await Promise.all([

85+

import("../../agents/auth-profiles/store.js"),

86+

import("../../agents/agent-paths.js"),

87+

]);

5288

const { resolvedConfig: cfg } = await loadModelsConfigWithSource({

5389

commandName: "models list",

5490

runtime,

5591

});

56-

const authStore = ensureAuthProfileStore();

92+

const authStore = loadAuthProfileStoreWithoutExternalProfiles();

5793

const agentDir = resolveOpenClawAgentDir();

58945995

let modelRegistry: ModelRegistry | undefined;

@@ -69,16 +105,24 @@ export async function modelsListCommand(

69105

manifestCatalogRows = loadStaticManifestCatalogRowsForList({ cfg, providerFilter });

70106

}

71107

const useManifestCatalogFastPath = manifestCatalogRows.length > 0;

72-

const useProviderCatalogFastPath =

73-

!useManifestCatalogFastPath && opts.all && providerFilter

74-

? await hasProviderStaticCatalogForFilter({ cfg, providerFilter })

75-

: false;

76-

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

108+

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

77109

const { loadProviderIndexCatalogRowsForList } =

78110

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

79111

providerIndexCatalogRows = loadProviderIndexCatalogRowsForList({ cfg, providerFilter });

80112

}

81113

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+

})();

82126

const shouldLoadRegistry = modelRowSourcesRequireRegistry({

83127

all: opts.all,

84128

providerFilter,

@@ -87,6 +131,7 @@ export async function modelsListCommand(

87131

useProviderIndexCatalogFastPath,

88132

});

89133

const loadRegistryState = async () => {

134+

const { loadListModelRegistry } = await loadRegistryLoadModule();

90135

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

91136

modelRegistry = loaded.registry;

92137

discoveredKeys = loaded.discoveredKeys;

@@ -96,7 +141,8 @@ export async function modelsListCommand(

96141

try {

97142

if (shouldLoadRegistry) {

98143

await loadRegistryState();

99-

} else if (!opts.all) {

144+

} else if (!opts.all && opts.local) {

145+

const { loadConfiguredListModelRegistry } = await loadRegistryLoadModule();

100146

const loaded = loadConfiguredListModelRegistry(cfg, entries, { providerFilter });

101147

modelRegistry = loaded.registry;

102148

discoveredKeys = loaded.discoveredKeys;

@@ -123,6 +169,7 @@ export async function modelsListCommand(

123169

const rows: ModelRow[] = [];

124170125171

if (opts.all) {

172+

const { appendAllModelRowSources } = await loadRowSourcesModule();

126173

let rowContext = buildRowContext(

127174

useManifestCatalogFastPath || useProviderCatalogFastPath || useProviderIndexCatalogFastPath,

128175

);

@@ -158,17 +205,12 @@ export async function modelsListCommand(

158205

});

159206

}

160207

} else {

161-

const registry = modelRegistry;

162-

if (!registry) {

163-

runtime.error("Model registry unavailable.");

164-

process.exitCode = 1;

165-

return;

166-

}

167-

appendConfiguredModelRowSources({

208+

const { appendConfiguredModelRowSources } = await loadRowSourcesModule();

209+

await appendConfiguredModelRowSources({

168210

rows,

169211

entries,

170-

modelRegistry: registry,

171-

context: buildRowContext(false),

212+

modelRegistry,

213+

context: buildRowContext(!modelRegistry),

172214

});

173215

}

174216