fix(agents): canonicalize harness plugin routing · openclaw/openclaw@2fbce1c

Recent Commits to openclaw:main

vincentkoc · 2026-06-22 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -183,6 +183,7 @@ describe("ensureSelectedAgentHarnessPlugin", () => {`
`183`	`183`	`trigger: { kind: "agentHarness", runtime: "custom-harness" },`
`184`	`184`	`config: expect.any(Object),`
`185`	`185`	`workspaceDir: "/tmp/workspace",`
	`186`	`+requireExplicitManifestOwnerTrust: true,`
`186`	`187`	`});`
`187`	`188`	`expect(mocks.ensurePluginRegistryLoaded).toHaveBeenCalledWith(`
`188`	`189`	`expect.objectContaining({`
`@@ -195,7 +196,7 @@ describe("ensureSelectedAgentHarnessPlugin", () => {`
`195`	`196`
`196`	`197`	`it("does not activate an untrusted workspace harness from manifest metadata alone", async () => {`
`197`	`198`	`mocks.resolveManifestActivationPlan.mockReturnValueOnce({`
`198`		`-entries: [{ pluginId: "custom-harness-plugin", origin: "workspace" }],`
	`199`	`+entries: [],`
`199`	`200`	`});`
`200`	`201`
`201`	`202`	`await ensureSelectedAgentHarnessPlugin({`
`@@ -205,6 +206,12 @@ describe("ensureSelectedAgentHarnessPlugin", () => {`
`205`	`206`	`workspaceDir: "/tmp/workspace",`
`206`	`207`	`});`
`207`	`208`
	`209`	`+expect(mocks.resolveManifestActivationPlan).toHaveBeenCalledWith({`
	`210`	`+trigger: { kind: "agentHarness", runtime: "custom-harness" },`
	`211`	`+config: undefined,`
	`212`	`+workspaceDir: "/tmp/workspace",`
	`213`	`+requireExplicitManifestOwnerTrust: true,`
	`214`	`+});`
`208`	`215`	`expect(mocks.ensurePluginRegistryLoaded).not.toHaveBeenCalled();`
`209`	`216`	`});`
`210`	`217`

Original file line number	Diff line number	Diff line change
`@@ -4,12 +4,8 @@`
`4`	`4`	`import type { OpenClawConfig } from "../../config/types.openclaw.js";`
`5`	`5`	`import { withActivatedPluginIds } from "../../plugins/activation-context.js";`
`6`	`6`	`import { resolveManifestActivationPlan } from "../../plugins/activation-planner.js";`
`7`		`-import {`
`8`		`-normalizePluginsConfig,`
`9`		`-resolveEffectivePluginActivationState,`
`10`		`-} from "../../plugins/config-state.js";`
	`7`	`+import { resolveEffectivePluginActivationState } from "../../plugins/config-state.js";`
`11`	`8`	`import { isPluginEnabledByDefaultForPlatform } from "../../plugins/default-enablement.js";`
`12`		`-import { hasExplicitManifestOwnerTrust } from "../../plugins/manifest-owner-policy.js";`
`13`	`9`	`import {`
`14`	`10`	`loadPluginRegistrySnapshot,`
`15`	`11`	`normalizePluginsConfigWithRegistry,`
`@@ -84,18 +80,9 @@ function resolveHarnessPluginIds(params: {`
`84`	`80`	`trigger: { kind: "agentHarness", runtime: params.runtime },`
`85`	`81`	`config: params.config,`
`86`	`82`	`workspaceDir: params.workspaceDir,`
	`83`	`+requireExplicitManifestOwnerTrust: true,`
`87`	`84`	`});`
`88`		`-const normalizedPlugins = normalizePluginsConfig(params.config?.plugins);`
`89`		`-const harnessPluginIds = activationPlan.entries`
`90`		`-.filter(`
`91`		`-(entry) =>`
`92`		`-entry.origin === "bundled" \|\|`
`93`		`-hasExplicitManifestOwnerTrust({`
`94`		`-plugin: { id: entry.pluginId },`
`95`		`-normalizedConfig: normalizedPlugins,`
`96`		`-}),`
`97`		`-)`
`98`		`-.map((entry) => entry.pluginId);`
	`85`	`+const harnessPluginIds = activationPlan.entries.map((entry) => entry.pluginId);`
`99`	`86`	`if (harnessPluginIds.length === 0) {`
`100`	`87`	`return [];`
`101`	`88`	`}`

Original file line number	Diff line number	Diff line change
`@@ -184,6 +184,38 @@ describe("activation planner", () => {`
`184`	`184`	`).toEqual([]);`
`185`	`185`	`});`
`186`	`186`
	`187`	`+it("requires canonical ids for explicit manifest owner trust", () => {`
	`188`	`+expect(`
	`189`	`+resolveManifestActivationPluginIds({`
	`190`	`+config: {`
	`191`	`+plugins: {`
	`192`	`+allow: ["legacy-custom-harness-plugin"],`
	`193`	`+},`
	`194`	`+},`
	`195`	`+trigger: {`
	`196`	`+kind: "agentHarness",`
	`197`	`+runtime: "custom-harness",`
	`198`	`+},`
	`199`	`+requireExplicitManifestOwnerTrust: true,`
	`200`	`+}),`
	`201`	`+).toEqual([]);`
	`202`	`+`
	`203`	`+expect(`
	`204`	`+resolveManifestActivationPluginIds({`
	`205`	`+config: {`
	`206`	`+plugins: {`
	`207`	`+allow: ["custom-harness-plugin"],`
	`208`	`+},`
	`209`	`+},`
	`210`	`+trigger: {`
	`211`	`+kind: "agentHarness",`
	`212`	`+runtime: "custom-harness",`
	`213`	`+},`
	`214`	`+requireExplicitManifestOwnerTrust: true,`
	`215`	`+}),`
	`216`	`+).toEqual(["custom-harness-plugin"]);`
	`217`	`+});`
	`218`	`+`
`187`	`219`	`it("keeps ids-only provider, agent harness, channel, and route planning stable", () => {`
`188`	`220`	`expect(`
`189`	`221`	`resolveManifestActivationPluginIds({`

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,11 @@ import { normalizeOptionalLowercaseString } from "@openclaw/normalization-core/s`
`4`	`4`	`import { uniqueStrings } from "@openclaw/normalization-core/string-normalization";`
`5`	`5`	`import type { OpenClawConfig } from "../config/types.js";`
`6`	`6`	`import { normalizePluginsConfig } from "./config-state.js";`
`7`		`-import { passesManifestOwnerBasePolicy } from "./manifest-owner-policy.js";`
	`7`	`+import {`
	`8`	`+hasExplicitManifestOwnerTrust,`
	`9`	`+isBundledManifestOwner,`
	`10`	`+passesManifestOwnerBasePolicy,`
	`11`	`+} from "./manifest-owner-policy.js";`
`8`	`12`	`import type { PluginManifestRecord } from "./manifest-registry.js";`
`9`	`13`	`import type { PluginDiagnostic } from "./manifest-types.js";`
`10`	`14`	`import type { PluginManifestActivationCapability } from "./manifest.js";`
`@@ -63,14 +67,14 @@ type ResolveManifestActivationPlanParams = {`
`63`	`67`	`onlyPluginIds?: readonly string[];`
`64`	`68`	`manifestRecords?: readonly PluginManifestRecord[];`
`65`	`69`	`allowRestrictiveAllowlistBypass?: boolean;`
	`70`	`+requireExplicitManifestOwnerTrust?: boolean;`
`66`	`71`	`};`
`67`	`72`
`68`	`73`	`/** Returns a deterministic activation plan without importing plugin runtime modules. */`
`69`	`74`	`export function resolveManifestActivationPlan(`
`70`	`75`	`params: ResolveManifestActivationPlanParams,`
`71`	`76`	`): PluginActivationPlan {`
`72`	`77`	`const onlyPluginIdSet = createPluginIdScopeSet(normalizePluginIdScope(params.onlyPluginIds));`
`73`		`-const normalizedConfig = normalizePluginsConfig(params.config?.plugins);`
`74`	`78`	`const registry = params.manifestRecords`
`75`	`79`	`? { plugins: params.manifestRecords, diagnostics: [] }`
`76`	`80`	`: loadPluginManifestRegistryForPluginRegistry({`
`@@ -79,6 +83,7 @@ export function resolveManifestActivationPlan(`
`79`	`83`	`env: params.env,`
`80`	`84`	`includeDisabled: true,`
`81`	`85`	`});`
	`86`	`+const normalizedConfig = normalizePluginsConfig(params.config?.plugins);`
`82`	`87`	`const entries = registry.plugins`
`83`	`88`	`.flatMap((plugin) => {`
`84`	`89`	`if (params.origin && plugin.origin !== params.origin) {`
`@@ -96,6 +101,16 @@ export function resolveManifestActivationPlan(`
`96`	`101`	`) {`
`97`	`102`	`return [];`
`98`	`103`	`}`
	`104`	`+if (`
	`105`	`+params.requireExplicitManifestOwnerTrust &&`
	`106`	`+!isBundledManifestOwner(plugin) &&`
	`107`	`+!hasExplicitManifestOwnerTrust({`
	`108`	`+ plugin,`
	`109`	`+ normalizedConfig,`
	`110`	`+})`
	`111`	`+) {`
	`112`	`+return [];`
	`113`	`+}`
`99`	`114`	`const reasons = listManifestActivationTriggerReasons(plugin, params.trigger);`
`100`	`115`	`if (reasons.length === 0) {`
`101`	`116`	`return [];`

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

推荐订阅源

Recent Commits to openclaw:main