refactor: unify plugin metadata snapshot callers · opencl...

Recent Commits to openclaw:main

steipete · 2026-05-02 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,20 @@ const pluginRegistryMocks = vi.hoisted(() => {`
`6`	`6`	`loadPluginManifestRegistryForInstalledIndex: loadManifestRegistry,`
`7`	`7`	`loadPluginManifestRegistryForPluginRegistry: loadManifestRegistry,`
`8`	`8`	`loadPluginRegistrySnapshot: vi.fn(() => ({ plugins: [] })),`
	`9`	`+loadPluginMetadataSnapshot: vi.fn((params: unknown) => {`
	`10`	`+const registry = loadManifestRegistry(params) ?? { plugins: [], diagnostics: [] };`
	`11`	`+return {`
	`12`	`+index: {`
	`13`	`+plugins: registry.plugins.map((plugin: { id: string; origin?: string }) => ({`
	`14`	`+pluginId: plugin.id,`
	`15`	`+origin: plugin.origin ?? "global",`
	`16`	`+enabled: true,`
	`17`	`+enabledByDefault: true,`
	`18`	`+})),`
	`19`	`+},`
	`20`	`+plugins: registry.plugins,`
	`21`	`+};`
	`22`	`+}),`
`9`	`23`	`};`
`10`	`24`	`});`
`11`	`25`
`@@ -20,6 +34,10 @@ vi.mock("../plugins/plugin-registry.js", () => ({`
`20`	`34`	`loadPluginRegistrySnapshot: pluginRegistryMocks.loadPluginRegistrySnapshot,`
`21`	`35`	`}));`
`22`	`36`
	`37`	`+vi.mock("../plugins/plugin-metadata-snapshot.js", () => ({`
	`38`	`+loadPluginMetadataSnapshot: pluginRegistryMocks.loadPluginMetadataSnapshot,`
	`39`	`+}));`
	`40`	`+`
`23`	`41`	`import {`
`24`	`42`	`resetProviderAuthAliasMapCacheForTest,`
`25`	`43`	`resolveProviderIdForAuth,`
`@@ -32,6 +50,7 @@ describe("provider auth aliases", () => {`
`32`	`50`	`pluginRegistryMocks.loadPluginManifestRegistryForPluginRegistry.mockReset();`
`33`	`51`	`pluginRegistryMocks.loadPluginRegistrySnapshot.mockReset();`
`34`	`52`	`pluginRegistryMocks.loadPluginRegistrySnapshot.mockReturnValue({ plugins: [] });`
	`53`	`+pluginRegistryMocks.loadPluginMetadataSnapshot.mockClear();`
`35`	`54`	`});`
`36`	`55`
`37`	`56`	`it("treats deprecated auth choice ids as provider auth aliases", () => {`

Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,8 @@ import {`
`5`	`5`	`normalizePluginConfigId,`
`6`	`6`	`} from "../plugins/plugin-config-trust.js";`
`7`	`7`	`import { resolvePluginControlPlaneFingerprint } from "../plugins/plugin-control-plane-context.js";`
	`8`	`+import { loadPluginMetadataSnapshot } from "../plugins/plugin-metadata-snapshot.js";`
`8`	`9`	`import type { PluginOrigin } from "../plugins/plugin-origin.types.js";`
`9`		`-import { loadPluginManifestRegistryForPluginRegistry } from "../plugins/plugin-registry.js";`
`10`	`10`	`import { normalizeProviderId } from "./provider-id.js";`
`11`	`11`
`12`	`12`	`export type ProviderAuthAliasLookupParams = {`
`@@ -118,15 +118,14 @@ export function resolveProviderAuthAliasMap(`
`118`	`118`	`if (cached) {`
`119`	`119`	`return cached;`
`120`	`120`	`}`
`121`		`-const registry = loadPluginManifestRegistryForPluginRegistry({`
`122`		`-config: params?.config,`
	`121`	`+const snapshot = loadPluginMetadataSnapshot({`
	`122`	`+config: params?.config ?? {},`
`123`	`123`	`workspaceDir: params?.workspaceDir,`
`124`	`124`	`env,`
`125`		`-includeDisabled: true,`
`126`	`125`	`});`
`127`	`126`	`const preferredAliases = new Map<string, ProviderAuthAliasCandidate>();`
`128`	`127`	`const aliases: Record<string, string> = Object.create(null) as Record<string, string>;`
`129`		`-for (const plugin of registry.plugins) {`
	`128`	`+for (const plugin of snapshot.plugins) {`
`130`	`129`	`if (!shouldUsePluginAuthAliases(plugin, params)) {`
`131`	`130`	`continue;`
`132`	`131`	`}`

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,68 @@`
	`1`	`+import { beforeEach, describe, expect, it, vi } from "vitest";`
	`2`	`+`
	`3`	`+const loadPluginMetadataSnapshot = vi.hoisted(() => vi.fn());`
	`4`	`+`
	`5`	`+vi.mock("../../plugins/plugin-metadata-snapshot.js", () => ({`
	`6`	`+ loadPluginMetadataSnapshot,`
	`7`	`+}));`
	`8`	`+`
	`9`	`+import { resolveReadOnlyChannelCommandDefaults } from "./read-only-command-defaults.js";`
	`10`	`+`
	`11`	`+describe("resolveReadOnlyChannelCommandDefaults", () => {`
	`12`	`+beforeEach(() => {`
	`13`	`+loadPluginMetadataSnapshot.mockReset();`
	`14`	`+loadPluginMetadataSnapshot.mockReturnValue({`
	`15`	`+index: { plugins: [] },`
	`16`	`+plugins: [],`
	`17`	`+});`
	`18`	`+});`
	`19`	`+`
	`20`	`+it("resolves command defaults from the shared metadata snapshot", () => {`
	`21`	`+const env = { HOME: "/home/demo" } as NodeJS.ProcessEnv;`
	`22`	`+loadPluginMetadataSnapshot.mockReturnValue({`
	`23`	`+index: {`
	`24`	`+plugins: [`
	`25`	`+{`
	`26`	`+pluginId: "demo",`
	`27`	`+origin: "global",`
	`28`	`+enabled: true,`
	`29`	`+enabledByDefault: true,`
	`30`	`+},`
	`31`	`+],`
	`32`	`+},`
	`33`	`+plugins: [`
	`34`	`+{`
	`35`	`+id: "demo",`
	`36`	`+origin: "global",`
	`37`	`+channels: ["demo"],`
	`38`	`+channelConfigs: {`
	`39`	`+demo: {`
	`40`	`+commands: {`
	`41`	`+nativeCommandsAutoEnabled: true,`
	`42`	`+nativeSkillsAutoEnabled: false,`
	`43`	`+},`
	`44`	`+},`
	`45`	`+},`
	`46`	`+},`
	`47`	`+],`
	`48`	`+});`
	`49`	`+`
	`50`	`+expect(`
	`51`	`+resolveReadOnlyChannelCommandDefaults("demo", {`
	`52`	`+config: {},`
	`53`	`+ env,`
	`54`	`+stateDir: "/state",`
	`55`	`+workspaceDir: "/workspace",`
	`56`	`+}),`
	`57`	`+).toEqual({`
	`58`	`+nativeCommandsAutoEnabled: true,`
	`59`	`+nativeSkillsAutoEnabled: false,`
	`60`	`+});`
	`61`	`+expect(loadPluginMetadataSnapshot).toHaveBeenCalledWith({`
	`62`	`+config: {},`
	`63`	`+ env,`
	`64`	`+stateDir: "/state",`
	`65`	`+workspaceDir: "/workspace",`
	`66`	`+});`
	`67`	`+});`
	`68`	`+});`

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,8 @@`
`1`	`1`	`import type { OpenClawConfig } from "../../config/types.openclaw.js";`
`2`	`2`	`import { isBlockedObjectKey } from "../../infra/prototype-keys.js";`
`3`	`3`	`import { isInstalledPluginEnabled } from "../../plugins/installed-plugin-index.js";`
`4`		`-import { loadPluginManifestRegistryForInstalledIndex } from "../../plugins/manifest-registry-installed.js";`
`5`	`4`	`import type { PluginManifestRecord } from "../../plugins/manifest-registry.js";`
`6`		`-import { loadPluginRegistrySnapshot } from "../../plugins/plugin-registry.js";`
	`5`	`+import { loadPluginMetadataSnapshot } from "../../plugins/plugin-metadata-snapshot.js";`
`7`	`6`	`import { normalizeOptionalString } from "../../shared/string-coerce.js";`
`8`	`7`	`import type { ChannelPlugin } from "./types.plugin.js";`
`9`	`8`
`@@ -65,20 +64,13 @@ export function resolveReadOnlyChannelCommandDefaults(`
`65`	`64`	`if (!normalizedChannelId \|\| !isSafeManifestChannelId(normalizedChannelId)) {`
`66`	`65`	`return undefined;`
`67`	`66`	`}`
`68`		`-const index = loadPluginRegistrySnapshot({`
	`67`	`+const snapshot = loadPluginMetadataSnapshot({`
`69`	`68`	`config: options.config,`
`70`	`69`	`stateDir: options.stateDir,`
`71`	`70`	`workspaceDir: options.workspaceDir,`
`72`	`71`	`env: options.env ?? process.env,`
`73`	`72`	`});`
`74`		`-const registry = loadPluginManifestRegistryForInstalledIndex({`
`75`		`- index,`
`76`		`-config: options.config,`
`77`		`-workspaceDir: options.workspaceDir,`
`78`		`-env: options.env ?? process.env,`
`79`		`-includeDisabled: true,`
`80`		`-});`
`81`		`-for (const record of registry.plugins) {`
	`73`	`+for (const record of snapshot.plugins) {`
`82`	`74`	`if (!record.channels.includes(normalizedChannelId)) {`
`83`	`75`	`continue;`
`84`	`76`	`}`
`@@ -88,7 +80,7 @@ export function resolveReadOnlyChannelCommandDefaults(`
`88`	`80`	`) {`
`89`	`81`	`continue;`
`90`	`82`	`}`
`91`		`-if (!isInstalledPluginEnabled(index, record.id, options.config)) {`
	`83`	`+if (!isInstalledPluginEnabled(snapshot.index, record.id, options.config)) {`
`92`	`84`	`continue;`
`93`	`85`	`}`
`94`	`86`	`const channelConfigValue = record.channelConfigs`

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,68 @@`
	`1`	`+import { beforeEach, describe, expect, it, vi } from "vitest";`
	`2`	`+`
	`3`	`+const loadPluginMetadataSnapshot = vi.hoisted(() => vi.fn());`
	`4`	`+`
	`5`	`+vi.mock("./plugin-metadata-snapshot.js", () => ({`
	`6`	`+ loadPluginMetadataSnapshot,`
	`7`	`+}));`
	`8`	`+`
	`9`	`+import { resolveManifestContractRuntimePluginResolution } from "./manifest-contract-runtime.js";`
	`10`	`+`
	`11`	`+describe("resolveManifestContractRuntimePluginResolution", () => {`
	`12`	`+beforeEach(() => {`
	`13`	`+loadPluginMetadataSnapshot.mockReset();`
	`14`	`+loadPluginMetadataSnapshot.mockReturnValue({`
	`15`	`+index: { plugins: [] },`
	`16`	`+plugins: [],`
	`17`	`+});`
	`18`	`+});`
	`19`	`+`
	`20`	`+it("resolves contract plugins from the shared metadata snapshot", () => {`
	`21`	`+loadPluginMetadataSnapshot.mockReturnValue({`
	`22`	`+index: {`
	`23`	`+plugins: [`
	`24`	`+{`
	`25`	`+pluginId: "bundled-search",`
	`26`	`+origin: "bundled",`
	`27`	`+enabled: true,`
	`28`	`+enabledByDefault: true,`
	`29`	`+},`
	`30`	`+{`
	`31`	`+pluginId: "external-search",`
	`32`	`+origin: "global",`
	`33`	`+enabled: true,`
	`34`	`+enabledByDefault: true,`
	`35`	`+},`
	`36`	`+],`
	`37`	`+},`
	`38`	`+plugins: [`
	`39`	`+{`
	`40`	`+id: "bundled-search",`
	`41`	`+origin: "bundled",`
	`42`	`+contracts: { webSearchProviders: ["search"] },`
	`43`	`+},`
	`44`	`+{`
	`45`	`+id: "external-search",`
	`46`	`+origin: "global",`
	`47`	`+contracts: { webSearchProviders: ["search"] },`
	`48`	`+},`
	`49`	`+],`
	`50`	`+});`
	`51`	`+`
	`52`	`+expect(`
	`53`	`+resolveManifestContractRuntimePluginResolution({`
	`54`	`+cfg: {},`
	`55`	`+contract: "webSearchProviders",`
	`56`	`+value: "search",`
	`57`	`+}),`
	`58`	`+).toEqual({`
	`59`	`+pluginIds: ["bundled-search", "external-search"],`
	`60`	`+bundledCompatPluginIds: ["bundled-search"],`
	`61`	`+});`
	`62`	`+expect(loadPluginMetadataSnapshot).toHaveBeenCalledWith({`
	`63`	`+config: {},`
	`64`	`+env: process.env,`
	`65`	`+preferPersisted: false,`
	`66`	`+});`
	`67`	`+});`
	`68`	`+});`

Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,8 @@ import {`
`3`	`3`	`hasManifestContractValue,`
`4`	`4`	`listAvailableManifestContractPlugins,`
`5`	`5`	`} from "./manifest-contract-eligibility.js";`
`6`		`-import { loadPluginManifestRegistryForInstalledIndex } from "./manifest-registry-installed.js";`
`7`	`6`	`import type { PluginManifestContractListKey } from "./manifest-registry.js";`
`8`		`-import { loadPluginRegistrySnapshot } from "./plugin-registry.js";`
	`7`	`+import { loadPluginMetadataSnapshot } from "./plugin-metadata-snapshot.js";`
`9`	`8`
`10`	`9`	`export type ManifestContractRuntimePluginResolution = {`
`11`	`10`	`pluginIds: string[];`
`@@ -21,17 +20,12 @@ export function resolveManifestContractRuntimePluginResolution(params: {`
`21`	`20`	`contract: PluginManifestContractListKey;`
`22`	`21`	`value?: string;`
`23`	`22`	`}): ManifestContractRuntimePluginResolution {`
`24`		`-const index = loadPluginRegistrySnapshot({`
`25`		`-config: params.cfg,`
	`23`	`+const snapshot = loadPluginMetadataSnapshot({`
	`24`	`+config: params.cfg ?? {},`
`26`	`25`	`env: process.env,`
`27`	`26`	`...DEMAND_ONLY_CONTRACT_LOOKUP_OPTIONS,`
`28`	`27`	`});`
`29`		`-const allContractPlugins = loadPluginManifestRegistryForInstalledIndex({`
`30`		`- index,`
`31`		`-config: params.cfg,`
`32`		`-env: process.env,`
`33`		`-includeDisabled: true,`
`34`		`-}).plugins.filter((plugin) =>`
	`28`	`+const allContractPlugins = snapshot.plugins.filter((plugin) =>`
`35`	`29`	`hasManifestContractValue({`
`36`	`30`	`plugin,`
`37`	`31`	`contract: params.contract,`
`@@ -42,7 +36,7 @@ export function resolveManifestContractRuntimePluginResolution(params: {`
`42`	`36`	`.filter((plugin) => plugin.origin === "bundled")`
`43`	`37`	`.map((plugin) => plugin.id);`
`44`	`38`	`const pluginIds = listAvailableManifestContractPlugins({`
`45`		`-snapshot: { index, plugins: allContractPlugins },`
	`39`	`+snapshot: { index: snapshot.index, plugins: allContractPlugins },`
`46`	`40`	`contract: params.contract,`
`47`	`41`	`value: params.value,`
`48`	`42`	`config: params.cfg,`

Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,9 @@ function loadPluginMetadataSnapshotImpl(`
`180`	`180`	`const registryResult = loadPluginRegistrySnapshotWithMetadata({`
`181`	`181`	`config: params.config,`
`182`	`182`	`workspaceDir: params.workspaceDir,`
	`183`	`+ ...(params.stateDir ? { stateDir: params.stateDir } : {}),`
`183`	`184`	`env: params.env,`
	`185`	`+ ...(params.preferPersisted !== undefined ? { preferPersisted: params.preferPersisted } : {}),`
`184`	`186`	`...(params.index ? { index: params.index } : {}),`
`185`	`187`	`});`
`186`	`188`	`const registrySnapshotMs = performance.now() - registryStartedAt;`

Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,8 @@ export type PluginMetadataManifestView = Pick<PluginMetadataSnapshot, "index" \|`
`55`	`55`	`export type LoadPluginMetadataSnapshotParams = {`
`56`	`56`	`config: OpenClawConfig;`
`57`	`57`	`workspaceDir?: string;`
	`58`	`+stateDir?: string;`
`58`	`59`	`env: NodeJS.ProcessEnv;`
`59`	`60`	`index?: InstalledPluginIndex;`
	`61`	`+preferPersisted?: boolean;`
`60`	`62`	`};`

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

推荐订阅源

Recent Commits to openclaw:main