mirror of
https://github.com/pchuan98/codex.git
synced 2026-07-01 00:31:56 +08:00
390b73133b
## Why Executor skill discovery runs before the remote skills catalog is available. For a remote environment, each `ExecutorFileSystem` operation becomes an exec-server RPC. Previously, every discovered `SKILL.md` independently resolved its plugin namespace by walking its ancestors and probing both supported manifest locations. In the common `plugin/skills/<skill>/SKILL.md` layout, that repeats 8 RPCs per skill even though every skill under the plugin root uses the same namespace. These lookups happen while skills are parsed, so their cost grows linearly with the skill count and adds directly to first-turn latency. A selected capability root can also contain standalone skills, multiple sibling plugins, nested plugins, or symlinked directories. The optimization therefore needs to retain the nearest-ancestor namespace for each skill rather than assuming the selected root represents exactly one plugin. ## What changed - record plugin-root candidates from directory entries already returned during skill discovery - prune candidates that are not ancestors of any discovered `SKILL.md` before reading manifests - resolve each relevant plugin root once, with one fallback lookup per canonical traversal root for symlinked directories - select the nearest cached plugin namespace for each discovered skill - avoid namespace lookup entirely when the root contains no skills No additional directory traversal is required. Namespace work now scales with the number of plugin roots that contain discovered skills, rather than the total number of skills or unrelated sibling plugins. Standalone and nested-plugin names keep their previous behavior. ## Benchmarks I used a temporary counting `ExecutorFileSystem` around the real local filesystem. Each filesystem operation was counted as one remote RPC and given 1 ms of injected latency. Each variant ran three times; times below are medians. ### One plugin with 100 skills | Operation | Before | After | Delta | | --- | ---: | ---: | ---: | | `get_metadata` | 1,002 | 303 | -699 | | `read_file` | 200 | 101 | -99 | | `read_directory` | 102 | 102 | 0 | | **Total filesystem RPCs** | **1,304** | **506** | **-798 (-61.2%)** | | **Median load time** | **2.890 s** | **0.997 s** | **2.90× faster** | The namespace-specific work drops from 800 RPCs to 2 in this layout. ### Multiple plugins under one selected root These runs compare the correct pre-optimization implementation with the final nearest-plugin-root cache. The total plugin skill count stays at 100 while the number of plugin roots changes. | Layout | Before RPCs | After RPCs | Reduction | Before | After | Speedup | | --- | ---: | ---: | ---: | ---: | ---: | ---: | | 2 plugins × 50 skills | 1,312 | 530 | 59.6% | 1,819 ms | 711 ms | 2.56× | | 10 plugins × 10 skills | 1,344 | 578 | 57.0% | 1,850 ms | 778 ms | 2.38× | | 50 plugins × 2 skills | 1,504 | 818 | 45.6% | 2,094 ms | 1,086 ms | 1.93× | | 10 plugins × 10 skills + 10 standalone skills | 1,596 | 630 | 60.5% | 2,209 ms | 860 ms | 2.57× | The remaining cost grows with the number of relevant plugin manifests. Each relevant manifest is read once instead of once per skill, while sibling plugins with no discovered skills are not read. Absolute latency savings depend on the executor's real RPC latency. ## Tests - `just test -p codex-core-skills` (109 passed across the library and integration-test binaries) - one integration test covers standalone, outer-plugin, nested-plugin, and unused sibling-plugin layouts, and asserts the exact set of manifests read
132 lines
4.7 KiB
Rust
132 lines
4.7 KiB
Rust
//! Resolve plugin namespace from skill file paths by walking ancestors for `plugin.json`.
|
|
|
|
use codex_exec_server::ExecutorFileSystem;
|
|
use codex_utils_absolute_path::AbsolutePathBuf;
|
|
use codex_utils_path_uri::PathUri;
|
|
use std::path::Path;
|
|
use std::path::PathBuf;
|
|
|
|
/// Ordered plugin manifest paths recognized beneath a plugin root.
|
|
pub const DISCOVERABLE_PLUGIN_MANIFEST_PATHS: &[&str] =
|
|
&[".codex-plugin/plugin.json", ".claude-plugin/plugin.json"];
|
|
|
|
pub fn find_plugin_manifest_path(plugin_root: &Path) -> Option<PathBuf> {
|
|
DISCOVERABLE_PLUGIN_MANIFEST_PATHS
|
|
.iter()
|
|
.map(|relative_path| plugin_root.join(relative_path))
|
|
.find(|manifest_path| manifest_path.is_file())
|
|
}
|
|
|
|
#[derive(serde::Deserialize)]
|
|
#[serde(rename_all = "camelCase")]
|
|
struct RawPluginManifestName {
|
|
#[serde(default)]
|
|
name: String,
|
|
}
|
|
|
|
/// Returns the plugin manifest `name` defined directly below `plugin_root`.
|
|
pub async fn plugin_namespace_for_root_uri(
|
|
fs: &dyn ExecutorFileSystem,
|
|
plugin_root: &PathUri,
|
|
) -> Option<String> {
|
|
let mut manifest_path = None;
|
|
for relative_path in DISCOVERABLE_PLUGIN_MANIFEST_PATHS {
|
|
let candidate = plugin_root.join(relative_path).ok()?;
|
|
match fs.get_metadata(&candidate, /*sandbox*/ None).await {
|
|
Ok(metadata) if metadata.is_file => {
|
|
manifest_path = Some(candidate);
|
|
break;
|
|
}
|
|
Ok(_) | Err(_) => {}
|
|
}
|
|
}
|
|
let contents = fs
|
|
.read_file_text(&manifest_path?, /*sandbox*/ None)
|
|
.await
|
|
.ok()?;
|
|
let RawPluginManifestName { name: raw_name } = serde_json::from_str(&contents).ok()?;
|
|
Some(
|
|
plugin_root
|
|
.basename()
|
|
.filter(|_| raw_name.trim().is_empty())
|
|
.unwrap_or(raw_name),
|
|
)
|
|
}
|
|
|
|
/// Returns the plugin manifest `name` for the nearest ancestor of `path` that contains a valid
|
|
/// plugin manifest (same `name` rules as full manifest loading in codex-core).
|
|
pub async fn plugin_namespace_for_skill_path(
|
|
fs: &dyn ExecutorFileSystem,
|
|
path: &AbsolutePathBuf,
|
|
) -> Option<String> {
|
|
plugin_namespace_for_skill_uri(fs, &PathUri::from_abs_path(path)).await
|
|
}
|
|
|
|
/// Returns the plugin manifest `name` for the nearest URI ancestor of `path`.
|
|
pub async fn plugin_namespace_for_skill_uri(
|
|
fs: &dyn ExecutorFileSystem,
|
|
path: &PathUri,
|
|
) -> Option<String> {
|
|
let mut ancestor = Some(path.clone());
|
|
while let Some(path) = ancestor {
|
|
if let Some(name) = plugin_namespace_for_root_uri(fs, &path).await {
|
|
return Some(name);
|
|
}
|
|
ancestor = path.parent();
|
|
}
|
|
None
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::find_plugin_manifest_path;
|
|
use super::plugin_namespace_for_skill_path;
|
|
use codex_exec_server::LOCAL_FS;
|
|
use codex_utils_absolute_path::test_support::PathBufExt;
|
|
use std::fs;
|
|
use tempfile::tempdir;
|
|
|
|
const ALTERNATE_PLUGIN_MANIFEST_RELATIVE_PATH: &str = ".claude-plugin/plugin.json";
|
|
|
|
#[tokio::test]
|
|
async fn uses_manifest_name() {
|
|
let tmp = tempdir().expect("tempdir");
|
|
let plugin_root = tmp.path().join("plugins/sample");
|
|
let skill_path = plugin_root.join("skills/search/SKILL.md");
|
|
|
|
fs::create_dir_all(skill_path.parent().expect("parent")).expect("mkdir");
|
|
fs::create_dir_all(plugin_root.join(".codex-plugin")).expect("mkdir manifest");
|
|
fs::write(
|
|
plugin_root.join(".codex-plugin/plugin.json"),
|
|
r#"{"name":"sample"}"#,
|
|
)
|
|
.expect("write manifest");
|
|
fs::write(&skill_path, "---\ndescription: search\n---\n").expect("write skill");
|
|
|
|
assert_eq!(
|
|
plugin_namespace_for_skill_path(LOCAL_FS.as_ref(), &skill_path.abs()).await,
|
|
Some("sample".to_string())
|
|
);
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn uses_name_from_alternate_discoverable_manifest_path() {
|
|
let tmp = tempdir().expect("tempdir");
|
|
let plugin_root = tmp.path().join("plugins/sample");
|
|
let skill_path = plugin_root.join("skills/search/SKILL.md");
|
|
let manifest_path = plugin_root.join(ALTERNATE_PLUGIN_MANIFEST_RELATIVE_PATH);
|
|
|
|
fs::create_dir_all(skill_path.parent().expect("parent")).expect("mkdir");
|
|
fs::create_dir_all(manifest_path.parent().expect("manifest parent"))
|
|
.expect("mkdir manifest");
|
|
fs::write(&manifest_path, r#"{"name":"sample"}"#).expect("write manifest");
|
|
fs::write(&skill_path, "---\ndescription: search\n---\n").expect("write skill");
|
|
|
|
assert_eq!(
|
|
plugin_namespace_for_skill_path(LOCAL_FS.as_ref(), &skill_path.abs()).await,
|
|
Some("sample".to_string())
|
|
);
|
|
assert_eq!(find_plugin_manifest_path(&plugin_root), Some(manifest_path));
|
|
}
|
|
}
|