fix: guard metadata reuse on load paths · openclaw/opencl...

Recent Commits to openclaw:main

shakkernerd · 2026-05-07 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,10 @@ function sanitizeProjectSettings(settings: PiSettingsSnapshot): PiSettingsSnapsh`
`41`	`41`	`return sanitizePiSettingsSnapshot(settings);`
`42`	`42`	`}`
`43`	`43`
	`44`	`+function canReuseUnscopedCurrentPluginMetadataSnapshot(config: OpenClawConfig): boolean {`
	`45`	`+return normalizePluginsConfigWithResolver(config.plugins).loadPaths.length === 0;`
	`46`	`+}`
	`47`	`+`
`44`	`48`	`function loadBundleSettingsFile(params: {`
`45`	`49`	`rootDir: string;`
`46`	`50`	`relativePath: string;`
`@@ -90,11 +94,13 @@ export function loadEnabledBundlePiSettingsSnapshot(params: {`
`90`	`94`	`env,`
`91`	`95`	`workspaceDir,`
`92`	`96`	`}) ??`
`93`		`-getCurrentPluginMetadataSnapshot({`
`94`		`- env,`
`95`		`- workspaceDir,`
`96`		`-allowWorkspaceScopedSnapshot: true,`
`97`		`-}) ??`
	`97`	`+(canReuseUnscopedCurrentPluginMetadataSnapshot(config)`
	`98`	`+ ? getCurrentPluginMetadataSnapshot({`
	`99`	`+ env,`
	`100`	`+ workspaceDir,`
	`101`	`+allowWorkspaceScopedSnapshot: true,`
	`102`	`+})`
	`103`	`+ : undefined) ??`
`98`	`104`	`loadPluginMetadataSnapshot({`
`99`	`105`	`workspaceDir,`
`100`	`106`	`config,`

Original file line number	Diff line number	Diff line change
`@@ -325,6 +325,45 @@ describe("loadEnabledBundlePiSettingsSnapshot", () => {`
`325`	`325`	`expect(pluginMetadataSnapshotMocks.loadPluginMetadataSnapshot).not.toHaveBeenCalled();`
`326`	`326`	`});`
`327`	`327`
	`328`	`+it("does not reuse an unscoped current snapshot when plugin load paths change", async () => {`
	`329`	`+const workspaceDir = await tempDirs.make("openclaw-workspace-");`
	`330`	`+const pluginRoot = await createWorkspaceBundle({ workspaceDir });`
	`331`	`+const resolvedPluginRoot = await fs.realpath(pluginRoot);`
	`332`	`+await fs.writeFile(`
	`333`	`+path.join(pluginRoot, "settings.json"),`
	`334`	`+JSON.stringify({ hideThinkingBlock: true }),`
	`335`	`+"utf-8",`
	`336`	`+);`
	`337`	`+`
	`338`	`+pluginMetadataSnapshotMocks.getCurrentPluginMetadataSnapshot.mockReturnValueOnce(undefined);`
	`339`	`+pluginMetadataSnapshotMocks.loadPluginMetadataSnapshot.mockClear();`
	`340`	`+`
	`341`	`+const snapshot = loadEnabledBundlePiSettingsSnapshot({`
	`342`	`+cwd: workspaceDir,`
	`343`	`+cfg: {`
	`344`	`+plugins: {`
	`345`	`+load: { paths: ["/tmp/changed-plugin-root"] },`
	`346`	`+entries: {`
	`347`	`+"claude-bundle": { enabled: true },`
	`348`	`+},`
	`349`	`+},`
	`350`	`+},`
	`351`	`+});`
	`352`	`+`
	`353`	`+expect(snapshot.hideThinkingBlock).toBe(true);`
	`354`	`+expect(pluginMetadataSnapshotMocks.getCurrentPluginMetadataSnapshot).toHaveBeenCalledOnce();`
	`355`	`+expect(pluginMetadataSnapshotMocks.getCurrentPluginMetadataSnapshot).toHaveBeenCalledWith({`
	`356`	`+config: expect.objectContaining({`
	`357`	`+plugins: expect.objectContaining({`
	`358`	`+load: { paths: ["/tmp/changed-plugin-root"] },`
	`359`	`+}),`
	`360`	`+}),`
	`361`	`+env: process.env,`
	`362`	`+ workspaceDir,`
	`363`	`+});`
	`364`	`+expect(pluginMetadataSnapshotMocks.loadPluginMetadataSnapshot).toHaveBeenCalledOnce();`
	`365`	`+});`
	`366`	`+`
`328`	`367`	`it("loads sanitized settings and MCP defaults from enabled bundle plugins", async () => {`
`329`	`368`	`const workspaceDir = await tempDirs.make("openclaw-workspace-");`
`330`	`369`	`const pluginRoot = await createWorkspaceBundle({ workspaceDir });`

Original file line number	Diff line number	Diff line change
`@@ -168,6 +168,40 @@ describe("applyPluginAutoEnable core", () => {`
`168`	`168`	`);`
`169`	`169`	`});`
`170`	`170`
	`171`	`+it("does not reuse an unscoped current manifest registry when plugin load paths change", () => {`
	`172`	`+const manifestRegistry = makeRegistry([{ id: "load-path-chat", channels: ["load-path-chat"] }]);`
	`173`	`+const snapshotConfig: OpenClawConfig = { plugins: { allow: ["existing"] } };`
	`174`	`+setCurrentPluginMetadataSnapshot(`
	`175`	`+createPluginMetadataSnapshot({`
	`176`	`+config: snapshotConfig,`
	`177`	`+ manifestRegistry,`
	`178`	`+workspaceDir: "/tmp/workspace",`
	`179`	`+}),`
	`180`	`+{`
	`181`	`+config: snapshotConfig,`
	`182`	`+workspaceDir: "/tmp/workspace",`
	`183`	`+},`
	`184`	`+);`
	`185`	`+`
	`186`	`+const result = applyPluginAutoEnable({`
	`187`	`+config: {`
	`188`	`+plugins: {`
	`189`	`+allow: ["existing"],`
	`190`	`+load: { paths: ["/tmp/changed-plugin-root"] },`
	`191`	`+entries: {`
	`192`	`+"load-path-chat": { config: { token: "x" } },`
	`193`	`+},`
	`194`	`+},`
	`195`	`+},`
	`196`	`+ env,`
	`197`	`+});`
	`198`	`+`
	`199`	`+expect(result.config.plugins?.allow).toEqual(["existing"]);`
	`200`	`+expect(result.changes).not.toContain(`
	`201`	`+"load-path-chat plugin config present, added to plugin allowlist.",`
	`202`	`+);`
	`203`	`+});`
	`204`	`+`
`171`	`205`	`it("formats typed provider-auth candidates into stable reasons", () => {`
`172`	`206`	`expect(`
`173`	`207`	`resolvePluginAutoEnableCandidateReason({`

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ import {`
`9`	`9`	`listBundledChannelIdsWithConfiguredState,`
`10`	`10`	`} from "../channels/plugins/configured-state.js";`
`11`	`11`	`import { getChatChannelMeta, normalizeChatChannelId } from "../channels/registry.js";`
	`12`	`+import { normalizePluginsConfig } from "../plugins/config-state.js";`
`12`	`13`	`import { getCurrentPluginMetadataSnapshot } from "../plugins/current-plugin-metadata-snapshot.js";`
`13`	`14`	`import { resolveInstalledPluginIndexPolicyHash } from "../plugins/installed-plugin-index-policy.js";`
`14`	`15`	`import {`
`@@ -54,6 +55,10 @@ function resolveAutoEnableProviderPluginIds(`
`54`	`55`	`return Object.fromEntries(entries);`
`55`	`56`	`}`
`56`	`57`
	`58`	`+function canReuseUnscopedCurrentPluginMetadataSnapshot(config: OpenClawConfig): boolean {`
	`59`	`+return normalizePluginsConfig(config.plugins).loadPaths.length === 0;`
	`60`	`+}`
	`61`	`+`
`57`	`62`	`function extractProviderFromModelRef(value: string): string \| null {`
`58`	`63`	`const trimmed = value.trim();`
`59`	`64`	`const slash = trimmed.indexOf("/");`
`@@ -955,6 +960,9 @@ export function resolvePluginAutoEnableManifestRegistry(params: {`
`955`	`960`	`const policyCompatibleCurrentSnapshot =`
`956`	`961`	`currentSnapshot ??`
`957`	`962`	`(() => {`
	`963`	`+if (!canReuseUnscopedCurrentPluginMetadataSnapshot(params.config)) {`
	`964`	`+return undefined;`
	`965`	`+}`
`958`	`966`	`const snapshot = getCurrentPluginMetadataSnapshot({`
`959`	`967`	`env: params.env,`
`960`	`968`	`allowWorkspaceScopedSnapshot: true,`

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

推荐订阅源

Recent Commits to openclaw:main