diff --git a/src/plugins/installed-plugin-index.ts b/src/plugins/installed-plugin-index.ts index abcb4ff765b..aa76109db79 100644 --- a/src/plugins/installed-plugin-index.ts +++ b/src/plugins/installed-plugin-index.ts @@ -1,6 +1,6 @@ import type { OpenClawConfig } from "../config/types.js"; import { resolveCompatibilityHostVersion } from "../version.js"; -import { normalizePluginsConfig, resolveEffectiveEnableState } from "./config-state.js"; +import { normalizePluginsConfig, resolveEffectivePluginActivationState } from "./config-state.js"; import { normalizeInstallRecordMap } from "./installed-plugin-index-install-records.js"; import { resolveCompatRegistryVersion, @@ -103,17 +103,7 @@ export function listEnabledInstalledPluginRecords( if (!config) { return index.plugins.filter((plugin) => plugin.enabled); } - const normalizedConfig = normalizePluginsConfig(config?.plugins); - return index.plugins.filter( - (plugin) => - resolveEffectiveEnableState({ - id: plugin.pluginId, - origin: plugin.origin, - config: normalizedConfig, - rootConfig: config, - enabledByDefault: plugin.enabledByDefault, - }).enabled, - ); + return index.plugins.filter((plugin) => isInstalledPluginEnabled(index, plugin.pluginId, config)); } export function getInstalledPluginRecord( @@ -136,7 +126,7 @@ export function isInstalledPluginEnabled( return record.enabled; } const normalizedConfig = normalizePluginsConfig(config?.plugins); - const state = resolveEffectiveEnableState({ + const state = resolveEffectivePluginActivationState({ id: record.pluginId, origin: record.origin, config: normalizedConfig,