agent_servers: Move agent_id constants to agent_servers crate (#51738)

Ben Brandt created 3 weeks ago

Release Notes:

- N/A

Change summary

crates/agent_servers/src/acp.rs                         | 4 +++-
crates/agent_servers/src/custom.rs                      | 8 +++++---
crates/agent_ui/src/agent_panel.rs                      | 2 +-
crates/agent_ui/src/ui/acp_onboarding_modal.rs          | 2 +-
crates/agent_ui/src/ui/claude_agent_onboarding_modal.rs | 2 +-
crates/project/src/agent_server_store.rs                | 4 ----
6 files changed, 11 insertions(+), 11 deletions(-)

Detailed changes

crates/agent_servers/src/acp.rs

@@ -9,7 +9,7 @@ use anyhow::anyhow;
 use collections::HashMap;
 use futures::AsyncBufReadExt as _;
 use futures::io::BufReader;
-use project::agent_server_store::{AgentServerCommand, GEMINI_ID};
+use project::agent_server_store::AgentServerCommand;
 use project::{AgentId, Project};
 use serde::Deserialize;
 use settings::Settings as _;
@@ -31,6 +31,8 @@ use acp_thread::{AcpThread, AuthRequired, LoadError, TerminalProviderEvent};
 use terminal::TerminalBuilder;
 use terminal::terminal_settings::{AlternateScroll, CursorShape, TerminalSettings};
 
+use crate::GEMINI_ID;
+
 #[derive(Debug, Error)]
 #[error("Unsupported version")]
 pub struct UnsupportedVersion;

crates/agent_servers/src/custom.rs

@@ -7,13 +7,15 @@ use credentials_provider::CredentialsProvider;
 use fs::Fs;
 use gpui::{App, AppContext as _, Task};
 use language_model::{ApiKey, EnvVar};
-use project::agent_server_store::{
-    AgentId, AllAgentServersSettings, CLAUDE_AGENT_ID, CODEX_ID, GEMINI_ID,
-};
+use project::agent_server_store::{AgentId, AllAgentServersSettings};
 use settings::{SettingsStore, update_settings_file};
 use std::{rc::Rc, sync::Arc};
 use ui::IconName;
 
+pub const GEMINI_ID: &str = "gemini";
+pub const CLAUDE_AGENT_ID: &str = "claude-acp";
+pub const CODEX_ID: &str = "codex-acp";
+
 /// A generic agent server implementation for custom user-defined agents
 pub struct CustomAgentServer {
     agent_id: AgentId,

crates/agent_ui/src/agent_panel.rs

@@ -4915,12 +4915,12 @@ mod tests {
     use crate::conversation_view::tests::{StubAgentServer, init_test};
     use crate::test_support::{active_session_id, open_thread_with_connection, send_message};
     use acp_thread::{StubAgentConnection, ThreadStatus};
+    use agent_servers::CODEX_ID;
     use assistant_text_thread::TextThreadStore;
     use feature_flags::FeatureFlagAppExt;
     use fs::FakeFs;
     use gpui::{TestAppContext, VisualTestContext};
     use project::Project;
-    use project::agent_server_store::CODEX_ID;
     use serde_json::json;
     use workspace::MultiWorkspace;
 

crates/agent_ui/src/ui/acp_onboarding_modal.rs

@@ -1,8 +1,8 @@
+use agent_servers::GEMINI_ID;
 use gpui::{
     ClickEvent, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, MouseDownEvent, Render,
     linear_color_stop, linear_gradient,
 };
-use project::agent_server_store::GEMINI_ID;
 use ui::{TintColor, Vector, VectorName, prelude::*};
 use workspace::{ModalView, Workspace};
 

crates/agent_ui/src/ui/claude_agent_onboarding_modal.rs

@@ -1,8 +1,8 @@
+use agent_servers::CLAUDE_AGENT_ID;
 use gpui::{
     ClickEvent, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, MouseDownEvent, Render,
     linear_color_stop, linear_gradient,
 };
-use project::agent_server_store::CLAUDE_AGENT_ID;
 use ui::{TintColor, Vector, VectorName, prelude::*};
 use workspace::{ModalView, Workspace};
 

crates/project/src/agent_server_store.rs

@@ -1446,10 +1446,6 @@ impl ExternalAgentServer for LocalCustomAgent {
     }
 }
 
-pub const GEMINI_ID: &str = "gemini";
-pub const CLAUDE_AGENT_ID: &str = "claude-acp";
-pub const CODEX_ID: &str = "codex-acp";
-
 #[derive(Default, Clone, JsonSchema, Debug, PartialEq, RegisterSetting)]
 pub struct AllAgentServersSettings(pub HashMap<String, CustomAgentServerSettings>);