diff --git a/notes/fresh-workspace-handoff.md b/notes/fresh-workspace-handoff.md index 21fc539a..c1a383ef 100644 --- a/notes/fresh-workspace-handoff.md +++ b/notes/fresh-workspace-handoff.md @@ -904,6 +904,16 @@ crate is deleted from the vendored workspace. Verified with hits are stale tests and the narrower `codex-utils-plugins` skill-namespace utility, not live marketplace machinery. +The final `codex-utils-plugins` husk is deleted too. `$` and `@` mention sigils +now live in `codex-core-skills` / `codex-core`, plugin manifest ancestry no +longer namespaces skills, and stale plugin/marketplace tests were removed rather +than preserving a dead product contract. Verified with +`cargo test -p codex-core-skills --tests --no-run` and +`cargo test -p codex-cli --tests --no-run`. A full `cargo test -p codex-core +--tests --no-run` still fails on older stale lib-test scaffolds for deleted +plugin/skill/app surfaces; do not restore those surfaces just to appease the +tests. + The Phase 6 freshness slice is landed. It exposes read-only `thread/epiphany/freshness` from live retrieval summaries plus graph frontier/churn state and, for loaded threads, watcher-backed invalidation diff --git a/state/ledgers.msgpack b/state/ledgers.msgpack index ee4843cd..67178853 100644 Binary files a/state/ledgers.msgpack and b/state/ledgers.msgpack differ diff --git a/state/map.yaml b/state/map.yaml index f3db8a79..f7af05bc 100644 --- a/state/map.yaml +++ b/state/map.yaml @@ -319,9 +319,10 @@ current_status: compatibility spine. The orphaned `codex-core-plugins` crate was also deleted from the workspace. Analytics no longer knows plugin lifecycle/use events, keeps plugin dedupe state, or depends on `codex-plugin`; the - unreferenced `codex-plugin` crate was deleted from the workspace. Remaining - `.codex-plugin` references are stale tests or the narrower - `codex-utils-plugins` skill-namespace utility, not a plugin marketplace - runtime. MCP remains JSON-RPC at the edge; user-declared MCP servers are the - only runtime MCP authority. + unreferenced `codex-plugin` crate was deleted from the workspace. The final + `codex-utils-plugins` husk was deleted too: `$` / `@` mention sigils now + live in their actual owners, plugin manifest skill namespacing is gone, and + stale plugin/marketplace tests were removed instead of preserving + implementation fossils. MCP remains JSON-RPC at the edge; user-declared MCP + servers are the only runtime MCP authority. next_action: Continue starving coordinator/runtime execution and operator surfaces off app-server JSON-RPC and out of `codex_message_processor.rs`; keep the vestigial Codex organ narrowed to subscription auth/model transport. diff --git a/vendor/codex/codex-rs/Cargo.lock b/vendor/codex/codex-rs/Cargo.lock index 9f09ec18..470202d3 100644 --- a/vendor/codex/codex-rs/Cargo.lock +++ b/vendor/codex/codex-rs/Cargo.lock @@ -2394,7 +2394,6 @@ dependencies = [ "codex-utils-image", "codex-utils-output-truncation", "codex-utils-path", - "codex-utils-plugins", "codex-utils-pty", "codex-utils-readiness", "codex-utils-stream-parser", @@ -2475,7 +2474,6 @@ dependencies = [ "codex-skills", "codex-utils-absolute-path", "codex-utils-output-truncation", - "codex-utils-plugins", "dirs", "dunce", "pretty_assertions", @@ -3606,19 +3604,6 @@ dependencies = [ "tempfile", ] -[[package]] -name = "codex-utils-plugins" -version = "0.0.0" -dependencies = [ - "codex-exec-server", - "codex-login", - "codex-utils-absolute-path", - "serde", - "serde_json", - "tempfile", - "tokio", -] - [[package]] name = "codex-utils-pty" version = "0.0.0" diff --git a/vendor/codex/codex-rs/Cargo.toml b/vendor/codex/codex-rs/Cargo.toml index 89978b86..07c7541a 100644 --- a/vendor/codex/codex-rs/Cargo.toml +++ b/vendor/codex/codex-rs/Cargo.toml @@ -82,7 +82,6 @@ members = [ "utils/oss", "utils/output-truncation", "utils/path-utils", - "utils/plugins", "utils/fuzzy-match", "utils/stream-parser", "utils/template", @@ -191,7 +190,6 @@ codex-utils-json-to-toml = { path = "utils/json-to-toml" } codex-utils-oss = { path = "utils/oss" } codex-utils-output-truncation = { path = "utils/output-truncation" } codex-utils-path = { path = "utils/path-utils" } -codex-utils-plugins = { path = "utils/plugins" } codex-utils-pty = { path = "utils/pty" } codex-utils-readiness = { path = "utils/readiness" } codex-utils-rustls-provider = { path = "utils/rustls-provider" } diff --git a/vendor/codex/codex-rs/cli/tests/marketplace_add.rs b/vendor/codex/codex-rs/cli/tests/marketplace_add.rs deleted file mode 100644 index e4256f52..00000000 --- a/vendor/codex/codex-rs/cli/tests/marketplace_add.rs +++ /dev/null @@ -1,118 +0,0 @@ -use anyhow::Result; -use codex_config::CONFIG_TOML_FILE; -use codex_core::plugins::marketplace_install_root; -use predicates::str::contains; -use pretty_assertions::assert_eq; -use std::path::Path; -use tempfile::TempDir; - -fn codex_command(codex_home: &Path) -> Result { - let mut cmd = assert_cmd::Command::new(codex_utils_cargo_bin::cargo_bin("codex")?); - cmd.env("CODEX_HOME", codex_home); - Ok(cmd) -} - -fn write_marketplace_source(source: &Path, marker: &str) -> Result<()> { - std::fs::create_dir_all(source.join(".agents/plugins"))?; - std::fs::create_dir_all(source.join("plugins/sample/.codex-plugin"))?; - std::fs::write( - source.join(".agents/plugins/marketplace.json"), - r#"{ - "name": "debug", - "plugins": [ - { - "name": "sample", - "source": { - "source": "local", - "path": "./plugins/sample" - } - } - ] -}"#, - )?; - std::fs::write( - source.join("plugins/sample/.codex-plugin/plugin.json"), - r#"{"name":"sample"}"#, - )?; - std::fs::write(source.join("plugins/sample/marker.txt"), marker)?; - Ok(()) -} - -#[tokio::test] -async fn marketplace_add_local_directory_source() -> Result<()> { - let codex_home = TempDir::new()?; - let source = TempDir::new()?; - write_marketplace_source(source.path(), "local ref")?; - let source_parent = source.path().parent().unwrap(); - let source_arg = format!("./{}", source.path().file_name().unwrap().to_string_lossy()); - - codex_command(codex_home.path())? - .current_dir(source_parent) - .args(["plugin", "marketplace", "add", source_arg.as_str()]) - .assert() - .success(); - - let installed_root = marketplace_install_root(codex_home.path()).join("debug"); - assert!(!installed_root.exists()); - - let config = std::fs::read_to_string(codex_home.path().join(CONFIG_TOML_FILE))?; - let config: toml::Value = toml::from_str(&config)?; - let expected_source = source.path().canonicalize()?.display().to_string(); - assert_eq!( - config["marketplaces"]["debug"]["source_type"].as_str(), - Some("local") - ); - assert_eq!( - config["marketplaces"]["debug"]["source"].as_str(), - Some(expected_source.as_str()) - ); - - Ok(()) -} - -#[tokio::test] -async fn marketplace_add_rejects_local_manifest_file_source() -> Result<()> { - let codex_home = TempDir::new()?; - let source = TempDir::new()?; - write_marketplace_source(source.path(), "local ref")?; - let manifest_path = source.path().join(".agents/plugins/marketplace.json"); - - codex_command(codex_home.path())? - .args([ - "plugin", - "marketplace", - "add", - manifest_path.to_str().unwrap(), - ]) - .assert() - .failure() - .stderr(contains( - "local marketplace source must be a directory, not a file", - )); - - Ok(()) -} - -#[tokio::test] -async fn marketplace_add_rejects_sparse_for_local_directory_source() -> Result<()> { - let codex_home = TempDir::new()?; - let source = TempDir::new()?; - write_marketplace_source(source.path(), "local ref")?; - - codex_command(codex_home.path())? - .args([ - "plugin", - "marketplace", - "add", - "--sparse", - ".agents", - source.path().to_str().unwrap(), - ]) - .assert() - .failure() - .stderr(contains( - "--sparse is only supported for git marketplace sources", - )); - - Ok(()) -} diff --git a/vendor/codex/codex-rs/cli/tests/marketplace_remove.rs b/vendor/codex/codex-rs/cli/tests/marketplace_remove.rs deleted file mode 100644 index 06e213ba..00000000 --- a/vendor/codex/codex-rs/cli/tests/marketplace_remove.rs +++ /dev/null @@ -1,70 +0,0 @@ -use anyhow::Result; -use codex_config::MarketplaceConfigUpdate; -use codex_config::record_user_marketplace; -use codex_core::plugins::marketplace_install_root; -use predicates::str::contains; -use std::path::Path; -use tempfile::TempDir; - -fn codex_command(codex_home: &Path) -> Result { - let mut cmd = assert_cmd::Command::new(codex_utils_cargo_bin::cargo_bin("codex")?); - cmd.env("CODEX_HOME", codex_home); - Ok(cmd) -} - -fn configured_marketplace_update() -> MarketplaceConfigUpdate<'static> { - MarketplaceConfigUpdate { - last_updated: "2026-04-13T00:00:00Z", - last_revision: None, - source_type: "git", - source: "https://github.com/owner/repo.git", - ref_name: Some("main"), - sparse_paths: &[], - } -} - -fn write_installed_marketplace(codex_home: &Path, marketplace_name: &str) -> Result<()> { - let root = marketplace_install_root(codex_home).join(marketplace_name); - std::fs::create_dir_all(root.join(".agents/plugins"))?; - std::fs::write(root.join(".agents/plugins/marketplace.json"), "{}")?; - std::fs::write(root.join("marker.txt"), "installed")?; - Ok(()) -} - -#[tokio::test] -async fn marketplace_remove_deletes_config_and_installed_root() -> Result<()> { - let codex_home = TempDir::new()?; - record_user_marketplace(codex_home.path(), "debug", &configured_marketplace_update())?; - write_installed_marketplace(codex_home.path(), "debug")?; - - codex_command(codex_home.path())? - .args(["plugin", "marketplace", "remove", "debug"]) - .assert() - .success() - .stdout(contains("Removed marketplace `debug`.")); - - let config_path = codex_home.path().join("config.toml"); - let config = std::fs::read_to_string(config_path)?; - assert!(!config.contains("[marketplaces.debug]")); - assert!( - !marketplace_install_root(codex_home.path()) - .join("debug") - .exists() - ); - Ok(()) -} - -#[tokio::test] -async fn marketplace_remove_rejects_unknown_marketplace() -> Result<()> { - let codex_home = TempDir::new()?; - - codex_command(codex_home.path())? - .args(["plugin", "marketplace", "remove", "debug"]) - .assert() - .failure() - .stderr(contains( - "marketplace `debug` is not configured or installed", - )); - - Ok(()) -} diff --git a/vendor/codex/codex-rs/cli/tests/marketplace_upgrade.rs b/vendor/codex/codex-rs/cli/tests/marketplace_upgrade.rs deleted file mode 100644 index 081203eb..00000000 --- a/vendor/codex/codex-rs/cli/tests/marketplace_upgrade.rs +++ /dev/null @@ -1,36 +0,0 @@ -use anyhow::Result; -use predicates::str::contains; -use std::path::Path; -use tempfile::TempDir; - -fn codex_command(codex_home: &Path) -> Result { - let mut cmd = assert_cmd::Command::new(codex_utils_cargo_bin::cargo_bin("codex")?); - cmd.env("CODEX_HOME", codex_home); - Ok(cmd) -} - -#[tokio::test] -async fn marketplace_upgrade_runs_under_plugin() -> Result<()> { - let codex_home = TempDir::new()?; - - codex_command(codex_home.path())? - .args(["plugin", "marketplace", "upgrade"]) - .assert() - .success() - .stdout(contains("No configured Git marketplaces to upgrade.")); - - Ok(()) -} - -#[tokio::test] -async fn marketplace_upgrade_no_longer_runs_at_top_level() -> Result<()> { - let codex_home = TempDir::new()?; - - codex_command(codex_home.path())? - .args(["marketplace", "upgrade"]) - .assert() - .failure() - .stderr(contains("unexpected argument 'upgrade' found")); - - Ok(()) -} diff --git a/vendor/codex/codex-rs/core-skills/Cargo.toml b/vendor/codex/codex-rs/core-skills/Cargo.toml index 35537411..61b3e1f0 100644 --- a/vendor/codex/codex-rs/core-skills/Cargo.toml +++ b/vendor/codex/codex-rs/core-skills/Cargo.toml @@ -24,7 +24,6 @@ codex-protocol = { workspace = true } codex-skills = { workspace = true } codex-utils-absolute-path = { workspace = true } codex-utils-output-truncation = { workspace = true } -codex-utils-plugins = { workspace = true } dirs = { workspace = true } dunce = { workspace = true } serde = { workspace = true, features = ["derive"] } diff --git a/vendor/codex/codex-rs/core-skills/src/injection.rs b/vendor/codex/codex-rs/core-skills/src/injection.rs index ed06cc57..f43805e7 100644 --- a/vendor/codex/codex-rs/core-skills/src/injection.rs +++ b/vendor/codex/codex-rs/core-skills/src/injection.rs @@ -13,7 +13,8 @@ use codex_exec_server::LOCAL_FS; use codex_otel::SessionTelemetry; use codex_protocol::user_input::UserInput; use codex_utils_absolute_path::AbsolutePathBuf; -use codex_utils_plugins::mention_syntax::TOOL_MENTION_SIGIL; + +const TOOL_MENTION_SIGIL: char = '$'; #[derive(Debug, Default)] pub struct SkillInjections { diff --git a/vendor/codex/codex-rs/core-skills/src/loader.rs b/vendor/codex/codex-rs/core-skills/src/loader.rs index 2cae6a4b..8679ea8a 100644 --- a/vendor/codex/codex-rs/core-skills/src/loader.rs +++ b/vendor/codex/codex-rs/core-skills/src/loader.rs @@ -19,7 +19,6 @@ use codex_protocol::protocol::Product; use codex_protocol::protocol::SkillScope; use codex_utils_absolute_path::AbsolutePathBuf; use codex_utils_absolute_path::AbsolutePathBufGuard; -use codex_utils_plugins::plugin_namespace_for_skill_path; use dirs::home_dir; use serde::Deserialize; use std::collections::HashMap; @@ -586,7 +585,7 @@ async fn parse_skill_file( .map(sanitize_single_line) .filter(|value| !value.is_empty()) .unwrap_or_else(|| default_skill_name(path)); - let name = namespaced_skill_name(fs, path, &base_name).await; + let name = base_name.to_string(); let description = parsed .description .as_deref() @@ -640,17 +639,6 @@ fn default_skill_name(path: &AbsolutePathBuf) -> String { .unwrap_or_else(|| "skill".to_string()) } -async fn namespaced_skill_name( - fs: &dyn ExecutorFileSystem, - path: &AbsolutePathBuf, - base_name: &str, -) -> String { - plugin_namespace_for_skill_path(fs, path) - .await - .map(|namespace| format!("{namespace}:{base_name}")) - .unwrap_or_else(|| base_name.to_string()) -} - async fn load_skill_metadata( fs: &dyn ExecutorFileSystem, skill_path: &AbsolutePathBuf, diff --git a/vendor/codex/codex-rs/core-skills/src/loader_tests.rs b/vendor/codex/codex-rs/core-skills/src/loader_tests.rs index a12f09f8..f3f69f25 100644 --- a/vendor/codex/codex-rs/core-skills/src/loader_tests.rs +++ b/vendor/codex/codex-rs/core-skills/src/loader_tests.rs @@ -1128,49 +1128,6 @@ async fn falls_back_to_directory_name_when_skill_name_is_missing() { ); } -#[tokio::test] -async fn namespaces_plugin_skills_using_plugin_name() { - let root = tempfile::tempdir().expect("tempdir"); - let plugin_root = root.path().join("plugins/sample"); - let skill_path = write_raw_skill_at( - &plugin_root.join("skills"), - "sample-search", - "description: search sample data", - ); - fs::create_dir_all(plugin_root.join(".codex-plugin")).unwrap(); - fs::write( - plugin_root.join(".codex-plugin/plugin.json"), - r#"{"name":"sample"}"#, - ) - .unwrap(); - - let outcome = load_skills_from_roots([SkillRoot { - path: plugin_root.join("skills").abs(), - scope: SkillScope::User, - file_system: Arc::clone(&LOCAL_FS), - }]) - .await; - - assert!( - outcome.errors.is_empty(), - "unexpected errors: {:?}", - outcome.errors - ); - assert_eq!( - outcome.skills, - vec![SkillMetadata { - name: "sample:sample-search".to_string(), - description: "search sample data".to_string(), - short_description: None, - interface: None, - dependencies: None, - policy: None, - path_to_skills_md: normalized(&skill_path), - scope: SkillScope::User, - }] - ); -} - #[tokio::test] async fn loads_short_description_from_metadata() { let codex_home = tempfile::tempdir().expect("tempdir"); diff --git a/vendor/codex/codex-rs/core-skills/src/manager_tests.rs b/vendor/codex/codex-rs/core-skills/src/manager_tests.rs index 73800a51..3ccde7dd 100644 --- a/vendor/codex/codex-rs/core-skills/src/manager_tests.rs +++ b/vendor/codex/codex-rs/core-skills/src/manager_tests.rs @@ -26,28 +26,14 @@ fn write_user_skill(codex_home: &TempDir, dir: &str, name: &str, description: &s fs::write(skill_dir.join("SKILL.md"), content).unwrap(); } -fn write_plugin_skill( - codex_home: &TempDir, - marketplace: &str, - plugin_name: &str, +fn write_extra_root_skill( + root: &TempDir, dir: &str, name: &str, description: &str, ) -> PathBuf { - let plugin_root = codex_home - .path() - .join("plugins/cache") - .join(marketplace) - .join(plugin_name) - .join("local"); - let skill_dir = plugin_root.join("skills").join(dir); - fs::create_dir_all(plugin_root.join(".codex-plugin")).unwrap(); + let skill_dir = root.path().join("skills").join(dir); fs::create_dir_all(&skill_dir).unwrap(); - fs::write( - plugin_root.join(".codex-plugin/plugin.json"), - format!(r#"{{"name":"{plugin_name}"}}"#), - ) - .unwrap(); let content = format!("---\nname: {name}\ndescription: {description}\n---\n\n# Body\n"); let skill_path = skill_dir.join("SKILL.md"); fs::write(&skill_path, content).unwrap(); @@ -202,25 +188,24 @@ async fn skills_for_config_reuses_cache_for_same_effective_config() { } #[tokio::test] -async fn skills_for_config_disables_plugin_skills_by_name() { +async fn skills_for_config_disables_extra_root_skills_by_name() { let codex_home = tempfile::tempdir().expect("tempdir"); let cwd = tempfile::tempdir().expect("tempdir"); - let skill_path = write_plugin_skill( - &codex_home, - "test", - "sample", + let extra_root = tempfile::tempdir().expect("tempdir"); + let skill_path = write_extra_root_skill( + &extra_root, "sample-search", "sample-search", "search sample data", ); let config_layer_stack = config_stack( &codex_home, - &name_toggle_config("sample:sample-search", /*enabled*/ false), + &name_toggle_config("sample-search", /*enabled*/ false), ); - let plugin_skill_root = skill_path + let extra_skill_root = skill_path .parent() .and_then(std::path::Path::parent) - .expect("plugin skill should live under a skills root") + .expect("skill should live under a skills root") .abs(); let skills_manager = SkillsManager::new( codex_home.path().abs(), @@ -231,14 +216,14 @@ async fn skills_for_config_disables_plugin_skills_by_name() { &skills_manager, &cwd, &config_layer_stack, - &[plugin_skill_root], + &[extra_skill_root], ) .await; let skill = outcome .skills .iter() - .find(|skill| skill.name == "sample:sample-search") - .expect("plugin skill should load"); + .find(|skill| skill.name == "sample-search") + .expect("extra root skill should load"); let skill_path = dunce::canonicalize(skill_path) .expect("skill path should canonicalize") .abs(); diff --git a/vendor/codex/codex-rs/core/Cargo.toml b/vendor/codex/codex-rs/core/Cargo.toml index f9cbfff0..ad03899e 100644 --- a/vendor/codex/codex-rs/core/Cargo.toml +++ b/vendor/codex/codex-rs/core/Cargo.toml @@ -65,7 +65,6 @@ codex-utils-image = { workspace = true } codex-utils-home-dir = { workspace = true } codex-utils-output-truncation = { workspace = true } codex-utils-path = { workspace = true } -codex-utils-plugins = { workspace = true } codex-utils-pty = { workspace = true } codex-utils-readiness = { workspace = true } codex-secrets = { workspace = true } diff --git a/vendor/codex/codex-rs/core/src/agent/role_tests.rs b/vendor/codex/codex-rs/core/src/agent/role_tests.rs index f379fbef..611fc238 100644 --- a/vendor/codex/codex-rs/core/src/agent/role_tests.rs +++ b/vendor/codex/codex-rs/core/src/agent/role_tests.rs @@ -1,18 +1,13 @@ use super::*; -use crate::SkillsManager; use crate::config::CONFIG_TOML_FILE; use crate::config::ConfigBuilder; use crate::config_loader::ConfigLayerStackOrdering; -use crate::plugins::PluginsManager; -use crate::skills_load_input_from_config; use codex_protocol::config_types::ReasoningSummary; use codex_protocol::config_types::Verbosity; use codex_protocol::openai_models::ReasoningEffort; -use codex_utils_absolute_path::test_support::PathExt; use pretty_assertions::assert_eq; use std::fs; use std::path::PathBuf; -use std::sync::Arc; use tempfile::TempDir; async fn test_config_with_cli_overrides( @@ -613,66 +608,6 @@ async fn apply_role_takes_precedence_over_existing_session_flags_for_same_key() assert_eq!(session_flags_layer_count(&config), before_layers + 1); } -#[cfg_attr(windows, ignore)] -#[tokio::test] -async fn apply_role_skills_config_disables_skill_for_spawned_agent() { - let (home, mut config) = test_config_with_cli_overrides(Vec::new()).await; - let skill_dir = home.path().join("skills").join("demo"); - fs::create_dir_all(&skill_dir).expect("create skill dir"); - let skill_path = skill_dir.join("SKILL.md"); - fs::write( - &skill_path, - "---\nname: demo-skill\ndescription: demo description\n---\n\n# Body\n", - ) - .expect("write skill"); - let role_path = write_role_config( - &home, - "skills-role.toml", - &format!( - r#"developer_instructions = "Stay focused" - -[[skills.config]] -path = "{}" -enabled = false -"#, - skill_path.display() - ), - ) - .await; - config.agent_roles.insert( - "custom".to_string(), - AgentRoleConfig { - description: None, - config_file: Some(role_path), - nickname_candidates: None, - }, - ); - - apply_role_to_config(&mut config, Some("custom")) - .await - .expect("custom role should apply"); - - let plugins_manager = Arc::new(PluginsManager::new(home.path().to_path_buf())); - let skills_manager = - SkillsManager::new(home.path().abs(), /*bundled_skills_enabled*/ true); - let plugin_outcome = plugins_manager.plugins_for_config(&config).await; - let effective_skill_roots = plugin_outcome.effective_skill_roots(); - let skills_input = skills_load_input_from_config(&config, effective_skill_roots); - let outcome = skills_manager - .skills_for_config( - &skills_input, - Some(Arc::clone(&codex_exec_server::LOCAL_FS)), - ) - .await; - let skill = outcome - .skills - .iter() - .find(|skill| skill.name == "demo-skill") - .expect("demo skill should be discovered"); - - assert_eq!(outcome.is_skill_enabled(skill), false); -} - #[test] fn spawn_tool_spec_build_deduplicates_user_defined_built_in_roles() { let user_defined_roles = BTreeMap::from([ diff --git a/vendor/codex/codex-rs/core/src/mention_syntax.rs b/vendor/codex/codex-rs/core/src/mention_syntax.rs index 690cd1a2..3ea9a969 100644 --- a/vendor/codex/codex-rs/core/src/mention_syntax.rs +++ b/vendor/codex/codex-rs/core/src/mention_syntax.rs @@ -1,2 +1,2 @@ -pub use codex_utils_plugins::mention_syntax::PLUGIN_TEXT_MENTION_SIGIL; -pub use codex_utils_plugins::mention_syntax::TOOL_MENTION_SIGIL; +pub const PLUGIN_TEXT_MENTION_SIGIL: char = '@'; +pub const TOOL_MENTION_SIGIL: char = '$'; diff --git a/vendor/codex/codex-rs/core/src/session/tests.rs b/vendor/codex/codex-rs/core/src/session/tests.rs index 8226e2a1..9249f504 100644 --- a/vendor/codex/codex-rs/core/src/session/tests.rs +++ b/vendor/codex/codex-rs/core/src/session/tests.rs @@ -14,12 +14,15 @@ use crate::context::TurnAborted; use crate::exec::ExecCapturePolicy; use crate::function_tool::FunctionCallError; use crate::shell::default_user_shell; +use crate::skills::build_available_skills; use crate::skills::SkillRenderSideEffects; use crate::skills::render::SkillMetadataBudget; use crate::tools::format_exec_output_str; use codex_features::Feature; use codex_features::Features; +use codex_core_skills::SkillMetadata; +use codex_core_skills::SkillsLoadInput; use codex_login::CodexAuth; use codex_model_provider_info::ModelProviderInfo; use codex_models_manager::bundled_models_response; @@ -158,12 +161,25 @@ use pretty_assertions::assert_eq; use regex_lite::Regex; use serde::Deserialize; use serde_json::json; +use std::collections::HashSet; use std::path::PathBuf; use std::sync::Arc; use std::time::Duration as StdDuration; mod guardian_tests; +fn skills_load_input_from_config( + config: &Config, + effective_skill_roots: Vec, +) -> SkillsLoadInput { + SkillsLoadInput::new( + config.cwd.clone(), + effective_skill_roots, + config.config_layer_stack.clone(), + config.bundled_skills_enabled(), + ) +} + fn sample_epiphany_state_for_persistence() -> EpiphanyThreadState { EpiphanyThreadState { revision: 1, @@ -2966,7 +2982,7 @@ async fn new_default_turn_uses_config_aware_skills_for_role_overrides() { .services .skills_manager .skills_for_cwd( - &crate::skills_load_input_from_config(&parent_config, Vec::new()), + &skills_load_input_from_config(&parent_config, Vec::new()), /*force_reload*/ true, Some(Arc::clone(&skill_fs)), ) @@ -3164,7 +3180,6 @@ async fn session_new_fails_when_zsh_fork_enabled_without_zsh_path() { let (tx_event, _rx_event) = async_channel::unbounded(); let (agent_status_tx, _agent_status_rx) = watch::channel(AgentStatus::PendingInit); - let plugins_manager = Arc::new(PluginsManager::new(config.codex_home.to_path_buf())); let mcp_manager = Arc::new(McpManager::new()); let skills_manager = Arc::new(SkillsManager::new( config.codex_home.clone(), @@ -3181,7 +3196,6 @@ async fn session_new_fails_when_zsh_fork_enabled_without_zsh_path() { InitialHistory::New, SessionSource::Exec, skills_manager, - plugins_manager, mcp_manager, Arc::new(SkillsWatcher::noop()), AgentControl::default(), @@ -3276,7 +3290,6 @@ pub(crate) async fn make_session_and_context() -> (Session, TurnContext) { ); let state = SessionState::new(session_configuration.clone()); - let plugins_manager = Arc::new(PluginsManager::new(config.codex_home.to_path_buf())); let mcp_manager = Arc::new(McpManager::new()); let skills_manager = Arc::new(SkillsManager::new( config.codex_home.clone(), @@ -3323,7 +3336,6 @@ pub(crate) async fn make_session_and_context() -> (Session, TurnContext) { guardian_rejection_circuit_breaker: Mutex::new(Default::default()), runtime_handle: tokio::runtime::Handle::current(), skills_manager, - plugins_manager, mcp_manager, skills_watcher, agent_control, @@ -3354,13 +3366,7 @@ pub(crate) async fn make_session_and_context() -> (Session, TurnContext) { config.js_repl_node_module_dirs.clone(), )); - let plugin_outcome = services - .plugins_manager - .plugins_for_config(&per_turn_config) - .await; - let effective_skill_roots = plugin_outcome.effective_skill_roots(); - let skills_input = - crate::skills_load_input_from_config(&per_turn_config, effective_skill_roots); + let skills_input = skills_load_input_from_config(&per_turn_config, Vec::new()); let skill_fs = environment.get_filesystem(); let skills_outcome = Arc::new( services @@ -3482,7 +3488,6 @@ async fn make_session_with_config_and_rx( let (tx_event, rx_event) = async_channel::unbounded(); let (agent_status_tx, _agent_status_rx) = watch::channel(AgentStatus::PendingInit); - let plugins_manager = Arc::new(PluginsManager::new(config.codex_home.to_path_buf())); let mcp_manager = Arc::new(McpManager::new()); let skills_manager = Arc::new(SkillsManager::new( config.codex_home.clone(), @@ -3500,7 +3505,6 @@ async fn make_session_with_config_and_rx( InitialHistory::New, SessionSource::Exec, skills_manager, - plugins_manager, mcp_manager, Arc::new(SkillsWatcher::noop()), AgentControl::default(), @@ -4588,7 +4592,6 @@ pub(crate) async fn make_session_and_context_with_dynamic_tools_and_rx( ); let state = SessionState::new(session_configuration.clone()); - let plugins_manager = Arc::new(PluginsManager::new(config.codex_home.to_path_buf())); let mcp_manager = Arc::new(McpManager::new()); let skills_manager = Arc::new(SkillsManager::new( config.codex_home.clone(), @@ -4635,7 +4638,6 @@ pub(crate) async fn make_session_and_context_with_dynamic_tools_and_rx( guardian_rejection_circuit_breaker: Mutex::new(Default::default()), runtime_handle: tokio::runtime::Handle::current(), skills_manager, - plugins_manager, mcp_manager, skills_watcher, agent_control, @@ -4666,13 +4668,7 @@ pub(crate) async fn make_session_and_context_with_dynamic_tools_and_rx( config.js_repl_node_module_dirs.clone(), )); - let plugin_outcome = services - .plugins_manager - .plugins_for_config(&per_turn_config) - .await; - let effective_skill_roots = plugin_outcome.effective_skill_roots(); - let skills_input = - crate::skills_load_input_from_config(&per_turn_config, effective_skill_roots); + let skills_input = skills_load_input_from_config(&per_turn_config, Vec::new()); let skill_fs = environment.get_filesystem(); let skills_outcome = Arc::new( services diff --git a/vendor/codex/codex-rs/core/src/session/tests/guardian_tests.rs b/vendor/codex/codex-rs/core/src/session/tests/guardian_tests.rs index 38cba37d..7bcd2839 100644 --- a/vendor/codex/codex-rs/core/src/session/tests/guardian_tests.rs +++ b/vendor/codex/codex-rs/core/src/session/tests/guardian_tests.rs @@ -737,7 +737,6 @@ async fn guardian_subagent_does_not_inherit_parent_exec_policy_rules() { /*model_catalog*/ None, CollaborationModesConfig::default(), )); - let plugins_manager = Arc::new(PluginsManager::new(config.codex_home.to_path_buf())); let skills_manager = Arc::new(SkillsManager::new( config.codex_home.clone(), /*bundled_skills_enabled*/ true, @@ -751,7 +750,6 @@ async fn guardian_subagent_does_not_inherit_parent_exec_policy_rules() { models_manager, environment_manager: Arc::new(EnvironmentManager::default_for_tests()), skills_manager, - plugins_manager, mcp_manager, skills_watcher, conversation_history: InitialHistory::New, diff --git a/vendor/codex/codex-rs/core/src/tools/spec_tests.rs b/vendor/codex/codex-rs/core/src/tools/spec_tests.rs index a1e685df..ac800c02 100644 --- a/vendor/codex/codex-rs/core/src/tools/spec_tests.rs +++ b/vendor/codex/codex-rs/core/src/tools/spec_tests.rs @@ -7,7 +7,6 @@ use crate::tools::router::ToolRouterParams; use codex_app_server_protocol::AppInfo; use codex_features::Feature; use codex_features::Features; -use codex_mcp::CODEX_APPS_MCP_SERVER_NAME; use codex_models_manager::bundled_models_response; use codex_models_manager::model_info::with_config_overrides; use codex_protocol::config_types::WebSearchMode; @@ -886,7 +885,7 @@ async fn search_tool_description_falls_back_to_connector_name_without_descriptio Some(HashMap::from([( "mcp__codex_apps__calendar_create_event".to_string(), ToolInfo { - server_name: CODEX_APPS_MCP_SERVER_NAME.to_string(), + server_name: "codex_apps".to_string(), callable_name: "_create_event".to_string(), callable_namespace: "mcp__codex_apps__calendar".to_string(), server_instructions: None, @@ -938,7 +937,7 @@ async fn search_tool_registers_namespaced_mcp_tool_aliases() { ( "mcp__codex_apps__calendar_create_event".to_string(), ToolInfo { - server_name: CODEX_APPS_MCP_SERVER_NAME.to_string(), + server_name: "codex_apps".to_string(), callable_name: "_create_event".to_string(), callable_namespace: "mcp__codex_apps__calendar".to_string(), server_instructions: None, @@ -956,7 +955,7 @@ async fn search_tool_registers_namespaced_mcp_tool_aliases() { ( "mcp__codex_apps__calendar_list_events".to_string(), ToolInfo { - server_name: CODEX_APPS_MCP_SERVER_NAME.to_string(), + server_name: "codex_apps".to_string(), callable_name: "_list_events".to_string(), callable_namespace: "mcp__codex_apps__calendar".to_string(), server_instructions: None, diff --git a/vendor/codex/codex-rs/core/tests/suite/mod.rs b/vendor/codex/codex-rs/core/tests/suite/mod.rs index 313aad41..ee9ac8b8 100644 --- a/vendor/codex/codex-rs/core/tests/suite/mod.rs +++ b/vendor/codex/codex-rs/core/tests/suite/mod.rs @@ -64,7 +64,6 @@ mod pending_input; mod permissions_messages; mod personality; mod personality_migration; -mod plugins; mod prompt_caching; mod prompt_debug_tests; mod quota_exceeded; diff --git a/vendor/codex/codex-rs/core/tests/suite/plugins.rs b/vendor/codex/codex-rs/core/tests/suite/plugins.rs deleted file mode 100644 index 07602c1b..00000000 --- a/vendor/codex/codex-rs/core/tests/suite/plugins.rs +++ /dev/null @@ -1,444 +0,0 @@ -#![cfg(not(target_os = "windows"))] -#![allow(clippy::unwrap_used, clippy::expect_used)] - -use std::sync::Arc; -use std::time::Duration; -use std::time::Instant; - -use anyhow::Result; -use codex_features::Feature; -use codex_login::CodexAuth; -use codex_protocol::protocol::EventMsg; -use codex_protocol::protocol::Op; -use core_test_support::apps_test_server::AppsTestServer; -use core_test_support::responses::ev_completed; -use core_test_support::responses::ev_response_created; -use core_test_support::responses::mount_sse_once; -use core_test_support::responses::sse; -use core_test_support::responses::start_mock_server; -use core_test_support::skip_if_no_network; -use core_test_support::stdio_server_bin; -use core_test_support::test_codex::test_codex; -use core_test_support::wait_for_event; -use core_test_support::wait_for_event_with_timeout; -use tempfile::TempDir; -use wiremock::MockServer; - -const SAMPLE_PLUGIN_CONFIG_NAME: &str = "sample@test"; -const SAMPLE_PLUGIN_DISPLAY_NAME: &str = "sample"; -const SAMPLE_PLUGIN_DESCRIPTION: &str = "inspect sample data"; - -fn sample_plugin_root(home: &TempDir) -> std::path::PathBuf { - home.path().join("plugins/cache/test/sample/local") -} - -fn write_sample_plugin_manifest_and_config(home: &TempDir) -> std::path::PathBuf { - let plugin_root = sample_plugin_root(home); - std::fs::create_dir_all(plugin_root.join(".codex-plugin")).expect("create plugin manifest dir"); - std::fs::write( - plugin_root.join(".codex-plugin/plugin.json"), - format!( - r#"{{"name":"{SAMPLE_PLUGIN_DISPLAY_NAME}","description":"{SAMPLE_PLUGIN_DESCRIPTION}"}}"# - ), - ) - .expect("write plugin manifest"); - std::fs::write( - home.path().join("config.toml"), - format!( - "[features]\nplugins = true\n\n[plugins.\"{SAMPLE_PLUGIN_CONFIG_NAME}\"]\nenabled = true\n" - ), - ) - .expect("write config"); - plugin_root -} - -fn write_plugin_skill_plugin(home: &TempDir) -> std::path::PathBuf { - let plugin_root = write_sample_plugin_manifest_and_config(home); - let skill_dir = plugin_root.join("skills/sample-search"); - std::fs::create_dir_all(skill_dir.as_path()).expect("create plugin skill dir"); - std::fs::write( - skill_dir.join("SKILL.md"), - "---\ndescription: inspect sample data\n---\n\n# body\n", - ) - .expect("write plugin skill"); - skill_dir.join("SKILL.md") -} - -fn write_plugin_mcp_plugin(home: &TempDir, command: &str) { - let plugin_root = write_sample_plugin_manifest_and_config(home); - std::fs::write( - plugin_root.join(".mcp.json"), - format!( - r#"{{ - "mcpServers": {{ - "sample": {{ - "command": "{command}" - }} - }} -}}"# - ), - ) - .expect("write plugin mcp config"); -} - -fn write_plugin_app_plugin(home: &TempDir) { - let plugin_root = write_sample_plugin_manifest_and_config(home); - std::fs::write( - plugin_root.join(".app.json"), - r#"{ - "apps": { - "calendar": { - "id": "calendar" - } - } -}"#, - ) - .expect("write plugin app config"); -} - -async fn build_plugin_test_codex( - server: &MockServer, - codex_home: Arc, -) -> Result> { - let mut builder = test_codex() - .with_home(codex_home) - .with_auth(CodexAuth::from_api_key("Test API Key")); - Ok(builder - .build(server) - .await - .expect("create new conversation") - .codex) -} - -async fn build_analytics_plugin_test_codex( - server: &MockServer, - codex_home: Arc, -) -> Result> { - let chatgpt_base_url = server.uri(); - let mut builder = test_codex() - .with_home(codex_home) - .with_auth(CodexAuth::create_dummy_chatgpt_auth_for_testing()) - .with_model("gpt-5.2") - .with_config(move |config| { - config.chatgpt_base_url = chatgpt_base_url; - }); - Ok(builder - .build(server) - .await - .expect("create new conversation") - .codex) -} - -async fn build_apps_enabled_plugin_test_codex( - server: &MockServer, - codex_home: Arc, - chatgpt_base_url: String, -) -> Result> { - let mut builder = test_codex() - .with_home(codex_home) - .with_auth(CodexAuth::create_dummy_chatgpt_auth_for_testing()) - .with_config(move |config| { - config - .features - .enable(Feature::Apps) - .expect("test config should allow feature update"); - config.chatgpt_base_url = chatgpt_base_url; - }); - Ok(builder - .build(server) - .await - .expect("create new conversation") - .codex) -} - -fn tool_names(body: &serde_json::Value) -> Vec { - body.get("tools") - .and_then(serde_json::Value::as_array) - .map(|tools| { - tools - .iter() - .filter_map(|tool| { - tool.get("name") - .or_else(|| tool.get("type")) - .and_then(serde_json::Value::as_str) - .map(str::to_string) - }) - .collect() - }) - .unwrap_or_default() -} - -#[tokio::test(flavor = "multi_thread", worker_threads = 2)] -async fn capability_sections_render_in_developer_message_in_order() -> Result<()> { - skip_if_no_network!(Ok(())); - let server = start_mock_server().await; - let apps_server = AppsTestServer::mount_with_connector_name(&server, "Google Calendar").await?; - - let resp_mock = mount_sse_once( - &server, - sse(vec![ev_response_created("resp1"), ev_completed("resp1")]), - ) - .await; - - let codex_home = Arc::new(TempDir::new()?); - write_plugin_skill_plugin(codex_home.as_ref()); - write_plugin_app_plugin(codex_home.as_ref()); - let codex = build_apps_enabled_plugin_test_codex( - &server, - Arc::clone(&codex_home), - apps_server.chatgpt_base_url, - ) - .await?; - - codex - .submit(Op::UserInput { - environments: None, - items: vec![codex_protocol::user_input::UserInput::Text { - text: "hello".into(), - text_elements: Vec::new(), - }], - final_output_json_schema: None, - responsesapi_client_metadata: None, - }) - .await?; - - wait_for_event(&codex, |ev| matches!(ev, EventMsg::TurnComplete(_))).await; - - let request = resp_mock.single_request(); - let developer_messages = request.message_input_texts("developer"); - let developer_text = developer_messages.join("\n\n"); - let apps_pos = developer_text - .find("## Apps") - .expect("expected apps section in developer message"); - let skills_pos = developer_text - .find("## Skills") - .expect("expected skills section in developer message"); - let plugins_pos = developer_text - .find("## Plugins") - .expect("expected plugins section in developer message"); - assert!( - apps_pos < skills_pos && skills_pos < plugins_pos, - "expected Apps -> Skills -> Plugins order: {developer_messages:?}" - ); - assert!( - developer_text.contains("`sample`"), - "expected enabled plugin name in developer message: {developer_messages:?}" - ); - assert!( - developer_text.contains("`sample`: inspect sample data"), - "expected plugin description in developer message: {developer_messages:?}" - ); - assert!( - developer_text.contains("skill entries are prefixed with `plugin_name:`"), - "expected plugin skill naming guidance in developer message: {developer_messages:?}" - ); - assert!( - developer_text.contains("sample:sample-search: inspect sample data"), - "expected namespaced plugin skill summary in developer message: {developer_messages:?}" - ); - - Ok(()) -} - -#[tokio::test(flavor = "multi_thread", worker_threads = 2)] -async fn explicit_plugin_mentions_inject_plugin_guidance() -> Result<()> { - skip_if_no_network!(Ok(())); - let server = start_mock_server().await; - let apps_server = AppsTestServer::mount_with_connector_name(&server, "Google Calendar").await?; - let mock = mount_sse_once( - &server, - sse(vec![ev_response_created("resp-1"), ev_completed("resp-1")]), - ) - .await; - - let codex_home = Arc::new(TempDir::new()?); - let rmcp_test_server_bin = match stdio_server_bin() { - Ok(bin) => bin, - Err(err) => { - eprintln!("test_stdio_server binary not available, skipping test: {err}"); - return Ok(()); - } - }; - write_plugin_skill_plugin(codex_home.as_ref()); - write_plugin_mcp_plugin(codex_home.as_ref(), &rmcp_test_server_bin); - write_plugin_app_plugin(codex_home.as_ref()); - - let codex = - build_apps_enabled_plugin_test_codex(&server, codex_home, apps_server.chatgpt_base_url) - .await?; - - codex - .submit(Op::UserInput { - environments: None, - items: vec![codex_protocol::user_input::UserInput::Mention { - name: "sample".into(), - path: format!("plugin://{SAMPLE_PLUGIN_CONFIG_NAME}"), - }], - final_output_json_schema: None, - responsesapi_client_metadata: None, - }) - .await?; - wait_for_event(&codex, |ev| matches!(ev, EventMsg::TurnComplete(_))).await; - - let request = mock.single_request(); - let developer_messages = request.message_input_texts("developer"); - assert!( - developer_messages - .iter() - .any(|text| text.contains("Skills from this plugin")), - "expected plugin skills guidance: {developer_messages:?}" - ); - assert!( - developer_messages - .iter() - .any(|text| text.contains("MCP servers from this plugin")), - "expected visible plugin MCP guidance: {developer_messages:?}" - ); - assert!( - developer_messages - .iter() - .any(|text| text.contains("Apps from this plugin")), - "expected visible plugin app guidance: {developer_messages:?}" - ); - let request_body = request.body_json(); - let request_tools = tool_names(&request_body); - assert!( - request_tools - .iter() - .any(|name| name == "mcp__codex_apps__google_calendar"), - "expected plugin app tools to become visible for this turn: {request_tools:?}" - ); - let echo_tool = request - .tool_by_name("mcp__sample__", "echo") - .expect("plugin MCP tool should be present"); - let echo_description = echo_tool - .get("description") - .and_then(serde_json::Value::as_str) - .expect("plugin MCP tool description should be present"); - assert!( - echo_description.contains("This tool is part of plugin `sample`."), - "expected plugin MCP provenance in tool description: {echo_description:?}" - ); - let calendar_tool = request - .tool_by_name("mcp__codex_apps__google_calendar", "_create_event") - .expect("plugin app tool should be present"); - let calendar_description = calendar_tool - .get("description") - .and_then(serde_json::Value::as_str) - .expect("plugin app tool description should be present"); - assert!( - calendar_description.contains("This tool is part of plugin `sample`."), - "expected plugin app provenance in tool description: {calendar_description:?}" - ); - - Ok(()) -} - -#[tokio::test(flavor = "multi_thread", worker_threads = 2)] -async fn explicit_plugin_mentions_track_plugin_used_analytics() -> Result<()> { - skip_if_no_network!(Ok(())); - let server = start_mock_server().await; - let _resp_mock = mount_sse_once( - &server, - sse(vec![ev_response_created("resp-1"), ev_completed("resp-1")]), - ) - .await; - - let codex_home = Arc::new(TempDir::new()?); - write_plugin_skill_plugin(codex_home.as_ref()); - let codex = build_analytics_plugin_test_codex(&server, codex_home).await?; - - codex - .submit(Op::UserInput { - environments: None, - items: vec![codex_protocol::user_input::UserInput::Mention { - name: "sample".into(), - path: format!("plugin://{SAMPLE_PLUGIN_CONFIG_NAME}"), - }], - final_output_json_schema: None, - responsesapi_client_metadata: None, - }) - .await?; - wait_for_event(&codex, |ev| matches!(ev, EventMsg::TurnComplete(_))).await; - - let deadline = Instant::now() + Duration::from_secs(10); - let plugin_event = loop { - let requests = server.received_requests().await.unwrap_or_default(); - if let Some(event) = requests - .into_iter() - .filter(|request| request.url.path() == "/codex/analytics-events/events") - .find_map(|request| { - let payload: serde_json::Value = serde_json::from_slice(&request.body).ok()?; - payload["events"].as_array().and_then(|events| { - events - .iter() - .find(|event| event["event_type"] == "codex_plugin_used") - .cloned() - }) - }) - { - break event; - } - if Instant::now() >= deadline { - panic!("timed out waiting for plugin analytics request"); - } - tokio::time::sleep(Duration::from_millis(50)).await; - }; - - let event = plugin_event; - assert_eq!(event["event_params"]["plugin_id"], "sample@test"); - assert_eq!(event["event_params"]["plugin_name"], "sample"); - assert_eq!(event["event_params"]["marketplace_name"], "test"); - assert_eq!(event["event_params"]["has_skills"], true); - assert_eq!(event["event_params"]["mcp_server_count"], 0); - assert_eq!( - event["event_params"]["connector_ids"], - serde_json::json!([]) - ); - assert_eq!( - event["event_params"]["product_client_id"], - serde_json::json!(codex_login::default_client::originator().value) - ); - assert_eq!(event["event_params"]["model_slug"], "gpt-5.2"); - assert!(event["event_params"]["thread_id"].as_str().is_some()); - assert!(event["event_params"]["turn_id"].as_str().is_some()); - - Ok(()) -} - -#[tokio::test(flavor = "multi_thread", worker_threads = 1)] -async fn plugin_mcp_tools_are_listed() -> Result<()> { - skip_if_no_network!(Ok(())); - let server = start_mock_server().await; - let codex_home = Arc::new(TempDir::new()?); - let rmcp_test_server_bin = stdio_server_bin()?; - write_plugin_mcp_plugin(codex_home.as_ref(), &rmcp_test_server_bin); - let codex = build_plugin_test_codex(&server, codex_home).await?; - - let tools_ready_deadline = Instant::now() + Duration::from_secs(30); - loop { - codex.submit(Op::ListMcpTools).await?; - let list_event = wait_for_event_with_timeout( - &codex, - |ev| matches!(ev, EventMsg::McpListToolsResponse(_)), - Duration::from_secs(10), - ) - .await; - let EventMsg::McpListToolsResponse(tool_list) = list_event else { - unreachable!("event guard guarantees McpListToolsResponse"); - }; - if tool_list.tools.contains_key("mcp__sample__echo") - && tool_list.tools.contains_key("mcp__sample__image") - { - break; - } - - let available_tools: Vec<&str> = tool_list.tools.keys().map(String::as_str).collect(); - if Instant::now() >= tools_ready_deadline { - panic!("timed out waiting for plugin MCP tools; discovered tools: {available_tools:?}"); - } - tokio::time::sleep(Duration::from_millis(200)).await; - } - - Ok(()) -} diff --git a/vendor/codex/codex-rs/utils/plugins/BUILD.bazel b/vendor/codex/codex-rs/utils/plugins/BUILD.bazel deleted file mode 100644 index 273e98fc..00000000 --- a/vendor/codex/codex-rs/utils/plugins/BUILD.bazel +++ /dev/null @@ -1,6 +0,0 @@ -load("//:defs.bzl", "codex_rust_crate") - -codex_rust_crate( - name = "plugins", - crate_name = "codex_utils_plugins", -) diff --git a/vendor/codex/codex-rs/utils/plugins/Cargo.toml b/vendor/codex/codex-rs/utils/plugins/Cargo.toml deleted file mode 100644 index 983f4526..00000000 --- a/vendor/codex/codex-rs/utils/plugins/Cargo.toml +++ /dev/null @@ -1,25 +0,0 @@ - -[package] -edition.workspace = true -license.workspace = true -name = "codex-utils-plugins" -version.workspace = true - -[lib] -doctest = false -name = "codex_utils_plugins" -path = "src/lib.rs" - -[lints] -workspace = true - -[dependencies] -codex-exec-server = { workspace = true } -codex-login = { workspace = true } -codex-utils-absolute-path = { workspace = true } -serde = { workspace = true, features = ["derive"] } -serde_json = { workspace = true } - -[dev-dependencies] -tempfile = { workspace = true } -tokio = { workspace = true, features = ["macros", "rt"] } diff --git a/vendor/codex/codex-rs/utils/plugins/src/lib.rs b/vendor/codex/codex-rs/utils/plugins/src/lib.rs deleted file mode 100644 index 8a8ada46..00000000 --- a/vendor/codex/codex-rs/utils/plugins/src/lib.rs +++ /dev/null @@ -1,9 +0,0 @@ -//! Plugin path resolution, plaintext mention sigils, and MCP connector helpers shared across Codex -//! crates. - -pub mod mcp_connector; -pub mod mention_syntax; -pub mod plugin_namespace; - -pub use plugin_namespace::find_plugin_manifest_path; -pub use plugin_namespace::plugin_namespace_for_skill_path; diff --git a/vendor/codex/codex-rs/utils/plugins/src/mcp_connector.rs b/vendor/codex/codex-rs/utils/plugins/src/mcp_connector.rs deleted file mode 100644 index 40fb0d4b..00000000 --- a/vendor/codex/codex-rs/utils/plugins/src/mcp_connector.rs +++ /dev/null @@ -1,50 +0,0 @@ -use codex_login::default_client::is_first_party_chat_originator; -use codex_login::default_client::originator; - -const DISALLOWED_CONNECTOR_IDS: &[&str] = &[ - "asdk_app_6938a94a61d881918ef32cb999ff937c", - "connector_2b0a9009c9c64bf9933a3dae3f2b1254", - "connector_3f8d1a79f27c4c7ba1a897ab13bf37dc", - "connector_68de829bf7648191acd70a907364c67c", - "connector_68e004f14af881919eb50893d3d9f523", - "connector_69272cb413a081919685ec3c88d1744e", -]; -const FIRST_PARTY_CHAT_DISALLOWED_CONNECTOR_IDS: &[&str] = - &["connector_0f9c9d4592e54d0a9a12b3f44a1e2010"]; -const DISALLOWED_CONNECTOR_PREFIX: &str = "connector_openai_"; - -pub fn is_connector_id_allowed(connector_id: &str) -> bool { - is_connector_id_allowed_for_originator(connector_id, originator().value.as_str()) -} - -fn is_connector_id_allowed_for_originator(connector_id: &str, originator_value: &str) -> bool { - let disallowed_connector_ids = if is_first_party_chat_originator(originator_value) { - FIRST_PARTY_CHAT_DISALLOWED_CONNECTOR_IDS - } else { - DISALLOWED_CONNECTOR_IDS - }; - - !connector_id.starts_with(DISALLOWED_CONNECTOR_PREFIX) - && !disallowed_connector_ids.contains(&connector_id) -} - -pub fn sanitize_name(name: &str) -> String { - sanitize_slug(name).replace("-", "_") -} - -fn sanitize_slug(name: &str) -> String { - let mut normalized = String::with_capacity(name.len()); - for character in name.chars() { - if character.is_ascii_alphanumeric() { - normalized.push(character.to_ascii_lowercase()); - } else { - normalized.push('-'); - } - } - let normalized = normalized.trim_matches('-'); - if normalized.is_empty() { - "app".to_string() - } else { - normalized.to_string() - } -} diff --git a/vendor/codex/codex-rs/utils/plugins/src/mention_syntax.rs b/vendor/codex/codex-rs/utils/plugins/src/mention_syntax.rs deleted file mode 100644 index de5d1432..00000000 --- a/vendor/codex/codex-rs/utils/plugins/src/mention_syntax.rs +++ /dev/null @@ -1,7 +0,0 @@ -//! Sigils for tool/plugin mentions in plaintext (shared across Codex crates). - -/// Default plaintext sigil for tools. -pub const TOOL_MENTION_SIGIL: char = '$'; - -/// Plugins use `@` in linked plaintext outside TUI. -pub const PLUGIN_TEXT_MENTION_SIGIL: char = '@'; diff --git a/vendor/codex/codex-rs/utils/plugins/src/plugin_namespace.rs b/vendor/codex/codex-rs/utils/plugins/src/plugin_namespace.rs deleted file mode 100644 index ea5caab5..00000000 --- a/vendor/codex/codex-rs/utils/plugins/src/plugin_namespace.rs +++ /dev/null @@ -1,121 +0,0 @@ -//! 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 std::path::Path; -use std::path::PathBuf; - -const DISCOVERABLE_PLUGIN_MANIFEST_PATHS: &[&str] = - &[".codex-plugin/plugin.json", ".claude-plugin/plugin.json"]; - -pub fn find_plugin_manifest_path(plugin_root: &Path) -> Option { - 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, -} - -async fn plugin_manifest_name( - fs: &dyn ExecutorFileSystem, - plugin_root: &AbsolutePathBuf, -) -> Option { - let mut manifest_path = None; - for relative_path in DISCOVERABLE_PLUGIN_MANIFEST_PATHS { - let candidate = plugin_root.join(relative_path); - match fs.get_metadata(&candidate, /*sandbox*/ None).await { - Ok(metadata) if metadata.is_file => { - manifest_path = Some(candidate); - break; - } - Ok(_) | Err(_) => {} - } - } - let manifest_path = manifest_path?; - 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 - .file_name() - .and_then(|entry| entry.to_str()) - .filter(|_| raw_name.trim().is_empty()) - .unwrap_or(raw_name.as_str()) - .to_string(), - ) -} - -/// 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 { - for ancestor in path.ancestors() { - if let Some(name) = plugin_manifest_name(fs, &ancestor).await { - return Some(name); - } - } - 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)); - } -}