From d84254e36a58898cbc784cd51e3d6a3f402f0ff4 Mon Sep 17 00:00:00 2001 From: Ben Brandt Date: Tue, 17 Mar 2026 10:25:29 +0100 Subject: [PATCH] agent_servers: Move agent_id constants to agent_servers crate (#51738) Release Notes: - N/A --- 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(-) diff --git a/crates/agent_servers/src/acp.rs b/crates/agent_servers/src/acp.rs index a8c8e2f6ebf2b7efeb264aa412131881564ce3b3..43f2ea2f7923aedf6541bfa9c21c566595fe300b 100644 --- a/crates/agent_servers/src/acp.rs +++ b/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; diff --git a/crates/agent_servers/src/custom.rs b/crates/agent_servers/src/custom.rs index 30bfae3a34049116a523d971952f40b3f2269cbf..ed76d022f5388db0c5346fd2fc664c2ef26ae761 100644 --- a/crates/agent_servers/src/custom.rs +++ b/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, diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs index 232786f9e543b8ed7903a3a4d5d70ea630bd836e..2dd120dffd6ba50455c0f5ab31b679b91e667006 100644 --- a/crates/agent_ui/src/agent_panel.rs +++ b/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; diff --git a/crates/agent_ui/src/ui/acp_onboarding_modal.rs b/crates/agent_ui/src/ui/acp_onboarding_modal.rs index 7b6a563582abe89022d9d1684275dc850d28b23b..cbb9ddd0e6dd0338a717f1606dae9754543f21f9 100644 --- a/crates/agent_ui/src/ui/acp_onboarding_modal.rs +++ b/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}; diff --git a/crates/agent_ui/src/ui/claude_agent_onboarding_modal.rs b/crates/agent_ui/src/ui/claude_agent_onboarding_modal.rs index c8ae51850325d674ae45eac22891cdcd0c948465..6bc74e4d8a29122c6a5facbc22c88df282313ac3 100644 --- a/crates/agent_ui/src/ui/claude_agent_onboarding_modal.rs +++ b/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}; diff --git a/crates/project/src/agent_server_store.rs b/crates/project/src/agent_server_store.rs index d5acacb912d085121c4c370046c9c7bd734c817c..d8978b6512fa0c437a3d07feb929132a24461d0e 100644 --- a/crates/project/src/agent_server_store.rs +++ b/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);