perf(agents): avoid full setup registry for runtime alias...

Recent Commits to openclaw:main

vincentkoc · 2026-05-31 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -232,6 +232,33 @@ export function listCliRuntimeProviderIds(`
`232`	`232`	`].toSorted();`
`233`	`233`	`}`
`234`	`234`
	`235`	`+export function resolveCliRuntimeCanonicalProvider(params: {`
	`236`	`+runtime: string \| undefined;`
	`237`	`+config?: OpenClawConfig;`
	`238`	`+env?: NodeJS.ProcessEnv;`
	`239`	`+includeSetupRegistry?: boolean;`
	`240`	`+}): string \| undefined {`
	`241`	`+const runtime = normalizeBackendKey(params.runtime ?? "");`
	`242`	`+if (!runtime) {`
	`243`	`+return undefined;`
	`244`	`+}`
	`245`	`+const runtimeBinding = listCliRuntimeModelBackendBindings().find(`
	`246`	`+(binding) => binding.runtime === runtime,`
	`247`	`+);`
	`248`	`+if (runtimeBinding) {`
	`249`	`+return runtimeBinding.provider;`
	`250`	`+}`
	`251`	`+if (params.includeSetupRegistry !== true) {`
	`252`	`+return undefined;`
	`253`	`+}`
	`254`	`+const setupBackend = cliBackendsDeps.resolvePluginSetupCliBackend({`
	`255`	`+backend: runtime,`
	`256`	`+config: params.config,`
	`257`	`+env: params.env,`
	`258`	`+});`
	`259`	`+return setupBackend ? resolveCliBackendModelProvider(setupBackend.backend) : undefined;`
	`260`	`+}`
	`261`	`+`
`235`	`262`	`export function resolveCliRuntimeModelBackendBinding(params: {`
`236`	`263`	`provider: string \| undefined;`
`237`	`264`	`runtime: string \| undefined;`
`@@ -253,11 +280,22 @@ export function resolveCliRuntimeModelBackendBinding(params: {`
`253`	`280`	`if (!includeSetupRegistry) {`
`254`	`281`	`return undefined;`
`255`	`282`	`}`
`256`		`-return listCliRuntimeModelBackendBindings({`
	`283`	`+const setupBackend = cliBackendsDeps.resolvePluginSetupCliBackend({`
	`284`	`+backend: runtime,`
`257`	`285`	`config: params.config,`
`258`	`286`	`env: params.env,`
`259`		`-includeSetupRegistry: true,`
`260`		`-}).find((binding) => binding.provider === provider && binding.runtime === runtime);`
	`287`	`+});`
	`288`	`+if (!setupBackend) {`
	`289`	`+return undefined;`
	`290`	`+}`
	`291`	`+const setupProvider = resolveCliBackendModelProvider(setupBackend.backend);`
	`292`	`+return setupProvider === provider`
	`293`	`+ ? {`
	`294`	`+ provider,`
	`295`	`+ runtime,`
	`296`	`+ ...(setupBackend.pluginId ? { pluginId: setupBackend.pluginId } : {}),`
	`297`	`+}`
	`298`	`+ : undefined;`
`261`	`299`	`}`
`262`	`300`
`263`	`301`	`export function isCliRuntimeModelBackendForProvider(params: {`

Original file line number	Diff line number	Diff line change
`@@ -185,4 +185,39 @@ describe("areRuntimeModelRefsEquivalent", () => {`
`185`	`185`	`}),`
`186`	`186`	`).toBe(true);`
`187`	`187`	`});`
	`188`	`+`
	`189`	`+it("resolves one setup runtime alias without loading the full setup registry", () => {`
	`190`	`+cliBackendsTesting.setDepsForTest({`
	`191`	`+resolvePluginSetupCliBackend: ({ backend }) =>`
	`192`	`+backend === "claude-cli"`
	`193`	`+ ? {`
	`194`	`+pluginId: "anthropic",`
	`195`	`+backend: {`
	`196`	`+id: "claude-cli",`
	`197`	`+modelProvider: "anthropic",`
	`198`	`+config: { command: "claude" },`
	`199`	`+bundleMcp: false,`
	`200`	`+},`
	`201`	`+}`
	`202`	`+ : undefined,`
	`203`	`+resolvePluginSetupRegistry: () => {`
	`204`	`+throw new Error("setup registry should not load for a single runtime alias");`
	`205`	`+},`
	`206`	`+resolveRuntimeCliBackends: () => [],`
	`207`	`+});`
	`208`	`+`
	`209`	`+expect(`
	`210`	`+areRuntimeModelRefsEquivalent("anthropic/claude-opus-4-7", "claude-cli/claude-opus-4-7", {`
	`211`	`+config: {`
	`212`	`+agents: {`
	`213`	`+defaults: {`
	`214`	`+cliBackends: {`
	`215`	`+"claude-cli": { command: "claude" },`
	`216`	`+},`
	`217`	`+},`
	`218`	`+},`
	`219`	`+},`
	`220`	`+}),`
	`221`	`+).toBe(true);`
	`222`	`+});`
`188`	`223`	`});`

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ import {`
`5`	`5`	`isCliRuntimeModelBackendForProvider,`
`6`	`6`	`listCliRuntimeModelBackendBindings,`
`7`	`7`	`listCliRuntimeProviderIds,`
	`8`	`+resolveCliRuntimeCanonicalProvider,`
