Remove deps

Agus Zubiaga created 4 months ago

Change summary

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(-)

Detailed changes

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",

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

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::*;
 

crates/agent_servers/src/codex.rs

@@ -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<Project>,
-        _cx: &mut App,
-    ) -> Task<Result<Rc<dyn AgentConnection>>> {
-        // 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,
-        }
-    }
-}

crates/agent_servers/src/e2e_tests.rs

@@ -348,9 +348,6 @@ pub async fn init_test(cx: &mut TestAppContext) -> Arc<FakeFs> {
                 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(),
                 }),

crates/agent_servers/src/settings.rs

@@ -13,7 +13,6 @@ pub fn init(cx: &mut App) {
 pub struct AllAgentServersSettings {
     pub gemini: Option<AgentServerSettings>,
     pub claude: Option<AgentServerSettings>,
-    pub codex: Option<AgentServerSettings>,
 }
 
 #[derive(Deserialize, Serialize, Clone, JsonSchema, Debug)]
@@ -30,21 +29,13 @@ impl settings::Settings for AllAgentServersSettings {
     fn load(sources: SettingsSources<Self::FileContent>, _: &mut App) -> Result<Self> {
         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)

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

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
                     }))

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),
         }
     }
 }

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