From 99877f6f4d29b89d89d67431cd85117e8f98f870 Mon Sep 17 00:00:00 2001
From: Ahmed Ibrahim <aibrahim@openai.com>
Date: Wed, 25 Mar 2026 01:48:06 -0700
Subject: [PATCH] progress

---
 codex-rs/app-server/src/codex_message_processor.rs | 6 ++++--
 codex-rs/app-server/src/config_api.rs              | 4 +---
 codex-rs/core/src/plugins/manager_tests.rs         | 1 -
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/codex-rs/app-server/src/codex_message_processor.rs b/codex-rs/app-server/src/codex_message_processor.rs
index e9a11d0059..9da89bb2b4 100644
--- a/codex-rs/app-server/src/codex_message_processor.rs
+++ b/codex-rs/app-server/src/codex_message_processor.rs
@@ -5492,11 +5492,12 @@ impl CodexMessageProcessor {
             let cwd_abs = match AbsolutePathBuf::try_from(cwd.as_path()) {
                 Ok(path) => path,
                 Err(err) => {
+                    let error_path = cwd.clone();
                     data.push(codex_app_server_protocol::SkillsListEntry {
                         cwd,
                         skills: Vec::new(),
                         errors: errors_to_info(&[codex_core::skills::SkillError {
-                            path: cwd.clone(),
+                            path: error_path,
                             message: err.to_string(),
                         }]),
                     });
@@ -5514,11 +5515,12 @@ impl CodexMessageProcessor {
             {
                 Ok(config_layer_stack) => config_layer_stack,
                 Err(err) => {
+                    let error_path = cwd.clone();
                     data.push(codex_app_server_protocol::SkillsListEntry {
                         cwd,
                         skills: Vec::new(),
                         errors: errors_to_info(&[codex_core::skills::SkillError {
-                            path: cwd.clone(),
+                            path: error_path,
                             message: err.to_string(),
                         }]),
                     });
diff --git a/codex-rs/app-server/src/config_api.rs b/codex-rs/app-server/src/config_api.rs
index 2f23ec7570..c27cc4d76d 100644
--- a/codex-rs/app-server/src/config_api.rs
+++ b/codex-rs/app-server/src/config_api.rs
@@ -406,9 +406,7 @@ mod tests {
                 .await
                 .expect("load analytics config"),
         );
-        let auth_manager = Arc::new(AuthManager::from_auth_for_testing(CodexAuth::from_api_key(
-            "test",
-        )));
+        let auth_manager = AuthManager::from_auth_for_testing(CodexAuth::from_api_key("test"));
         let config_api = ConfigApi::new(
             codex_home.path().to_path_buf(),
             Vec::new(),
diff --git a/codex-rs/core/src/plugins/manager_tests.rs b/codex-rs/core/src/plugins/manager_tests.rs
index 61afc40f35..884beee66d 100644
--- a/codex-rs/core/src/plugins/manager_tests.rs
+++ b/codex-rs/core/src/plugins/manager_tests.rs
@@ -15,7 +15,6 @@ use crate::plugins::test_support::write_curated_plugin_sha_with as write_curated
 use crate::plugins::test_support::write_file;
 use crate::plugins::test_support::write_openai_curated_marketplace;
 use codex_app_server_protocol::ConfigLayerSource;
-use codex_plugin::prompt_safe_plugin_description;
 use codex_protocol::protocol::Product;
 use pretty_assertions::assert_eq;
 use std::fs;