From 81e641c6ea3d894a9b5a2e5e453d096ee71888e5 Mon Sep 17 00:00:00 2001
From: Sayan Sisodiya <sayan@openai.com>
Date: Wed, 4 Mar 2026 20:16:07 -0800
Subject: [PATCH] fix plugin cache poisoning on turn startup

Co-authored-by: Codex <noreply@openai.com>
---
 codex-rs/core/src/codex.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/codex-rs/core/src/codex.rs b/codex-rs/core/src/codex.rs
index 8a9addaefd..1cc5ea09ef 100644
--- a/codex-rs/core/src/codex.rs
+++ b/codex-rs/core/src/codex.rs
@@ -2186,11 +2186,12 @@ impl Session {
                 &per_turn_config,
             )
             .await;
+        // Reuse the session's resolved config for turn-time skills so plugin-backed
+        // skill/plugin availability stays aligned with the session-start view.
         let skills_outcome = Arc::new(
             self.services
                 .skills_manager
-                .skills_for_cwd(&session_configuration.cwd, false)
-                .await,
+                .skills_for_config(&per_turn_config),
         );
         let mut turn_context: TurnContext = Self::make_turn_context(
             Some(Arc::clone(&self.services.auth_manager)),