`8`	`9`	`resolveCliRuntimeModelBackendBinding,`
`9`	`10`	`} from "./cli-backends.js";`
`10`	`11`	`import { resolveModelRuntimePolicy } from "./model-runtime-policy.js";`
`@@ -53,14 +54,14 @@ function canonicalizeRuntimeAliasProvider(`
`53`	`54`	`provider: string,`
`54`	`55`	`options: RuntimeAliasComparisonOptions = {},`
`55`	`56`	`): string {`
`56`		`-const normalized = normalizeProviderId(provider);`
`57`	`57`	`return (`
`58`		`-listCliRuntimeModelBackendBindings({`
	`58`	`+resolveCliRuntimeCanonicalProvider({`
	`59`	`+runtime: provider,`
`59`	`60`	`config: options.config,`
`60`	`61`	`env: options.env,`
`61`	`62`	`includeSetupRegistry:`
`62`	`63`	`options.includeSetupRegistry ?? (options.config !== undefined \|\| options.env !== undefined),`
`63`		`-}).find((binding) => binding.runtime === normalized)?.provider ?? provider`
	`64`	`+}) ?? provider`
`64`	`65`	`);`
`65`	`66`	`}`
`66`	`67`

Original file line number	Diff line number	Diff line change
`@@ -155,6 +155,7 @@ describe("fallback-state", () => {`
`155`	`155`	`fallbackNoticeActiveModel: "claude-cli/claude-opus-4-7",`
`156`	`156`	`fallbackNoticeReason: "selected model unavailable",`
`157`	`157`	`},`
	`158`	`+cfg: {},`
`158`	`159`	`});`
`159`	`160`
`160`	`161`	`expect(resolved.fallbackActive).toBe(false);`
`@@ -164,6 +165,47 @@ describe("fallback-state", () => {`
`164`	`165`	`expect(resolved.nextState.activeModel).toBeUndefined();`
`165`	`166`	`});`
`166`	`167`
	`168`	`+it("does not repeat runtime alias comparison when persisted fallback refs match", () => {`
	`169`	`+let setupBackendLookups = 0;`
	`170`	`+cliBackendsTesting.setDepsForTest({`
	`171`	`+resolvePluginSetupCliBackend: ({ backend }) => {`
	`172`	`+setupBackendLookups += 1;`
	`173`	`+return backend === "claude-cli"`
	`174`	`+ ? {`
	`175`	`+pluginId: "anthropic",`
	`176`	`+backend: {`
	`177`	`+id: "claude-cli",`
	`178`	`+modelProvider: "anthropic",`
	`179`	`+config: { command: "claude" },`
	`180`	`+bundleMcp: false,`
	`181`	`+},`
	`182`	`+}`
	`183`	`+ : undefined;`
	`184`	`+},`
	`185`	`+resolvePluginSetupRegistry: () => {`
	`186`	`+throw new Error("full setup registry should not load for a single runtime alias");`
	`187`	`+},`
	`188`	`+resolveRuntimeCliBackends: () => [],`
	`189`	`+});`
	`190`	`+`
	`191`	`+const resolved = resolveFallbackTransition({`
	`192`	`+selectedProvider: "anthropic",`
	`193`	`+selectedModel: "claude-opus-4-7",`
	`194`	`+activeProvider: "claude-cli",`
	`195`	`+activeModel: "claude-opus-4-7",`
	`196`	`+attempts: [],`
	`197`	`+state: {`
	`198`	`+fallbackNoticeSelectedModel: "anthropic/claude-opus-4-7",`
	`199`	`+fallbackNoticeActiveModel: "claude-cli/claude-opus-4-7",`
	`200`	`+fallbackNoticeReason: "selected model unavailable",`
	`201`	`+},`
	`202`	`+cfg: {},`
	`203`	`+});`
	`204`	`+`
	`205`	`+expect(resolved.fallbackActive).toBe(false);`
	`206`	`+expect(setupBackendLookups).toBe(2);`
	`207`	`+});`
	`208`	`+`
`167`	`209`	`it("does not build a fallback notice for equivalent CLI runtime aliases", () => {`
`168`	`210`	`registerAnthropicCliBackendForTest();`
`169`	`211`

Original file line number	Diff line number	Diff line change
`@@ -166,15 +166,20 @@ export function resolveFallbackTransition(params: {`
`166`	`166`	`fallbackActive &&`
`167`	`167`	`(previousState.selectedModel !== selectedModelRef \|\|`
`168`	`168`	`previousState.activeModel !== activeModelRef);`
`169`		`-const previousStateWasRealFallback = Boolean(`
`170`		`-previousState.selectedModel &&`
`171`		`-previousState.activeModel &&`
`172`		`-!areRuntimeModelRefsEquivalent(`
`173`		`-previousState.selectedModel,`
`174`		`-previousState.activeModel,`
`175`		`-comparisonOptions,`
`176`		`-),`
`177`		`-);`
	`169`	`+const previousStateMatchesCurrent =`
	`170`	`+previousState.selectedModel === selectedModelRef &&`
	`171`	`+previousState.activeModel === activeModelRef;`
	`172`	`+const previousStateWasRealFallback = previousStateMatchesCurrent`
	`173`	`+ ? fallbackActive`
	`174`	`+ : Boolean(`
	`175`	`+previousState.selectedModel &&`
	`176`	`+previousState.activeModel &&`
	`177`	`+!areRuntimeModelRefsEquivalent(`
	`178`	`+previousState.selectedModel,`
	`179`	`+previousState.activeModel,`
	`180`	`+comparisonOptions,`
	`181`	`+),`
	`182`	`+);`
`178`	`183`	`const fallbackCleared = !fallbackActive && previousStateWasRealFallback;`
`179`	`184`	`const reasonSummary = buildFallbackReasonSummary(params.attempts);`
`180`	`185`	`const attemptSummaries = buildFallbackAttemptSummaries(params.attempts);`

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

推荐订阅源

Recent Commits to openclaw:main