























@@ -5,10 +5,7 @@ import type { OpenClawConfig } from "../config/types.js";
55import type { PluginInstallRecord } from "../config/types.plugins.js";
66import { resolveCompatibilityHostVersion } from "../version.js";
77import { listPluginCompatRecords, type PluginCompatCode } from "./compat/registry.js";
8-import {
9-normalizePluginsConfigWithResolver,
10-resolveEffectiveEnableState,
11-} from "./config-policy.js";
8+import { normalizePluginsConfig, resolveEffectiveEnableState } from "./config-state.js";
129import { discoverOpenClawPlugins, type PluginCandidate } from "./discovery.js";
1310import {
1411describePluginInstallSource,
@@ -353,7 +350,7 @@ function resolveCompatRegistryVersion(): string {
353350}
354351355352function resolvePolicyHash(config: OpenClawConfig | undefined): string {
356-const normalized = normalizePluginsConfigWithResolver(config?.plugins);
353+const normalized = normalizePluginsConfig(config?.plugins);
357354const channelPolicy: Record<string, boolean> = {};
358355const channels = config?.channels;
359356if (channels && typeof channels === "object" && !Array.isArray(channels)) {
@@ -404,7 +401,7 @@ function resolveRegistry(params: LoadInstalledPluginIndexParams): {
404401};
405402}
406403407-const normalized = normalizePluginsConfigWithResolver(params.config?.plugins);
404+const normalized = normalizePluginsConfig(params.config?.plugins);
408405const discovery = discoverOpenClawPlugins({
409406workspaceDir: params.workspaceDir,
410407extraPaths: normalized.loadPaths,
@@ -430,7 +427,7 @@ function buildInstalledPluginIndex(
430427const env = params.env ?? process.env;
431428const { candidates, registry } = resolveRegistry(params);
432429const candidateByRootDir = buildCandidateLookup(candidates);
433-const normalizedConfig = normalizePluginsConfigWithResolver(params.config?.plugins);
430+const normalizedConfig = normalizePluginsConfig(params.config?.plugins);
434431const diagnostics: PluginDiagnostic[] = [...registry.diagnostics];
435432const generatedAtMs = (params.now?.() ?? new Date()).getTime();
436433const plugins = registry.plugins.map((record): InstalledPluginIndexRecord => {
@@ -528,7 +525,7 @@ export function listEnabledInstalledPluginRecords(
528525if (!config) {
529526return index.plugins.filter((plugin) => plugin.enabled);
530527}
531-const normalizedConfig = normalizePluginsConfigWithResolver(config?.plugins);
528+const normalizedConfig = normalizePluginsConfig(config?.plugins);
532529return index.plugins.filter(
533530(plugin) =>
534531resolveEffectiveEnableState({
@@ -560,7 +557,7 @@ export function isInstalledPluginEnabled(
560557if (!config) {
561558return record.enabled;
562559}
563-const normalizedConfig = normalizePluginsConfigWithResolver(config?.plugins);
560+const normalizedConfig = normalizePluginsConfig(config?.plugins);
564561return resolveEffectiveEnableState({
565562id: record.pluginId,
566563origin: record.origin,
此内容由惯性聚合(RSS阅读器)自动聚合整理,仅供阅读参考。 原文来自 — 版权归原作者所有。