`npx`, and any `npm install`-ed programs, exist as batch scripts/PowerShell scripts on the PATH. We have to use a shell to launch these programs. Fixes https://github.com/zed-industries/zed/issues/41435 Closes https://github.com/zed-industries/zed/pull/42651 Release Notes: - windows: Custom MCP and ACP servers installed through `npm` now launch correctly. --------- Co-authored-by: Lukas Wirth <me@lukaswirth.dev>
152 lines
5.1 KiB
Rust
152 lines
5.1 KiB
Rust
use crate::{AgentServer, AgentServerDelegate, load_proxy_env};
|
|
use acp_thread::AgentConnection;
|
|
use agent_client_protocol as acp;
|
|
use anyhow::{Context as _, Result};
|
|
use fs::Fs;
|
|
use gpui::{App, AppContext as _, SharedString, Task};
|
|
use project::agent_server_store::{AllAgentServersSettings, ExternalAgentServerName};
|
|
use settings::{SettingsStore, update_settings_file};
|
|
use std::{path::Path, rc::Rc, sync::Arc};
|
|
use ui::IconName;
|
|
|
|
/// A generic agent server implementation for custom user-defined agents
|
|
pub struct CustomAgentServer {
|
|
name: SharedString,
|
|
}
|
|
|
|
impl CustomAgentServer {
|
|
pub fn new(name: SharedString) -> Self {
|
|
Self { name }
|
|
}
|
|
}
|
|
|
|
impl AgentServer for CustomAgentServer {
|
|
fn name(&self) -> SharedString {
|
|
self.name.clone()
|
|
}
|
|
|
|
fn logo(&self) -> IconName {
|
|
IconName::Terminal
|
|
}
|
|
|
|
fn default_mode(&self, cx: &mut App) -> Option<acp::SessionModeId> {
|
|
let settings = cx.read_global(|settings: &SettingsStore, _| {
|
|
settings
|
|
.get::<AllAgentServersSettings>(None)
|
|
.custom
|
|
.get(&self.name())
|
|
.cloned()
|
|
});
|
|
|
|
settings
|
|
.as_ref()
|
|
.and_then(|s| s.default_mode().map(acp::SessionModeId::new))
|
|
}
|
|
|
|
fn set_default_mode(&self, mode_id: Option<acp::SessionModeId>, fs: Arc<dyn Fs>, cx: &mut App) {
|
|
let name = self.name();
|
|
update_settings_file(fs, cx, move |settings, _| {
|
|
let settings = settings
|
|
.agent_servers
|
|
.get_or_insert_default()
|
|
.custom
|
|
.entry(name.clone())
|
|
.or_insert_with(|| settings::CustomAgentServerSettings::Extension {
|
|
default_model: None,
|
|
default_mode: None,
|
|
});
|
|
|
|
match settings {
|
|
settings::CustomAgentServerSettings::Custom { default_mode, .. }
|
|
| settings::CustomAgentServerSettings::Extension { default_mode, .. } => {
|
|
*default_mode = mode_id.map(|m| m.to_string());
|
|
}
|
|
}
|
|
});
|
|
}
|
|
|
|
fn default_model(&self, cx: &mut App) -> Option<acp::ModelId> {
|
|
let settings = cx.read_global(|settings: &SettingsStore, _| {
|
|
settings
|
|
.get::<AllAgentServersSettings>(None)
|
|
.custom
|
|
.get(&self.name())
|
|
.cloned()
|
|
});
|
|
|
|
settings
|
|
.as_ref()
|
|
.and_then(|s| s.default_model().map(acp::ModelId::new))
|
|
}
|
|
|
|
fn set_default_model(&self, model_id: Option<acp::ModelId>, fs: Arc<dyn Fs>, cx: &mut App) {
|
|
let name = self.name();
|
|
update_settings_file(fs, cx, move |settings, _| {
|
|
let settings = settings
|
|
.agent_servers
|
|
.get_or_insert_default()
|
|
.custom
|
|
.entry(name.clone())
|
|
.or_insert_with(|| settings::CustomAgentServerSettings::Extension {
|
|
default_model: None,
|
|
default_mode: None,
|
|
});
|
|
|
|
match settings {
|
|
settings::CustomAgentServerSettings::Custom { default_model, .. }
|
|
| settings::CustomAgentServerSettings::Extension { default_model, .. } => {
|
|
*default_model = model_id.map(|m| m.to_string());
|
|
}
|
|
}
|
|
});
|
|
}
|
|
|
|
fn connect(
|
|
&self,
|
|
root_dir: Option<&Path>,
|
|
delegate: AgentServerDelegate,
|
|
cx: &mut App,
|
|
) -> Task<Result<(Rc<dyn AgentConnection>, Option<task::SpawnInTerminal>)>> {
|
|
let name = self.name();
|
|
let root_dir = root_dir.map(|root_dir| root_dir.to_string_lossy().into_owned());
|
|
let is_remote = delegate.project.read(cx).is_via_remote_server();
|
|
let default_mode = self.default_mode(cx);
|
|
let default_model = self.default_model(cx);
|
|
let store = delegate.store.downgrade();
|
|
let extra_env = load_proxy_env(cx);
|
|
cx.spawn(async move |cx| {
|
|
let (command, root_dir, login) = store
|
|
.update(cx, |store, cx| {
|
|
let agent = store
|
|
.get_external_agent(&ExternalAgentServerName(name.clone()))
|
|
.with_context(|| {
|
|
format!("Custom agent server `{}` is not registered", name)
|
|
})?;
|
|
anyhow::Ok(agent.get_command(
|
|
root_dir.as_deref(),
|
|
extra_env,
|
|
delegate.status_tx,
|
|
delegate.new_version_available,
|
|
&mut cx.to_async(),
|
|
))
|
|
})??
|
|
.await?;
|
|
let connection = crate::acp::connect(
|
|
name,
|
|
command,
|
|
root_dir.as_ref(),
|
|
default_mode,
|
|
default_model,
|
|
is_remote,
|
|
cx,
|
|
)
|
|
.await?;
|
|
Ok((connection, login))
|
|
})
|
|
}
|
|
|
|
fn into_any(self: Rc<Self>) -> Rc<dyn std::any::Any> {
|
|
self
|
|
}
|
|
}
|