From 4605b80b44d96dbdbed2a64be88568c654d06076 Mon Sep 17 00:00:00 2001 From: Agus Zubiaga Date: Thu, 24 Jul 2025 13:06:39 -0300 Subject: [PATCH] Remove deps --- Cargo.lock | 4 -- crates/agent_servers/Cargo.toml | 2 - crates/agent_servers/src/agent_servers.rs | 2 - crates/agent_servers/src/codex.rs | 59 ----------------------- crates/agent_servers/src/e2e_tests.rs | 3 -- crates/agent_servers/src/settings.rs | 11 +---- crates/agent_ui/Cargo.toml | 1 - crates/agent_ui/src/agent_panel.rs | 7 --- crates/agent_ui/src/agent_ui.rs | 2 - crates/zed/Cargo.toml | 1 - 10 files changed, 1 insertion(+), 91 deletions(-) delete mode 100644 crates/agent_servers/src/codex.rs diff --git a/Cargo.lock b/Cargo.lock index 775f2d56f70f6eb1519b366f510674f23fc2c1ac..9dffebe7b7a4feb09dc63c92c73bf54b17966d91 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -164,14 +164,12 @@ dependencies = [ "libc", "log", "nix 0.29.0", - "parking_lot", "paths", "project", "schemars", "serde", "serde_json", "settings", - "shlex", "smol", "strum 0.27.1", "tempfile", @@ -211,7 +209,6 @@ dependencies = [ "agent-client-protocol", "agent_servers", "agent_settings", - "agentic-coding-protocol", "ai_onboarding", "anyhow", "assistant_context", @@ -20221,7 +20218,6 @@ dependencies = [ "diagnostics", "editor", "env_logger 0.11.8", - "erased-serde", "extension", "extension_host", "extensions_ui", diff --git a/crates/agent_servers/Cargo.toml b/crates/agent_servers/Cargo.toml index 62c2bf73f76a765aa358226e7978773a11ee493f..4371f7684dd4d618d755eb5468c8b8f62d4a8432 100644 --- a/crates/agent_servers/Cargo.toml +++ b/crates/agent_servers/Cargo.toml @@ -27,14 +27,12 @@ futures.workspace = true gpui.workspace = true itertools.workspace = true log.workspace = true -parking_lot.workspace = true paths.workspace = true project.workspace = true schemars.workspace = true serde.workspace = true serde_json.workspace = true settings.workspace = true -shlex.workspace = true smol.workspace = true strum.workspace = true tempfile.workspace = true diff --git a/crates/agent_servers/src/agent_servers.rs b/crates/agent_servers/src/agent_servers.rs index 7c1c2358063988f29f97bc6a04f15b3cdcbf152d..660f61f9071132c5cc0f01eeda168bb829dcaab7 100644 --- a/crates/agent_servers/src/agent_servers.rs +++ b/crates/agent_servers/src/agent_servers.rs @@ -1,5 +1,4 @@ mod claude; -mod codex; mod gemini; mod settings; @@ -7,7 +6,6 @@ mod settings; mod e2e_tests; pub use claude::*; -pub use codex::*; pub use gemini::*; pub use settings::*; diff --git a/crates/agent_servers/src/codex.rs b/crates/agent_servers/src/codex.rs deleted file mode 100644 index e66828491467ebef6ceedf249e84a318be4ce536..0000000000000000000000000000000000000000 --- a/crates/agent_servers/src/codex.rs +++ /dev/null @@ -1,59 +0,0 @@ -use project::Project; -use std::{path::Path, rc::Rc}; - -use anyhow::Result; -use gpui::{App, Entity, Task}; - -use crate::AgentServer; -use acp_thread::AgentConnection; - -#[derive(Clone)] -pub struct Codex; - -impl AgentServer for Codex { - fn name(&self) -> &'static str { - "Codex" - } - - fn empty_state_headline(&self) -> &'static str { - self.name() - } - - fn empty_state_message(&self) -> &'static str { - "" - } - - fn logo(&self) -> ui::IconName { - ui::IconName::AiOpenAi - } - - fn connect( - &self, - _root_dir: &Path, - _project: &Entity, - _cx: &mut App, - ) -> Task>> { - // re-implement using ACP - todo!() - } -} - -#[cfg(test)] -pub mod tests { - use crate::AgentServerCommand; - - use super::*; - - crate::common_e2e_tests!(Codex); - - pub fn local_command() -> AgentServerCommand { - let cli_path = - Path::new(env!("CARGO_MANIFEST_DIR")).join("../../../codex/code-rs/target/debug/codex"); - - AgentServerCommand { - path: cli_path, - args: vec!["mcp".into()], - env: None, - } - } -} diff --git a/crates/agent_servers/src/e2e_tests.rs b/crates/agent_servers/src/e2e_tests.rs index f49ae2af6faead27a7b1669e70d6a413cfab88e7..9bc6fd60fe5b99dc41120131d8e5415008beae51 100644 --- a/crates/agent_servers/src/e2e_tests.rs +++ b/crates/agent_servers/src/e2e_tests.rs @@ -348,9 +348,6 @@ pub async fn init_test(cx: &mut TestAppContext) -> Arc { claude: Some(AgentServerSettings { command: crate::claude::tests::local_command(), }), - codex: Some(AgentServerSettings { - command: crate::codex::tests::local_command(), - }), gemini: Some(AgentServerSettings { command: crate::gemini::tests::local_command(), }), diff --git a/crates/agent_servers/src/settings.rs b/crates/agent_servers/src/settings.rs index aeb34a5e61df382e99e8cb5f8b613993d6bd82b0..645674b5f15087250c2364fb9a8a846e163ad54c 100644 --- a/crates/agent_servers/src/settings.rs +++ b/crates/agent_servers/src/settings.rs @@ -13,7 +13,6 @@ pub fn init(cx: &mut App) { pub struct AllAgentServersSettings { pub gemini: Option, pub claude: Option, - pub codex: Option, } #[derive(Deserialize, Serialize, Clone, JsonSchema, Debug)] @@ -30,21 +29,13 @@ impl settings::Settings for AllAgentServersSettings { fn load(sources: SettingsSources, _: &mut App) -> Result { let mut settings = AllAgentServersSettings::default(); - for AllAgentServersSettings { - gemini, - claude, - codex, - } in sources.defaults_and_customizations() - { + for AllAgentServersSettings { gemini, claude } in sources.defaults_and_customizations() { if gemini.is_some() { settings.gemini = gemini.clone(); } if claude.is_some() { settings.claude = claude.clone(); } - if codex.is_some() { - settings.codex = codex.clone(); - } } Ok(settings) diff --git a/crates/agent_ui/Cargo.toml b/crates/agent_ui/Cargo.toml index 66d8efbbe88770dad37b7aea92ce3d8ced0eb0ca..fbd53e8d09e5d8a74c2fca4d34e36cb95fc58192 100644 --- a/crates/agent_ui/Cargo.toml +++ b/crates/agent_ui/Cargo.toml @@ -21,7 +21,6 @@ agent-client-protocol.workspace = true agent.workspace = true agent_servers.workspace = true agent_settings.workspace = true -agentic-coding-protocol.workspace = true ai_onboarding.workspace = true anyhow.workspace = true assistant_context.workspace = true diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs index e9f122b1a73ad2932c5830671a4ed9ef95df7944..4ff6186f3d91b18990dec04e1ee70c554ea5423a 100644 --- a/crates/agent_ui/src/agent_panel.rs +++ b/crates/agent_ui/src/agent_panel.rs @@ -1987,13 +1987,6 @@ impl AgentPanel { ); }), ) - .action( - "New Codex Thread", - NewExternalAgentThread { - agent: Some(crate::ExternalAgent::Codex), - } - .boxed_clone(), - ) }); menu })) diff --git a/crates/agent_ui/src/agent_ui.rs b/crates/agent_ui/src/agent_ui.rs index 0032bf90f92737215c4abaf70dcd5e43843f9fc6..cac0f1adace1113dea78537ee000fb951f54d74a 100644 --- a/crates/agent_ui/src/agent_ui.rs +++ b/crates/agent_ui/src/agent_ui.rs @@ -150,7 +150,6 @@ enum ExternalAgent { #[default] Gemini, ClaudeCode, - Codex, } impl ExternalAgent { @@ -158,7 +157,6 @@ impl ExternalAgent { match self { ExternalAgent::Gemini => Rc::new(agent_servers::Gemini), ExternalAgent::ClaudeCode => Rc::new(agent_servers::ClaudeCode), - ExternalAgent::Codex => Rc::new(agent_servers::Codex), } } } diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml index 417794b90112de7acc7d010e0471eaadf119621b..a864ece68379b2669a524994aee8764400d7cb79 100644 --- a/crates/zed/Cargo.toml +++ b/crates/zed/Cargo.toml @@ -161,7 +161,6 @@ zed_actions.workspace = true zeta.workspace = true zlog.workspace = true zlog_settings.workspace = true -erased-serde = "0.4.6" [target.'cfg(target_os = "windows")'.dependencies] windows.workspace = true