diff --git a/codex-rs/core-skills/src/skills/injection.rs b/codex-rs/core-skills/src/skills/injection.rs index 4cfb27f963..5453f97dbe 100644 --- a/codex-rs/core-skills/src/skills/injection.rs +++ b/codex-rs/core-skills/src/skills/injection.rs @@ -10,9 +10,9 @@ use codex_analytics::SkillInvocation; use codex_analytics::TrackEventsContext; use codex_instructions::SkillInstructions; use codex_otel::SessionTelemetry; -use codex_utils_plugins::mention_syntax::TOOL_MENTION_SIGIL; use codex_protocol::models::ResponseItem; use codex_protocol::user_input::UserInput; +use codex_utils_plugins::mention_syntax::TOOL_MENTION_SIGIL; use tokio::fs; #[derive(Debug, Default)] diff --git a/codex-rs/core-skills/src/skills/loader.rs b/codex-rs/core-skills/src/skills/loader.rs index 7e5fd19a08..45674a79c4 100644 --- a/codex-rs/core-skills/src/skills/loader.rs +++ b/codex-rs/core-skills/src/skills/loader.rs @@ -13,7 +13,6 @@ use codex_config::ConfigLayerStackOrdering; use codex_config::default_project_root_markers; use codex_config::merge_toml_values; use codex_config::project_root_markers_from_config; -use codex_utils_plugins::plugin_namespace_for_skill_path; use codex_protocol::models::FileSystemPermissions; use codex_protocol::models::MacOsSeatbeltProfileExtensions; use codex_protocol::models::NetworkPermissions; @@ -21,6 +20,7 @@ use codex_protocol::models::PermissionProfile; use codex_protocol::protocol::Product; use codex_protocol::protocol::SkillScope; use codex_utils_absolute_path::AbsolutePathBufGuard; +use codex_utils_plugins::plugin_namespace_for_skill_path; use dirs::home_dir; use dunce::canonicalize as canonicalize_path; use serde::Deserialize; diff --git a/codex-rs/core/src/plugins/manifest.rs b/codex-rs/core/src/plugins/manifest.rs index 6ccc6e239b..8fbacb4565 100644 --- a/codex-rs/core/src/plugins/manifest.rs +++ b/codex-rs/core/src/plugins/manifest.rs @@ -1,5 +1,5 @@ -use codex_utils_plugins::PLUGIN_MANIFEST_PATH; use codex_utils_absolute_path::AbsolutePathBuf; +use codex_utils_plugins::PLUGIN_MANIFEST_PATH; use serde::Deserialize; use serde_json::Value as JsonValue; use std::fs; diff --git a/codex-rs/core/src/plugins/store.rs b/codex-rs/core/src/plugins/store.rs index b6cd7f6803..faa7fc0812 100644 --- a/codex-rs/core/src/plugins/store.rs +++ b/codex-rs/core/src/plugins/store.rs @@ -1,8 +1,8 @@ use super::load_plugin_manifest; -use codex_utils_plugins::PLUGIN_MANIFEST_PATH; use codex_plugin::PluginId; use codex_plugin::validate_plugin_segment; use codex_utils_absolute_path::AbsolutePathBuf; +use codex_utils_plugins::PLUGIN_MANIFEST_PATH; use std::fs; use std::io; use std::path::Path; diff --git a/codex-rs/plugin/src/lib.rs b/codex-rs/plugin/src/lib.rs index ae3eae7d9f..7b56cd3faf 100644 --- a/codex-rs/plugin/src/lib.rs +++ b/codex-rs/plugin/src/lib.rs @@ -1,7 +1,7 @@ //! Shared plugin identifiers and telemetry-facing summaries. -pub use codex_utils_plugins::mention_syntax; pub use codex_utils_plugins::PLUGIN_MANIFEST_PATH; +pub use codex_utils_plugins::mention_syntax; pub use codex_utils_plugins::plugin_namespace_for_skill_path; mod load_outcome;