vultr/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-04 07:20:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(plugins): detect reentrant plugin loads

Browse Source
This commit is contained in:
Peter Steinberger
2026-04-06 18:04:48 +01:00
parent f8920e96d0
commit 7d9a6b5572
4 changed files with 710 additions and 635 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/plugins/providers.runtime.ts
View File

@@ -1,8 +1,8 @@
import { withActivatedPluginIds } from "./activation-context.js";
import { resolveBundledPluginCompatibleActivationInputs } from "./activation-context.js";
import {
isPluginRegistryLoadInFlight,
loadOpenClawPlugins,
resolvePluginRegistryLoadCacheKey,
resolveRuntimePluginRegistry,
type PluginLoadOptions,
} from "./loader.js";
@@ -21,8 +21,6 @@ import {
} from "./runtime/load-context.js";
import type { ProviderPlugin } from "./types.js";
const inFlightProviderPluginLoadKeys = new Set<string>();
function resolvePluginProviderLoadBase(params: {
config?: PluginLoadOptions["config"];
workspaceDir?: string;
@@ -177,9 +175,7 @@ export function isPluginProvidersLoadInFlight(
if (!loadState) {
return false;
}
return inFlightProviderPluginLoadKeys.has(
resolvePluginRegistryLoadCacheKey(loadState.loadOptions),
);
return isPluginRegistryLoadInFlight(loadState.loadOptions);
}
export function resolvePluginProviders(params: {
@@ -203,32 +199,20 @@ export function resolvePluginProviders(params: {
if (!loadState) {
return [];
}
const loadKey = resolvePluginRegistryLoadCacheKey(loadState.loadOptions);
inFlightProviderPluginLoadKeys.add(loadKey);
try {
const registry = loadOpenClawPlugins(loadState.loadOptions);
return registry.providers.map((entry) => ({
...entry.provider,
pluginId: entry.pluginId,
}));
} finally {
inFlightProviderPluginLoadKeys.delete(loadKey);
}
}
const loadState = resolveRuntimeProviderPluginLoadState(params, base);
const loadKey = resolvePluginRegistryLoadCacheKey(loadState.loadOptions);
inFlightProviderPluginLoadKeys.add(loadKey);
try {
const registry = resolveRuntimePluginRegistry(loadState.loadOptions);
if (!registry) {
return [];
}
const registry = loadOpenClawPlugins(loadState.loadOptions);
return registry.providers.map((entry) => ({
...entry.provider,
pluginId: entry.pluginId,
}));
} finally {
inFlightProviderPluginLoadKeys.delete(loadKey);
}
const loadState = resolveRuntimeProviderPluginLoadState(params, base);
const registry = resolveRuntimePluginRegistry(loadState.loadOptions);
if (!registry) {
return [];
}
return registry.providers.map((entry) => ({
...entry.provider,
pluginId: entry.pluginId,
}));
}