Address comments.

Author: xl-openai

codex-rs/core/src/plugins.rs

@@ -10,6 +10,7 @@ use crate::config_loader::load_config_layers_state;
 use crate::features::Feature;
 use crate::features::FeatureOverrides;
 use crate::features::Features;
+use codex_utils_absolute_path::AbsolutePathBuf;
 use serde::Deserialize;
 use serde_json::Map as JsonMap;
 use serde_json::Value as JsonValue;
@@ -28,7 +29,7 @@ const DEFAULT_MCP_CONFIG_FILE: &str = ".mcp.json";
 pub struct LoadedPlugin {
     pub config_name: String,
     pub manifest_name: Option<String>,
-    pub root: PathBuf,
+    pub root: AbsolutePathBuf,
     pub enabled: bool,
     pub skill_roots: Vec<PathBuf>,
     pub mcp_servers: HashMap<String, McpServerConfig>,
@@ -86,6 +87,9 @@ impl PluginsManager {
     }
 
     pub fn plugins_for_config(&self, config: &Config) -> PluginLoadOutcome {
+        // Plugins are currently global-only. Even when callers pass a session
+        // config stack that may include cwd/tree/repo/runtime layers, plugin
+        // configuration is resolved from the user layer only.
         if !config.features.enabled(Feature::Plugins) {
             let mut cache = match self.cache.write() {
                 Ok(cache) => cache,
@@ -275,7 +279,7 @@ fn configured_plugins_from_stack(
 }
 
 fn load_plugin(config_name: String, plugin: &PluginConfig) -> LoadedPlugin {
-    let plugin_root = plugin.path.to_path_buf();
+    let plugin_root = plugin.path.clone();
     let mut loaded_plugin = LoadedPlugin {
         config_name,
         manifest_name: None,
@@ -295,16 +299,16 @@ fn load_plugin(config_name: String, plugin: &PluginConfig) -> LoadedPlugin {
         return loaded_plugin;
     }
 
-    let Some(manifest) = load_plugin_manifest(&plugin_root) else {
+    let Some(manifest) = load_plugin_manifest(plugin_root.as_path()) else {
         loaded_plugin.error = Some("missing or invalid .codex-plugin/plugin.json".to_string());
         return loaded_plugin;
     };
 
-    loaded_plugin.manifest_name = Some(plugin_manifest_name(&manifest, &plugin_root));
-    loaded_plugin.skill_roots = default_skill_roots(&plugin_root);
+    loaded_plugin.manifest_name = Some(plugin_manifest_name(&manifest, plugin_root.as_path()));
+    loaded_plugin.skill_roots = default_skill_roots(plugin_root.as_path());
     let mut mcp_servers = HashMap::new();
-    for mcp_config_path in default_mcp_config_paths(&plugin_root) {
-        let plugin_mcp = load_mcp_servers_from_file(&plugin_root, &mcp_config_path);
+    for mcp_config_path in default_mcp_config_paths(plugin_root.as_path()) {
+        let plugin_mcp = load_mcp_servers_from_file(plugin_root.as_path(), &mcp_config_path);
         for (name, config) in plugin_mcp.mcp_servers {
             if mcp_servers.insert(name.clone(), config).is_some() {
                 warn!(