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

推荐订阅源

L
LangChain Blog
Recent Announcements
Recent Announcements
GbyAI
GbyAI
H
Hackread – Cybersecurity News, Data Breaches, AI and More
Microsoft Azure Blog
Microsoft Azure Blog
N
Netflix TechBlog - Medium
人人都是产品经理
人人都是产品经理
MongoDB | Blog
MongoDB | Blog
D
DataBreaches.Net
freeCodeCamp Programming Tutorials: Python, JavaScript, Git & More
WordPress大学
WordPress大学
U
Unit 42
腾讯CDC
D
Docker
The GitHub Blog
The GitHub Blog
阮一峰的网络日志
阮一峰的网络日志
Vercel News
Vercel News
I
InfoQ
Jina AI
Jina AI
爱范儿
爱范儿
宝玉的分享
宝玉的分享
博客园 - Franky
G
Google Developers Blog
P
Proofpoint News Feed

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: plan manifest catalog aliases and suppressions ...
shakkernerd · 2026-04-28 · via Recent Commits to openclaw:main

@@ -1,10 +1,17 @@

1+

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

12

import { normalizeModelCatalogProviderRows } from "./normalize.js";

2-

import { normalizeModelCatalogProviderId } from "./refs.js";

3-

import type { ModelCatalog, ModelCatalogDiscovery, NormalizedModelCatalogRow } from "./types.js";

3+

import { buildModelCatalogMergeKey, normalizeModelCatalogProviderId } from "./refs.js";

4+

import type {

5+

ModelCatalog,

6+

ModelCatalogAlias,

7+

ModelCatalogDiscovery,

8+

NormalizedModelCatalogRow,

9+

} from "./types.js";

410511

export type ManifestModelCatalogPlugin = {

612

id: string;

7-

modelCatalog?: Pick<ModelCatalog, "providers" | "discovery">;

13+

providers?: readonly string[];

14+

modelCatalog?: Pick<ModelCatalog, "providers" | "aliases" | "suppressions" | "discovery">;

815

};

9161017

