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

Remove the accidental mcp-core workspace leak from the rollout branch and trim dependencies left behind by the split.

Co-authored-by: Codex <noreply@openai.com>
---
 codex-rs/Cargo.lock         | 29 -----------------------------
 codex-rs/Cargo.toml         |  2 --
 codex-rs/core/Cargo.toml    |  8 --------
 codex-rs/rollout/Cargo.toml |  1 -
 4 files changed, 40 deletions(-)

diff --git a/codex-rs/Cargo.lock b/codex-rs/Cargo.lock
index 7a6a7b3e9e..c177632bbb 100644
--- a/codex-rs/Cargo.lock
+++ b/codex-rs/Cargo.lock
@@ -1846,11 +1846,9 @@ dependencies = [
  "codex-config",
  "codex-connectors",
  "codex-execpolicy",
- "codex-file-search",
  "codex-git",
  "codex-hooks",
  "codex-keyring-store",
- "codex-mcp",
  "codex-network-proxy",
  "codex-otel",
  "codex-protocol",
@@ -1916,7 +1914,6 @@ dependencies = [
  "test-case",
  "test-log",
  "thiserror 2.0.18",
- "time",
  "tokio",
  "tokio-tungstenite",
  "tokio-util",
@@ -2171,31 +2168,6 @@ dependencies = [
  "wiremock",
 ]
 
-[[package]]
-name = "codex-mcp"
-version = "0.0.0"
-dependencies = [
- "anyhow",
- "async-channel",
- "codex-app-server-protocol",
- "codex-async-utils",
- "codex-config",
- "codex-protocol",
- "codex-rmcp-client",
- "futures",
- "pretty_assertions",
- "regex-lite",
- "rmcp",
- "serde",
- "serde_json",
- "sha1",
- "tempfile",
- "tokio",
- "tokio-util",
- "tracing",
- "url",
-]
-
 [[package]]
 name = "codex-mcp-server"
 version = "0.0.0"
@@ -2420,7 +2392,6 @@ dependencies = [
  "codex-protocol",
  "codex-state",
  "codex-utils-absolute-path",
- "futures",
  "pretty_assertions",
  "serde",
  "serde_json",
diff --git a/codex-rs/Cargo.toml b/codex-rs/Cargo.toml
index 5fa474a161..f4071e0a48 100644
--- a/codex-rs/Cargo.toml
+++ b/codex-rs/Cargo.toml
@@ -32,7 +32,6 @@ members = [
     "linux-sandbox",
     "lmstudio",
     "login",
-    "mcp-core",
     "mcp-server",
     "network-proxy",
     "ollama",
@@ -116,7 +115,6 @@ codex-keyring-store = { path = "keyring-store" }
 codex-linux-sandbox = { path = "linux-sandbox" }
 codex-lmstudio = { path = "lmstudio" }
 codex-login = { path = "login" }
-codex-mcp = { path = "mcp-core" }
 codex-mcp-server = { path = "mcp-server" }
 codex-network-proxy = { path = "network-proxy" }
 codex-ollama = { path = "ollama" }
diff --git a/codex-rs/core/Cargo.toml b/codex-rs/core/Cargo.toml
index c559067d52..00801f18b1 100644
--- a/codex-rs/core/Cargo.toml
+++ b/codex-rs/core/Cargo.toml
@@ -37,12 +37,10 @@ codex-config = { workspace = true }
 codex-shell-command = { workspace = true }
 codex-skills = { workspace = true }
 codex-execpolicy = { workspace = true }
-codex-file-search = { workspace = true }
 codex-git = { workspace = true }
 codex-hooks = { workspace = true }
 codex-keyring-store = { workspace = true }
 codex-network-proxy = { workspace = true }
-codex-mcp = { workspace = true }
 codex-otel = { workspace = true }
 codex-artifacts = { workspace = true }
 codex-protocol = { workspace = true }
@@ -95,12 +93,6 @@ similar = { workspace = true }
 tempfile = { workspace = true }
 test-log = { workspace = true }
 thiserror = { workspace = true }
-time = { workspace = true, features = [
-    "formatting",
-    "parsing",
-    "local-offset",
-    "macros",
-] }
 tokio = { workspace = true, features = [
     "io-std",
     "macros",
diff --git a/codex-rs/rollout/Cargo.toml b/codex-rs/rollout/Cargo.toml
index 08f7f1e1e4..72f3b63c49 100644
--- a/codex-rs/rollout/Cargo.toml
+++ b/codex-rs/rollout/Cargo.toml
@@ -20,7 +20,6 @@ codex-otel = { workspace = true }
 codex-protocol = { workspace = true }
 codex-state = { workspace = true }
 codex-utils-absolute-path = { workspace = true }
-futures = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
 time = { workspace = true, features = [