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

fix: propagate workspaceDir to snapshot plugin loads (#61138)

Browse Source 
* plugins: include resolved workspaceDir in provider hook cache keys

resolveProviderPluginsForHooks, resolveProviderPluginsForCatalogHooks, and
resolveProviderRuntimePlugin used the raw params.workspaceDir for cache keys
and plugin-id discovery while resolvePluginProviders already fell back to
the active registry workspace. Resolve workspaceDir once at the top of each
function so cache keys, candidate filtering, and loading all use the same
workspace root.

* fix(plugins): inherit runtime workspace for snapshot loads

* test(gateway): stub runtime registry seam

* fix(plugins): restore workspace fallback after rebase

---------

Co-authored-by: Vincent Koc <vincentkoc@ieee.org>
This commit is contained in:
Jamil Zakirov
2026-04-05 11:03:54 +03:00
committed by GitHub
parent e28e83f4e4
commit ffb5b99114
13 changed files with 304 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/provider-runtime.ts
View File

@@ -8,6 +8,7 @@ import {
} from "./providers.js";
import { resolvePluginProviders } from "./providers.runtime.js";
import { resolvePluginCacheInputs } from "./roots.js";
import { getActivePluginRegistryWorkspaceDirFromState } from "./runtime-state.js";
import type {
ProviderAuthDoctorHintContext,
ProviderAugmentModelCatalogContext,
@@ -134,13 +135,14 @@ function resolveProviderPluginsForHooks(params: {
onlyPluginIds?: string[];
}): ProviderPlugin[] {
const env = params.env ?? process.env;
const workspaceDir = params.workspaceDir ?? getActivePluginRegistryWorkspaceDirFromState();
const cacheBucket = resolveHookProviderCacheBucket({
config: params.config,
env,
});
const cacheKey = buildHookProviderCacheKey({
config: params.config,
workspaceDir: params.workspaceDir,
workspaceDir,
onlyPluginIds: params.onlyPluginIds,
env,
});
@@ -150,6 +152,7 @@ function resolveProviderPluginsForHooks(params: {
}
const resolved = resolvePluginProviders({
...params,
workspaceDir,
env,
activate: false,
cache: false,
@@ -165,9 +168,10 @@ function resolveProviderPluginsForCatalogHooks(params: {
workspaceDir?: string;
env?: NodeJS.ProcessEnv;
}): ProviderPlugin[] {
const workspaceDir = params.workspaceDir ?? getActivePluginRegistryWorkspaceDirFromState();
const onlyPluginIds = resolveCatalogHookProviderPluginIds({
config: params.config,
workspaceDir: params.workspaceDir,
workspaceDir,
env: params.env,
});
if (onlyPluginIds.length === 0) {
@@ -175,6 +179,7 @@ function resolveProviderPluginsForCatalogHooks(params: {
}
return resolveProviderPluginsForHooks({
...params,
workspaceDir,
onlyPluginIds,
});
}
@@ -185,10 +190,11 @@ export function resolveProviderRuntimePlugin(params: {
workspaceDir?: string;
env?: NodeJS.ProcessEnv;
}): ProviderPlugin | undefined {
const workspaceDir = params.workspaceDir ?? getActivePluginRegistryWorkspaceDirFromState();
const owningPluginIds = resolveOwningPluginIdsForProvider({
provider: params.provider,
config: params.config,
workspaceDir: params.workspaceDir,
workspaceDir,
env: params.env,
});
if (!owningPluginIds || owningPluginIds.length === 0) {
@@ -196,6 +202,7 @@ export function resolveProviderRuntimePlugin(params: {
}
return resolveProviderPluginsForHooks({
...params,
workspaceDir,
onlyPluginIds: owningPluginIds,
}).find((plugin) => matchesProviderId(plugin, params.provider));
}