mirror of
https://github.com/pchuan98/codex.git
synced 2026-07-01 00:31:56 +08:00
2e69966cd8
## Why Selected capability roots belong to the executor filesystem, not the app-server host. Converting their path strings into the host's native `Path` breaks whenever the two machines use different path conventions, such as a Windows executor behind a Unix app-server. This PR establishes `PathUri` as the selected-plugin boundary so the executor remains authoritative for its paths. ## What changed - Require `selectedCapabilityRoots[].location.path` to be a canonical `file:` URI and deserialize it directly as `PathUri`; native path strings are rejected. - Update the app-server schema, generated TypeScript, examples, and request coverage for the URI contract. - Keep selected roots, resolved plugin locations, manifest paths, and manifest resources as `PathUri`. - Inspect and read plugin roots and manifests only through the selected environment's `ExecutorFileSystem`. - Parse executor manifests with the shared URI-native parser from #29620 instead of projecting them onto the host filesystem. - Enforce resource containment lexically and preserve the root URI's POSIX or Windows path convention. - Cover foreign Windows plugin roots and URI-native manifest resources. ```text thread/start selectedCapabilityRoots[].location.path = "file:///C:/plugins/demo" | PathUri v ExecutorFileSystem | +--> plugin.json +--> manifest resources ``` This PR stops at the shared selected-plugin representation. The next two PRs remove the remaining host-path projections in the skill and MCP consumers. ## Stack 1. #29614 — add lexical `PathUri` containment. 2. #29620 — share URI-native manifest path resolution. 3. **This PR** — keep selected plugin roots and resources URI-native. 4. #29626 — load executor skills without host path conversion. 5. #29628 — resolve executor MCP working directories without host path conversion.
137 lines
4.5 KiB
Rust
137 lines
4.5 KiB
Rust
use super::PluginResourceLocator;
|
|
use super::ResolvedPlugin;
|
|
use super::ResolvedPluginError;
|
|
use crate::manifest::PluginManifest;
|
|
use crate::manifest::PluginManifestHooks;
|
|
use crate::manifest::PluginManifestInterface;
|
|
use crate::manifest::PluginManifestMcpServers;
|
|
use crate::manifest::PluginManifestPaths;
|
|
use codex_utils_absolute_path::AbsolutePathBuf;
|
|
use codex_utils_path_uri::PathUri;
|
|
use pretty_assertions::assert_eq;
|
|
|
|
fn absolute(path: impl AsRef<std::path::Path>) -> AbsolutePathBuf {
|
|
AbsolutePathBuf::from_absolute_path_checked(path.as_ref()).expect("absolute test path")
|
|
}
|
|
|
|
fn path_uri(path: &AbsolutePathBuf) -> PathUri {
|
|
PathUri::from_abs_path(path)
|
|
}
|
|
|
|
fn resource(environment_id: &str, path: &AbsolutePathBuf) -> PluginResourceLocator {
|
|
PluginResourceLocator::Environment {
|
|
environment_id: environment_id.to_string(),
|
|
path: path_uri(path),
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn environment_descriptor_binds_every_manifest_resource() {
|
|
let root = absolute(std::env::current_dir().expect("cwd").join("plugin-root"));
|
|
let root_uri = path_uri(&root);
|
|
let manifest_path = root.join(".codex-plugin/plugin.json");
|
|
let skills = root.join("skills");
|
|
let mcp_servers = root.join(".mcp.json");
|
|
let apps = root.join(".app.json");
|
|
let hooks = root.join("hooks/hooks.json");
|
|
let composer_icon = root.join("assets/composer.svg");
|
|
let logo = root.join("assets/logo.svg");
|
|
let screenshot = root.join("assets/screenshot.png");
|
|
let manifest = PluginManifest {
|
|
name: "demo".to_string(),
|
|
version: None,
|
|
description: None,
|
|
keywords: Vec::new(),
|
|
paths: PluginManifestPaths {
|
|
skills: vec![path_uri(&skills)],
|
|
mcp_servers: Some(PluginManifestMcpServers::Path(path_uri(&mcp_servers))),
|
|
apps: Some(path_uri(&apps)),
|
|
hooks: Some(PluginManifestHooks::Paths(vec![path_uri(&hooks)])),
|
|
},
|
|
interface: Some(PluginManifestInterface {
|
|
composer_icon: Some(path_uri(&composer_icon)),
|
|
logo: Some(path_uri(&logo)),
|
|
screenshots: vec![path_uri(&screenshot)],
|
|
..PluginManifestInterface::default()
|
|
}),
|
|
};
|
|
|
|
let plugin = ResolvedPlugin::from_environment(
|
|
"selected-demo".to_string(),
|
|
"executor-1".to_string(),
|
|
root_uri,
|
|
path_uri(&manifest_path),
|
|
manifest,
|
|
)
|
|
.expect("valid descriptor");
|
|
|
|
assert_eq!(
|
|
plugin.manifest_path(),
|
|
&resource("executor-1", &manifest_path)
|
|
);
|
|
assert_eq!(
|
|
plugin.manifest(),
|
|
&PluginManifest {
|
|
name: "demo".to_string(),
|
|
version: None,
|
|
description: None,
|
|
keywords: Vec::new(),
|
|
paths: PluginManifestPaths {
|
|
skills: vec![resource("executor-1", &skills)],
|
|
mcp_servers: Some(PluginManifestMcpServers::Path(resource(
|
|
"executor-1",
|
|
&mcp_servers,
|
|
))),
|
|
apps: Some(resource("executor-1", &apps)),
|
|
hooks: Some(PluginManifestHooks::Paths(vec![resource(
|
|
"executor-1",
|
|
&hooks
|
|
)])),
|
|
},
|
|
interface: Some(PluginManifestInterface {
|
|
composer_icon: Some(resource("executor-1", &composer_icon)),
|
|
logo: Some(resource("executor-1", &logo)),
|
|
screenshots: vec![resource("executor-1", &screenshot)],
|
|
..PluginManifestInterface::default()
|
|
}),
|
|
}
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn environment_descriptor_rejects_resources_outside_package_root() {
|
|
let cwd = std::env::current_dir().expect("cwd");
|
|
let root = absolute(cwd.join("plugin-root"));
|
|
let outside = absolute(cwd.join("outside/.mcp.json"));
|
|
let manifest = PluginManifest {
|
|
name: "demo".to_string(),
|
|
version: None,
|
|
description: None,
|
|
keywords: Vec::new(),
|
|
paths: PluginManifestPaths {
|
|
skills: Vec::new(),
|
|
mcp_servers: Some(PluginManifestMcpServers::Path(path_uri(&outside))),
|
|
apps: None,
|
|
hooks: None,
|
|
},
|
|
interface: None,
|
|
};
|
|
|
|
let err = ResolvedPlugin::from_environment(
|
|
"selected-demo".to_string(),
|
|
"executor-1".to_string(),
|
|
path_uri(&root),
|
|
path_uri(&root.join(".codex-plugin/plugin.json")),
|
|
manifest,
|
|
)
|
|
.expect_err("outside resource should fail");
|
|
|
|
assert_eq!(
|
|
err,
|
|
ResolvedPluginError::ResourceOutsideRoot {
|
|
root: path_uri(&root),
|
|
path: path_uri(&outside),
|
|
}
|
|
);
|
|
}
|