From a45c0e5f9e311b1041d9ea8c9d64feec1afefcaa Mon Sep 17 00:00:00 2001
From: xli-oai <xli@openai.com>
Date: Mon, 4 May 2026 21:30:25 -0700
Subject: [PATCH] codex: address marketplace symlink removal review (#21120)

---
 .../core-plugins/src/marketplace_remove.rs    | 49 ++++++++++++++++++-
 1 file changed, 48 insertions(+), 1 deletion(-)

diff --git a/codex-rs/core-plugins/src/marketplace_remove.rs b/codex-rs/core-plugins/src/marketplace_remove.rs
index 0631dcaece..9181b72311 100644
--- a/codex-rs/core-plugins/src/marketplace_remove.rs
+++ b/codex-rs/core-plugins/src/marketplace_remove.rs
@@ -98,7 +98,7 @@ fn remove_marketplace_root(root: &Path) -> Result<Option<AbsolutePathBuf>, Marke
     let file_type = metadata.file_type();
     let remove_result = if file_type.is_dir() {
         fs::remove_dir_all(root)
-    } else if file_type.is_file() {
+    } else if file_type.is_file() || file_type.is_symlink() {
         fs::remove_file(root)
     } else {
         return Err(MarketplaceRemoveError::Internal(format!(
@@ -290,6 +290,53 @@ mod tests {
         assert!(!config.contains("[marketplaces.debug]"));
     }
 
+    #[cfg(unix)]
+    #[test]
+    fn remove_marketplace_sync_removes_symlink_installed_root() {
+        let codex_home = TempDir::new().unwrap();
+        record_user_marketplace(
+            codex_home.path(),
+            "debug",
+            &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: &[],
+            },
+        )
+        .unwrap();
+        let installed_root = marketplace_install_root(codex_home.path()).join("debug");
+        fs::create_dir_all(installed_root.parent().unwrap()).unwrap();
+        let target_root = codex_home.path().join("debug-target");
+        fs::create_dir_all(&target_root).unwrap();
+        std::os::unix::fs::symlink(&target_root, &installed_root).unwrap();
+
+        let outcome = remove_marketplace_sync(
+            codex_home.path(),
+            MarketplaceRemoveRequest {
+                marketplace_name: "debug".to_string(),
+            },
+        )
+        .unwrap();
+
+        assert_eq!(
+            outcome,
+            MarketplaceRemoveOutcome {
+                marketplace_name: "debug".to_string(),
+                removed_installed_root: Some(
+                    AbsolutePathBuf::try_from(installed_root.clone()).unwrap()
+                ),
+            }
+        );
+        assert!(!installed_root.exists());
+        assert!(target_root.exists());
+        let config =
+            fs::read_to_string(codex_home.path().join(codex_config::CONFIG_TOML_FILE)).unwrap();
+        assert!(!config.contains("[marketplaces.debug]"));
+    }
+
     #[test]
     fn remove_marketplace_sync_removes_inline_config_entry() {
         let codex_home = TempDir::new().unwrap();