mirror of
https://github.com/openai/codex.git
synced 2026-11-22 07:13:50 +00:00
Keep multi-workspace skill listings consistent (#37812)
## Why A single `skills/list` request should use one view of shared skill roots across all requested workspaces while still applying each workspace's skill rules. ## What changed - Add a request-scoped host skills view that reuses non-plugin root snapshots across `cwd` entries without persisting them across requests. - Resolve user-scoped plugin skill roots once per request, then apply workspace skill configuration separately for each `cwd`. - Make `forceReload` refresh plugin roots before building the request-scoped view so subsequent entries see the refreshed skills. ## Testing Expanded `skills/list` and host skills service tests to cover multiple ordered workspaces, per-workspace skill rules, request-local snapshots, cached results, and forced plugin-root refreshes. GitOrigin-RevId: eedd3a4c3e213b7f30df6cacd3adf23ba2967437
This commit is contained in:
1 parent
34ecac1f2b
commit
1c042dd4d8
9 files changed
+429
-140
No files matched your search
@@ -787,28 +787,6 @@ impl PluginsManager {
|
||||
}
|
||||
}
|
||||
|
||||
/// Load plugins for a config layer stack without touching the plugins cache.
|
||||
pub async fn plugins_for_layer_stack(
|
||||
&self,
|
||||
config_layer_stack: &ConfigLayerStack,
|
||||
config: &PluginsConfigInput,
|
||||
) -> PluginLoadOutcome {
|
||||
if !config.plugins_enabled {
|
||||
return PluginLoadOutcome::default();
|
||||
}
|
||||
let plugins = load_plugins_from_layer_stack(
|
||||
config_layer_stack,
|
||||
self.remote_installed_plugins_snapshot(),
|
||||
&self.store,
|
||||
/*plugin_skill_snapshots*/ None,
|
||||
self.restriction_product,
|
||||
self.remote_global_catalog_active(config),
|
||||
self.skill_root_loader.as_ref(),
|
||||
)
|
||||
.await;
|
||||
self.resolve_loaded_plugins_for_auth(plugins, &config.model_provider_id)
|
||||
}
|
||||
|
||||
/// Resolve plugin hooks for a config layer stack without loading other plugin capabilities.
|
||||
pub async fn plugin_hooks_for_layer_stack(
|
||||
&self,
|
||||
@@ -830,17 +808,6 @@ impl PluginsManager {
|
||||
.await
|
||||
}
|
||||
|
||||
/// Resolve plugin skill roots for a config layer stack without touching the plugins cache.
|
||||
pub async fn effective_skill_roots_for_layer_stack(
|
||||
&self,
|
||||
config_layer_stack: &ConfigLayerStack,
|
||||
config: &PluginsConfigInput,
|
||||
) -> Vec<PluginSkillRoot> {
|
||||
self.plugins_for_layer_stack(config_layer_stack, config)
|
||||
.await
|
||||
.effective_plugin_skill_roots()
|
||||
}
|
||||
|
||||
fn cached_loaded_plugins(&self, key: &PluginLoadCacheKey) -> Option<Vec<LoadedPlugin>> {
|
||||
self.loaded_plugins_cache
|
||||
.read()
|
||||
|
||||
Reference in new issue
Block a user