export type ManifestModelCatalogRegistry = {

@@ -33,6 +40,18 @@ export type ManifestModelCatalogPlan = {

3340

conflicts: readonly ManifestModelCatalogConflict[];

3441

};

354243+

export type ManifestModelCatalogSuppressionEntry = {

44+

pluginId: string;

45+

provider: string;

46+

model: string;

47+

mergeKey: string;

48+

reason?: string;

49+

};

50+51+

export type ManifestModelCatalogSuppressionPlan = {

52+

suppressions: readonly ManifestModelCatalogSuppressionEntry[];

53+

};

54+3655

export function planManifestModelCatalogRows(params: {

3756

registry: ManifestModelCatalogRegistry;

3857

providerFilter?: string;

@@ -94,29 +113,147 @@ function planManifestModelCatalogPluginEntries(params: {

94113

return [];

95114

}

96115116+

const aliasesByTargetProvider = buildModelCatalogProviderAliasTargets(params.plugin);

117+97118

return Object.entries(providers).flatMap(([provider, providerCatalog]) => {

98119

const normalizedProvider = normalizeModelCatalogProviderId(provider);

99-

if (

100-

!normalizedProvider ||

101-

(params.providerFilter && normalizedProvider !== params.providerFilter)

102-

) {

120+

if (!normalizedProvider) {

103121

return [];

104122

}

105-

const rows = normalizeModelCatalogProviderRows({

106-

provider: normalizedProvider,

107-

providerCatalog,

108-

source: "manifest",

109-

});

110-

if (rows.length === 0) {

123+

const providerAliases = aliasesByTargetProvider.get(normalizedProvider) ?? [];

124+

const plannedProviders = params.providerFilter

125+

? providerAliases.includes(params.providerFilter) ||

126+

normalizedProvider === params.providerFilter

127+

? [params.providerFilter]

128+

: []

129+

: [normalizedProvider];

130+

if (plannedProviders.length === 0) {

111131

return [];

112132

}

113-

return [

114-

{

115-

pluginId: params.plugin.id,

116-

provider: normalizedProvider,

117-

discovery: params.plugin.modelCatalog?.discovery?.[normalizedProvider],

118-

rows,

119-

},

120-

];

133+

return plannedProviders.flatMap((plannedProvider) => {

134+

const rows = normalizeModelCatalogProviderRows({

135+

provider: plannedProvider,

136+

providerCatalog,

137+

source: "manifest",

138+

});

139+

if (rows.length === 0) {

140+

return [];

141+

}

142+

return [

143+

{

144+

pluginId: params.plugin.id,

145+

provider: plannedProvider,

146+

discovery: params.plugin.modelCatalog?.discovery?.[normalizedProvider],

147+

rows: applyModelCatalogAliasOverrides({

148+

rows,

149+

alias: params.plugin.modelCatalog?.aliases?.[plannedProvider],

150+

}),

151+

},

152+

];

153+

});

121154

});

122155

}

156+157+

function buildOwnedProviderSet(plugin: ManifestModelCatalogPlugin): ReadonlySet<string> {

158+

return new Set((plugin.providers ?? []).map(normalizeModelCatalogProviderId).filter(Boolean));

159+

}

160+161+

function buildModelCatalogProviderAliasTargets(

162+

plugin: ManifestModelCatalogPlugin,

163+

): ReadonlyMap<string, readonly string[]> {

164+

const ownedProviders = buildOwnedProviderSet(plugin);

165+

const aliasesByTargetProvider = new Map<string, string[]>();

166+

for (const [rawAlias, alias] of Object.entries(plugin.modelCatalog?.aliases ?? {})) {

167+

const aliasProvider = normalizeModelCatalogProviderId(rawAlias);

168+

const targetProvider = normalizeModelCatalogProviderId(alias.provider);

169+

if (!aliasProvider || !targetProvider || !ownedProviders.has(targetProvider)) {

170+

continue;

171+

}

172+

const aliases = aliasesByTargetProvider.get(targetProvider) ?? [];

173+

aliases.push(aliasProvider);

174+

aliasesByTargetProvider.set(targetProvider, aliases);

175+

}

176+

return aliasesByTargetProvider;

177+

}

178+179+

function applyModelCatalogAliasOverrides(params: {

180+

rows: readonly NormalizedModelCatalogRow[];

181+

alias?: ModelCatalogAlias;

182+

}): readonly NormalizedModelCatalogRow[] {

183+

if (!params.alias) {

184+

return params.rows;

185+

}

186+

return params.rows.map((row) => ({

187+

...row,

188+

...(params.alias.api ? { api: params.alias.api } : {}),

189+

...(params.alias.baseUrl ? { baseUrl: params.alias.baseUrl } : {}),

190+

}));

191+

}

192+193+

function pluginOwnsModelCatalogProviderRef(params: {

194+

plugin: ManifestModelCatalogPlugin;

195+

provider: string;

196+

}): boolean {

197+

const provider = normalizeModelCatalogProviderId(params.provider);

198+

if (!provider) {

199+

return false;

200+

}

201+

const ownedProviders = buildOwnedProviderSet(params.plugin);

202+

if (ownedProviders.has(provider)) {

203+

return true;

204+

}

205+

return Object.entries(params.plugin.modelCatalog?.aliases ?? {}).some(([rawAlias, alias]) => {

206+

const aliasProvider = normalizeModelCatalogProviderId(rawAlias);

207+

const targetProvider = normalizeModelCatalogProviderId(alias.provider);

208+

return (

209+

aliasProvider === provider && Boolean(targetProvider) && ownedProviders.has(targetProvider)

210+

);

211+

});

212+

}

213+214+

export function planManifestModelCatalogSuppressions(params: {

215+

registry: ManifestModelCatalogRegistry;

216+

providerFilter?: string;

217+

modelFilter?: string;

218+

}): ManifestModelCatalogSuppressionPlan {

219+

const providerFilter = params.providerFilter

220+

? normalizeModelCatalogProviderId(params.providerFilter)

221+

: undefined;

222+

const modelFilter = params.modelFilter

223+

? normalizeLowercaseStringOrEmpty(params.modelFilter)

224+

: undefined;

225+

const suppressions: ManifestModelCatalogSuppressionEntry[] = [];

226+

for (const plugin of params.registry.plugins) {

227+

for (const suppression of plugin.modelCatalog?.suppressions ?? []) {

228+

const provider = normalizeModelCatalogProviderId(suppression.provider);

229+

const model = normalizeLowercaseStringOrEmpty(suppression.model);

230+

if (!provider || !model) {

231+

continue;

232+

}

233+

if (providerFilter && provider !== providerFilter) {

234+

continue;

235+

}

236+

if (modelFilter && model !== modelFilter) {

237+

continue;

238+

}

239+

if (!pluginOwnsModelCatalogProviderRef({ plugin, provider })) {

240+

continue;

241+

}

242+

suppressions.push({

243+

pluginId: plugin.id,

244+

provider,

245+

model,

246+

mergeKey: buildModelCatalogMergeKey(provider, model),

247+

...(suppression.reason ? { reason: suppression.reason } : {}),

248+

});

249+

}

250+

}

251+

return {

252+

suppressions: suppressions.toSorted(

253+

(left, right) =>

254+

left.provider.localeCompare(right.provider) ||

255+

left.model.localeCompare(right.model) ||

256+

left.pluginId.localeCompare(right.pluginId),

257+

),

258+

};

259+

}