From bb9dcc5982c57a65f892c3c53c35bc8cb776a1ef Mon Sep 17 00:00:00 2001
From: Ahmed Ibrahim <219906144+aibrahim-oai@users.noreply.github.com>
Date: Wed, 18 Mar 2026 05:15:54 +0000
Subject: [PATCH] codex: fix CI failure on PR #15028

Co-authored-by: Codex <noreply@openai.com>
---
 codex-rs/Cargo.lock                      | 13 +++++++++++++
 codex-rs/core/src/plugins/mod.rs         | 10 +++++-----
 codex-rs/core/src/skills/mod.rs          |  8 ++++----
 codex-rs/extensions/src/plugins/store.rs |  4 ++--
 4 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/codex-rs/Cargo.lock b/codex-rs/Cargo.lock
index 0edb8df79e..19f349e07d 100644
--- a/codex-rs/Cargo.lock
+++ b/codex-rs/Cargo.lock
@@ -1845,6 +1845,7 @@ dependencies = [
  "codex-config",
  "codex-connectors",
  "codex-execpolicy",
+ "codex-extensions",
  "codex-file-search",
  "codex-git",
  "codex-hooks",
@@ -2036,6 +2037,18 @@ dependencies = [
  "syn 2.0.114",
 ]
 
+[[package]]
+name = "codex-extensions"
+version = "0.0.0"
+dependencies = [
+ "codex-protocol",
+ "codex-utils-absolute-path",
+ "serde",
+ "serde_json",
+ "thiserror 2.0.18",
+ "tracing",
+]
+
 [[package]]
 name = "codex-feedback"
 version = "0.0.0"
diff --git a/codex-rs/core/src/plugins/mod.rs b/codex-rs/core/src/plugins/mod.rs
index 9f14384df0..76a402abc9 100644
--- a/codex-rs/core/src/plugins/mod.rs
+++ b/codex-rs/core/src/plugins/mod.rs
@@ -11,16 +11,16 @@ mod store;
 pub(crate) mod test_support;
 mod toggles;
 
-pub(crate) use curated_repo::curated_plugins_repo_path;
-pub(crate) use curated_repo::read_curated_plugins_sha;
-pub(crate) use curated_repo::sync_openai_plugins_repo;
-pub(crate) use discoverable::list_tool_suggest_discoverable_plugins;
-pub(crate) use injection::build_plugin_injections;
 pub use codex_extensions::plugins::AppConnectorId;
 pub use codex_extensions::plugins::PluginCapabilitySummary;
 pub use codex_extensions::plugins::PluginId;
 pub use codex_extensions::plugins::PluginManifestInterfaceSummary;
 pub use codex_extensions::plugins::PluginTelemetryMetadata;
+pub(crate) use curated_repo::curated_plugins_repo_path;
+pub(crate) use curated_repo::read_curated_plugins_sha;
+pub(crate) use curated_repo::sync_openai_plugins_repo;
+pub(crate) use discoverable::list_tool_suggest_discoverable_plugins;
+pub(crate) use injection::build_plugin_injections;
 pub use manager::ConfiguredMarketplacePluginSummary;
 pub use manager::ConfiguredMarketplaceSummary;
 pub use manager::LoadedPlugin;
diff --git a/codex-rs/core/src/skills/mod.rs b/codex-rs/core/src/skills/mod.rs
index f7d9ca0c7e..399a166195 100644
--- a/codex-rs/core/src/skills/mod.rs
+++ b/codex-rs/core/src/skills/mod.rs
@@ -8,6 +8,10 @@ pub mod remote;
 pub mod render;
 pub mod system;
 
+pub use codex_extensions::skills::SkillError;
+pub use codex_extensions::skills::SkillLoadOutcome;
+pub use codex_extensions::skills::SkillMetadata;
+pub use codex_extensions::skills::SkillPolicy;
 pub(crate) use env_var_dependencies::collect_env_var_dependencies;
 pub(crate) use env_var_dependencies::resolve_skill_dependencies_for_turn;
 pub(crate) use injection::SkillInjections;
@@ -15,9 +19,5 @@ pub(crate) use injection::build_skill_injections;
 pub(crate) use injection::collect_explicit_skill_mentions;
 pub(crate) use invocation_utils::build_implicit_skill_path_indexes;
 pub(crate) use invocation_utils::maybe_emit_implicit_skill_invocation;
-pub use codex_extensions::skills::SkillError;
-pub use codex_extensions::skills::SkillLoadOutcome;
-pub use codex_extensions::skills::SkillMetadata;
-pub use codex_extensions::skills::SkillPolicy;
 pub use manager::SkillsManager;
 pub use render::render_skills_section;
diff --git a/codex-rs/extensions/src/plugins/store.rs b/codex-rs/extensions/src/plugins/store.rs
index 73645113b8..0c916fd2a6 100644
--- a/codex-rs/extensions/src/plugins/store.rs
+++ b/codex-rs/extensions/src/plugins/store.rs
@@ -278,8 +278,8 @@ fn copy_dir_recursive(source: &Path, target: &Path) -> Result<(), PluginStoreErr
     for entry in fs::read_dir(source)
         .map_err(|err| PluginStoreError::io("failed to read plugin source directory", err))?
     {
-        let entry = entry
-            .map_err(|err| PluginStoreError::io("failed to read plugin source entry", err))?;
+        let entry =
+            entry.map_err(|err| PluginStoreError::io("failed to read plugin source entry", err))?;
         let source_path = entry.path();
         let target_path = target.join(entry.file_name());
         let file_type = entry