1use acp_thread::{
2 AgentConnection, AgentSessionInfo, AgentSessionList, AgentSessionListRequest,
3 AgentSessionListResponse,
4};
5use acp_tools::AcpConnectionRegistry;
6use action_log::ActionLog;
7use agent_client_protocol::{self as acp, Agent as _, ErrorCode};
8use anyhow::anyhow;
9use collections::HashMap;
10use futures::AsyncBufReadExt as _;
11use futures::io::BufReader;
12use project::Project;
13use project::agent_server_store::{AgentServerCommand, GEMINI_NAME};
14use serde::Deserialize;
15use settings::Settings as _;
16use task::ShellBuilder;
17use util::ResultExt as _;
18use util::process::Child;
19
20use std::path::PathBuf;
21use std::process::Stdio;
22use std::{any::Any, cell::RefCell};
23use std::{path::Path, rc::Rc};
24use thiserror::Error;
25
26use anyhow::{Context as _, Result};
27use gpui::{App, AppContext as _, AsyncApp, Entity, SharedString, Task, WeakEntity};
28
29use acp_thread::{AcpThread, AuthRequired, LoadError, TerminalProviderEvent};
30use terminal::TerminalBuilder;
31use terminal::terminal_settings::{AlternateScroll, CursorShape, TerminalSettings};
32
33#[derive(Debug, Error)]
34#[error("Unsupported version")]
35pub struct UnsupportedVersion;
36
37pub struct AcpConnection {
38 server_name: SharedString,
39 display_name: SharedString,
40 telemetry_id: SharedString,
41 connection: Rc<acp::ClientSideConnection>,
42 sessions: Rc<RefCell<HashMap<acp::SessionId, AcpSession>>>,
43 auth_methods: Vec<acp::AuthMethod>,
44 agent_capabilities: acp::AgentCapabilities,
45 default_mode: Option<acp::SessionModeId>,
46 default_model: Option<acp::ModelId>,
47 default_config_options: HashMap<String, String>,
48 child: Child,
49 session_list: Option<Rc<AcpSessionList>>,
50 _io_task: Task<Result<(), acp::Error>>,
51 _wait_task: Task<Result<()>>,
52 _stderr_task: Task<Result<()>>,
53}
54
55struct ConfigOptions {
56 config_options: Rc<RefCell<Vec<acp::SessionConfigOption>>>,
57 tx: Rc<RefCell<watch::Sender<()>>>,
58 rx: watch::Receiver<()>,
59}
60
61impl ConfigOptions {
62 fn new(config_options: Rc<RefCell<Vec<acp::SessionConfigOption>>>) -> Self {
63 let (tx, rx) = watch::channel(());
64 Self {
65 config_options,
66 tx: Rc::new(RefCell::new(tx)),
67 rx,
68 }
69 }
70}
71
72pub struct AcpSession {
73 thread: WeakEntity<AcpThread>,
74 suppress_abort_err: bool,
75 models: Option<Rc<RefCell<acp::SessionModelState>>>,
76 session_modes: Option<Rc<RefCell<acp::SessionModeState>>>,
77 config_options: Option<ConfigOptions>,
78}
79
80pub struct AcpSessionList {
81 connection: Rc<acp::ClientSideConnection>,
82 updates_tx: smol::channel::Sender<acp_thread::SessionListUpdate>,
83 updates_rx: smol::channel::Receiver<acp_thread::SessionListUpdate>,
84}
85
86impl AcpSessionList {
87 fn new(connection: Rc<acp::ClientSideConnection>) -> Self {
88 let (tx, rx) = smol::channel::unbounded();
89 Self {
90 connection,
91 updates_tx: tx,
92 updates_rx: rx,
93 }
94 }
95
96 fn notify_update(&self) {
97 self.updates_tx
98 .try_send(acp_thread::SessionListUpdate::Refresh)
99 .log_err();
100 }
101
102 fn send_info_update(&self, session_id: acp::SessionId, update: acp::SessionInfoUpdate) {
103 self.updates_tx
104 .try_send(acp_thread::SessionListUpdate::SessionInfo { session_id, update })
105 .log_err();
106 }
107}
108
109impl AgentSessionList for AcpSessionList {
110 fn list_sessions(
111 &self,
112 request: AgentSessionListRequest,
113 cx: &mut App,
114 ) -> Task<Result<AgentSessionListResponse>> {
115 let conn = self.connection.clone();
116 cx.foreground_executor().spawn(async move {
117 let acp_request = acp::ListSessionsRequest::new()
118 .cwd(request.cwd)
119 .cursor(request.cursor);
120 let response = conn.list_sessions(acp_request).await?;
121 Ok(AgentSessionListResponse {
122 sessions: response
123 .sessions
124 .into_iter()
125 .map(|s| AgentSessionInfo {
126 session_id: s.session_id,
127 cwd: Some(s.cwd),
128 title: s.title.map(Into::into),
129 updated_at: s.updated_at.and_then(|date_str| {
130 chrono::DateTime::parse_from_rfc3339(&date_str)
131 .ok()
132 .map(|dt| dt.with_timezone(&chrono::Utc))
133 }),
134 created_at: None,
135 meta: s.meta,
136 })
137 .collect(),
138 next_cursor: response.next_cursor,
139 meta: response.meta,
140 })
141 })
142 }
143
144 fn watch(
145 &self,
146 _cx: &mut App,
147 ) -> Option<smol::channel::Receiver<acp_thread::SessionListUpdate>> {
148 Some(self.updates_rx.clone())
149 }
150
151 fn notify_refresh(&self) {
152 self.notify_update();
153 }
154
155 fn into_any(self: Rc<Self>) -> Rc<dyn Any> {
156 self
157 }
158}
159
160pub async fn connect(
161 server_name: SharedString,
162 display_name: SharedString,
163 command: AgentServerCommand,
164 default_mode: Option<acp::SessionModeId>,
165 default_model: Option<acp::ModelId>,
166 default_config_options: HashMap<String, String>,
167 cx: &mut AsyncApp,
168) -> Result<Rc<dyn AgentConnection>> {
169 let conn = AcpConnection::stdio(
170 server_name,
171 display_name,
172 command.clone(),
173 default_mode,
174 default_model,
175 default_config_options,
176 cx,
177 )
178 .await?;
179 Ok(Rc::new(conn) as _)
180}
181
182const MINIMUM_SUPPORTED_VERSION: acp::ProtocolVersion = acp::ProtocolVersion::V1;
183
184impl AcpConnection {
185 pub async fn stdio(
186 server_name: SharedString,
187 display_name: SharedString,
188 command: AgentServerCommand,
189 default_mode: Option<acp::SessionModeId>,
190 default_model: Option<acp::ModelId>,
191 default_config_options: HashMap<String, String>,
192 cx: &mut AsyncApp,
193 ) -> Result<Self> {
194 let shell = cx.update(|cx| TerminalSettings::get(None, cx).shell.clone());
195 let builder = ShellBuilder::new(&shell, cfg!(windows)).non_interactive();
196 let mut child =
197 builder.build_std_command(Some(command.path.display().to_string()), &command.args);
198 child.envs(command.env.iter().flatten());
199 let mut child = Child::spawn(child, Stdio::piped(), Stdio::piped(), Stdio::piped())?;
200
201 let stdout = child.stdout.take().context("Failed to take stdout")?;
202 let stdin = child.stdin.take().context("Failed to take stdin")?;
203 let stderr = child.stderr.take().context("Failed to take stderr")?;
204 log::debug!(
205 "Spawning external agent server: {:?}, {:?}",
206 command.path,
207 command.args
208 );
209 log::trace!("Spawned (pid: {})", child.id());
210
211 let sessions = Rc::new(RefCell::new(HashMap::default()));
212
213 let (release_channel, version): (Option<&str>, String) = cx.update(|cx| {
214 (
215 release_channel::ReleaseChannel::try_global(cx)
216 .map(|release_channel| release_channel.display_name()),
217 release_channel::AppVersion::global(cx).to_string(),
218 )
219 });
220
221 let client_session_list: Rc<RefCell<Option<Rc<AcpSessionList>>>> =
222 Rc::new(RefCell::new(None));
223
224 let client = ClientDelegate {
225 sessions: sessions.clone(),
226 session_list: client_session_list.clone(),
227 cx: cx.clone(),
228 };
229 let (connection, io_task) = acp::ClientSideConnection::new(client, stdin, stdout, {
230 let foreground_executor = cx.foreground_executor().clone();
231 move |fut| {
232 foreground_executor.spawn(fut).detach();
233 }
234 });
235
236 let io_task = cx.background_spawn(io_task);
237
238 let stderr_task = cx.background_spawn(async move {
239 let mut stderr = BufReader::new(stderr);
240 let mut line = String::new();
241 while let Ok(n) = stderr.read_line(&mut line).await
242 && n > 0
243 {
244 log::warn!("agent stderr: {}", line.trim());
245 line.clear();
246 }
247 Ok(())
248 });
249
250 let wait_task = cx.spawn({
251 let sessions = sessions.clone();
252 let status_fut = child.status();
253 async move |cx| {
254 let status = status_fut.await?;
255
256 for session in sessions.borrow().values() {
257 session
258 .thread
259 .update(cx, |thread, cx| {
260 thread.emit_load_error(LoadError::Exited { status }, cx)
261 })
262 .ok();
263 }
264
265 anyhow::Ok(())
266 }
267 });
268
269 let connection = Rc::new(connection);
270
271 cx.update(|cx| {
272 AcpConnectionRegistry::default_global(cx).update(cx, |registry, cx| {
273 registry.set_active_connection(server_name.clone(), &connection, cx)
274 });
275 });
276
277 let response = connection
278 .initialize(
279 acp::InitializeRequest::new(acp::ProtocolVersion::V1)
280 .client_capabilities(
281 acp::ClientCapabilities::new()
282 .fs(acp::FileSystemCapability::new()
283 .read_text_file(true)
284 .write_text_file(true))
285 .terminal(true)
286 // Experimental: Allow for rendering terminal output from the agents
287 .meta(acp::Meta::from_iter([
288 ("terminal_output".into(), true.into()),
289 ("terminal-auth".into(), true.into()),
290 ])),
291 )
292 .client_info(
293 acp::Implementation::new("zed", version)
294 .title(release_channel.map(ToOwned::to_owned)),
295 ),
296 )
297 .await?;
298
299 if response.protocol_version < MINIMUM_SUPPORTED_VERSION {
300 return Err(UnsupportedVersion.into());
301 }
302
303 let telemetry_id = response
304 .agent_info
305 // Use the one the agent provides if we have one
306 .map(|info| info.name.into())
307 // Otherwise, just use the name
308 .unwrap_or_else(|| server_name.clone());
309
310 let session_list = if response
311 .agent_capabilities
312 .session_capabilities
313 .list
314 .is_some()
315 {
316 let list = Rc::new(AcpSessionList::new(connection.clone()));
317 *client_session_list.borrow_mut() = Some(list.clone());
318 Some(list)
319 } else {
320 None
321 };
322
323 // TODO: Remove this override once Google team releases their official auth methods
324 let auth_methods = if server_name == GEMINI_NAME {
325 let mut args = command.args.clone();
326 args.retain(|a| a != "--experimental-acp");
327 let value = serde_json::json!({
328 "label": "gemini /auth",
329 "command": command.path.to_string_lossy().into_owned(),
330 "args": args,
331 "env": command.env.clone().unwrap_or_default(),
332 });
333 let meta = acp::Meta::from_iter([("terminal-auth".to_string(), value)]);
334 vec![
335 acp::AuthMethod::new("spawn-gemini-cli", "Login")
336 .description("Login with your Google or Vertex AI account")
337 .meta(meta),
338 ]
339 } else {
340 response.auth_methods
341 };
342 Ok(Self {
343 auth_methods,
344 connection,
345 server_name,
346 display_name,
347 telemetry_id,
348 sessions,
349 agent_capabilities: response.agent_capabilities,
350 default_mode,
351 default_model,
352 default_config_options,
353 session_list,
354 _io_task: io_task,
355 _wait_task: wait_task,
356 _stderr_task: stderr_task,
357 child,
358 })
359 }
360
361 pub fn prompt_capabilities(&self) -> &acp::PromptCapabilities {
362 &self.agent_capabilities.prompt_capabilities
363 }
364}
365
366impl Drop for AcpConnection {
367 fn drop(&mut self) {
368 self.child.kill().log_err();
369 }
370}
371
372impl AgentConnection for AcpConnection {
373 fn telemetry_id(&self) -> SharedString {
374 self.telemetry_id.clone()
375 }
376
377 fn new_session(
378 self: Rc<Self>,
379 project: Entity<Project>,
380 cwd: &Path,
381 cx: &mut App,
382 ) -> Task<Result<Entity<AcpThread>>> {
383 let name = self.server_name.clone();
384 let cwd = cwd.to_path_buf();
385 let mcp_servers = mcp_servers_for_project(&project, cx);
386
387 cx.spawn(async move |cx| {
388 let response = self.connection
389 .new_session(acp::NewSessionRequest::new(cwd.clone()).mcp_servers(mcp_servers))
390 .await
391 .map_err(map_acp_error)?;
392
393 let (modes, models, config_options) = config_state(response.modes, response.models, response.config_options);
394
395 if let Some(default_mode) = self.default_mode.clone() {
396 if let Some(modes) = modes.as_ref() {
397 let mut modes_ref = modes.borrow_mut();
398 let has_mode = modes_ref.available_modes.iter().any(|mode| mode.id == default_mode);
399
400 if has_mode {
401 let initial_mode_id = modes_ref.current_mode_id.clone();
402
403 cx.spawn({
404 let default_mode = default_mode.clone();
405 let session_id = response.session_id.clone();
406 let modes = modes.clone();
407 let conn = self.connection.clone();
408 async move |_| {
409 let result = conn.set_session_mode(acp::SetSessionModeRequest::new(session_id, default_mode))
410 .await.log_err();
411
412 if result.is_none() {
413 modes.borrow_mut().current_mode_id = initial_mode_id;
414 }
415 }
416 }).detach();
417
418 modes_ref.current_mode_id = default_mode;
419 } else {
420 let available_modes = modes_ref
421 .available_modes
422 .iter()
423 .map(|mode| format!("- `{}`: {}", mode.id, mode.name))
424 .collect::<Vec<_>>()
425 .join("\n");
426
427 log::warn!(
428 "`{default_mode}` is not valid {name} mode. Available options:\n{available_modes}",
429 );
430 }
431 }
432 }
433
434 if let Some(default_model) = self.default_model.clone() {
435 if let Some(models) = models.as_ref() {
436 let mut models_ref = models.borrow_mut();
437 let has_model = models_ref.available_models.iter().any(|model| model.model_id == default_model);
438
439 if has_model {
440 let initial_model_id = models_ref.current_model_id.clone();
441
442 cx.spawn({
443 let default_model = default_model.clone();
444 let session_id = response.session_id.clone();
445 let models = models.clone();
446 let conn = self.connection.clone();
447 async move |_| {
448 let result = conn.set_session_model(acp::SetSessionModelRequest::new(session_id, default_model))
449 .await.log_err();
450
451 if result.is_none() {
452 models.borrow_mut().current_model_id = initial_model_id;
453 }
454 }
455 }).detach();
456
457 models_ref.current_model_id = default_model;
458 } else {
459 let available_models = models_ref
460 .available_models
461 .iter()
462 .map(|model| format!("- `{}`: {}", model.model_id, model.name))
463 .collect::<Vec<_>>()
464 .join("\n");
465
466 log::warn!(
467 "`{default_model}` is not a valid {name} model. Available options:\n{available_models}",
468 );
469 }
470 }
471 }
472
473 if let Some(config_opts) = config_options.as_ref() {
474 let defaults_to_apply: Vec<_> = {
475 let config_opts_ref = config_opts.borrow();
476 config_opts_ref
477 .iter()
478 .filter_map(|config_option| {
479 let default_value = self.default_config_options.get(&*config_option.id.0)?;
480
481 let is_valid = match &config_option.kind {
482 acp::SessionConfigKind::Select(select) => match &select.options {
483 acp::SessionConfigSelectOptions::Ungrouped(options) => {
484 options.iter().any(|opt| &*opt.value.0 == default_value.as_str())
485 }
486 acp::SessionConfigSelectOptions::Grouped(groups) => groups
487 .iter()
488 .any(|g| g.options.iter().any(|opt| &*opt.value.0 == default_value.as_str())),
489 _ => false,
490 },
491 _ => false,
492 };
493
494 if is_valid {
495 let initial_value = match &config_option.kind {
496 acp::SessionConfigKind::Select(select) => {
497 Some(select.current_value.clone())
498 }
499 _ => None,
500 };
501 Some((config_option.id.clone(), default_value.clone(), initial_value))
502 } else {
503 log::warn!(
504 "`{}` is not a valid value for config option `{}` in {}",
505 default_value,
506 config_option.id.0,
507 name
508 );
509 None
510 }
511 })
512 .collect()
513 };
514
515 for (config_id, default_value, initial_value) in defaults_to_apply {
516 cx.spawn({
517 let default_value_id = acp::SessionConfigValueId::new(default_value.clone());
518 let session_id = response.session_id.clone();
519 let config_id_clone = config_id.clone();
520 let config_opts = config_opts.clone();
521 let conn = self.connection.clone();
522 async move |_| {
523 let result = conn
524 .set_session_config_option(
525 acp::SetSessionConfigOptionRequest::new(
526 session_id,
527 config_id_clone.clone(),
528 default_value_id,
529 ),
530 )
531 .await
532 .log_err();
533
534 if result.is_none() {
535 if let Some(initial) = initial_value {
536 let mut opts = config_opts.borrow_mut();
537 if let Some(opt) = opts.iter_mut().find(|o| o.id == config_id_clone) {
538 if let acp::SessionConfigKind::Select(select) =
539 &mut opt.kind
540 {
541 select.current_value = initial;
542 }
543 }
544 }
545 }
546 }
547 })
548 .detach();
549
550 let mut opts = config_opts.borrow_mut();
551 if let Some(opt) = opts.iter_mut().find(|o| o.id == config_id) {
552 if let acp::SessionConfigKind::Select(select) = &mut opt.kind {
553 select.current_value = acp::SessionConfigValueId::new(default_value);
554 }
555 }
556 }
557 }
558
559 let action_log = cx.new(|_| ActionLog::new(project.clone()));
560 let thread: Entity<AcpThread> = cx.new(|cx| {
561 AcpThread::new(
562 None,
563 self.display_name.clone(),
564 Some(cwd),
565 self.clone(),
566 project,
567 action_log,
568 response.session_id.clone(),
569 // ACP doesn't currently support per-session prompt capabilities or changing capabilities dynamically.
570 watch::Receiver::constant(self.agent_capabilities.prompt_capabilities.clone()),
571 cx,
572 )
573 });
574
575 self.sessions.borrow_mut().insert(
576 response.session_id,
577 AcpSession {
578 thread: thread.downgrade(),
579 suppress_abort_err: false,
580 session_modes: modes,
581 models,
582 config_options: config_options.map(ConfigOptions::new),
583 },
584 );
585
586 Ok(thread)
587 })
588 }
589
590 fn supports_load_session(&self) -> bool {
591 self.agent_capabilities.load_session
592 }
593
594 fn supports_resume_session(&self) -> bool {
595 self.agent_capabilities
596 .session_capabilities
597 .resume
598 .is_some()
599 }
600
601 fn load_session(
602 self: Rc<Self>,
603 session_id: acp::SessionId,
604 project: Entity<Project>,
605 cwd: &Path,
606 title: Option<SharedString>,
607 cx: &mut App,
608 ) -> Task<Result<Entity<AcpThread>>> {
609 if !self.agent_capabilities.load_session {
610 return Task::ready(Err(anyhow!(LoadError::Other(
611 "Loading sessions is not supported by this agent.".into()
612 ))));
613 }
614
615 let cwd = cwd.to_path_buf();
616 let mcp_servers = mcp_servers_for_project(&project, cx);
617 let action_log = cx.new(|_| ActionLog::new(project.clone()));
618 let title = title.unwrap_or_else(|| self.display_name.clone());
619 let thread: Entity<AcpThread> = cx.new(|cx| {
620 AcpThread::new(
621 None,
622 title,
623 Some(cwd.clone()),
624 self.clone(),
625 project,
626 action_log,
627 session_id.clone(),
628 watch::Receiver::constant(self.agent_capabilities.prompt_capabilities.clone()),
629 cx,
630 )
631 });
632
633 self.sessions.borrow_mut().insert(
634 session_id.clone(),
635 AcpSession {
636 thread: thread.downgrade(),
637 suppress_abort_err: false,
638 session_modes: None,
639 models: None,
640 config_options: None,
641 },
642 );
643
644 cx.spawn(async move |_| {
645 let response = match self
646 .connection
647 .load_session(
648 acp::LoadSessionRequest::new(session_id.clone(), cwd).mcp_servers(mcp_servers),
649 )
650 .await
651 {
652 Ok(response) => response,
653 Err(err) => {
654 self.sessions.borrow_mut().remove(&session_id);
655 return Err(map_acp_error(err));
656 }
657 };
658
659 let (modes, models, config_options) =
660 config_state(response.modes, response.models, response.config_options);
661 if let Some(session) = self.sessions.borrow_mut().get_mut(&session_id) {
662 session.session_modes = modes;
663 session.models = models;
664 session.config_options = config_options.map(ConfigOptions::new);
665 }
666
667 Ok(thread)
668 })
669 }
670
671 fn resume_session(
672 self: Rc<Self>,
673 session_id: acp::SessionId,
674 project: Entity<Project>,
675 cwd: &Path,
676 title: Option<SharedString>,
677 cx: &mut App,
678 ) -> Task<Result<Entity<AcpThread>>> {
679 if self
680 .agent_capabilities
681 .session_capabilities
682 .resume
683 .is_none()
684 {
685 return Task::ready(Err(anyhow!(LoadError::Other(
686 "Resuming sessions is not supported by this agent.".into()
687 ))));
688 }
689
690 let cwd = cwd.to_path_buf();
691 let mcp_servers = mcp_servers_for_project(&project, cx);
692 let action_log = cx.new(|_| ActionLog::new(project.clone()));
693 let title = title.unwrap_or_else(|| self.display_name.clone());
694 let thread: Entity<AcpThread> = cx.new(|cx| {
695 AcpThread::new(
696 None,
697 title,
698 Some(cwd.clone()),
699 self.clone(),
700 project,
701 action_log,
702 session_id.clone(),
703 watch::Receiver::constant(self.agent_capabilities.prompt_capabilities.clone()),
704 cx,
705 )
706 });
707
708 self.sessions.borrow_mut().insert(
709 session_id.clone(),
710 AcpSession {
711 thread: thread.downgrade(),
712 suppress_abort_err: false,
713 session_modes: None,
714 models: None,
715 config_options: None,
716 },
717 );
718
719 cx.spawn(async move |_| {
720 let response = match self
721 .connection
722 .resume_session(
723 acp::ResumeSessionRequest::new(session_id.clone(), cwd)
724 .mcp_servers(mcp_servers),
725 )
726 .await
727 {
728 Ok(response) => response,
729 Err(err) => {
730 self.sessions.borrow_mut().remove(&session_id);
731 return Err(map_acp_error(err));
732 }
733 };
734
735 let (modes, models, config_options) =
736 config_state(response.modes, response.models, response.config_options);
737 if let Some(session) = self.sessions.borrow_mut().get_mut(&session_id) {
738 session.session_modes = modes;
739 session.models = models;
740 session.config_options = config_options.map(ConfigOptions::new);
741 }
742
743 Ok(thread)
744 })
745 }
746
747 fn auth_methods(&self) -> &[acp::AuthMethod] {
748 &self.auth_methods
749 }
750
751 fn authenticate(&self, method_id: acp::AuthMethodId, cx: &mut App) -> Task<Result<()>> {
752 let conn = self.connection.clone();
753 cx.foreground_executor().spawn(async move {
754 conn.authenticate(acp::AuthenticateRequest::new(method_id))
755 .await?;
756 Ok(())
757 })
758 }
759
760 fn prompt(
761 &self,
762 _id: Option<acp_thread::UserMessageId>,
763 params: acp::PromptRequest,
764 cx: &mut App,
765 ) -> Task<Result<acp::PromptResponse>> {
766 let conn = self.connection.clone();
767 let sessions = self.sessions.clone();
768 let session_id = params.session_id.clone();
769 cx.foreground_executor().spawn(async move {
770 let result = conn.prompt(params).await;
771
772 let mut suppress_abort_err = false;
773
774 if let Some(session) = sessions.borrow_mut().get_mut(&session_id) {
775 suppress_abort_err = session.suppress_abort_err;
776 session.suppress_abort_err = false;
777 }
778
779 match result {
780 Ok(response) => Ok(response),
781 Err(err) => {
782 if err.code == acp::ErrorCode::AuthRequired {
783 return Err(anyhow!(acp::Error::auth_required()));
784 }
785
786 if err.code != ErrorCode::InternalError {
787 anyhow::bail!(err)
788 }
789
790 let Some(data) = &err.data else {
791 anyhow::bail!(err)
792 };
793
794 // Temporary workaround until the following PR is generally available:
795 // https://github.com/google-gemini/gemini-cli/pull/6656
796
797 #[derive(Deserialize)]
798 #[serde(deny_unknown_fields)]
799 struct ErrorDetails {
800 details: Box<str>,
801 }
802
803 match serde_json::from_value(data.clone()) {
804 Ok(ErrorDetails { details }) => {
805 if suppress_abort_err
806 && (details.contains("This operation was aborted")
807 || details.contains("The user aborted a request"))
808 {
809 Ok(acp::PromptResponse::new(acp::StopReason::Cancelled))
810 } else {
811 Err(anyhow!(details))
812 }
813 }
814 Err(_) => Err(anyhow!(err)),
815 }
816 }
817 }
818 })
819 }
820
821 fn cancel(&self, session_id: &acp::SessionId, cx: &mut App) {
822 if let Some(session) = self.sessions.borrow_mut().get_mut(session_id) {
823 session.suppress_abort_err = true;
824 }
825 let conn = self.connection.clone();
826 let params = acp::CancelNotification::new(session_id.clone());
827 cx.foreground_executor()
828 .spawn(async move { conn.cancel(params).await })
829 .detach();
830 }
831
832 fn session_modes(
833 &self,
834 session_id: &acp::SessionId,
835 _cx: &App,
836 ) -> Option<Rc<dyn acp_thread::AgentSessionModes>> {
837 let sessions = self.sessions.clone();
838 let sessions_ref = sessions.borrow();
839 let Some(session) = sessions_ref.get(session_id) else {
840 return None;
841 };
842
843 if let Some(modes) = session.session_modes.as_ref() {
844 Some(Rc::new(AcpSessionModes {
845 connection: self.connection.clone(),
846 session_id: session_id.clone(),
847 state: modes.clone(),
848 }) as _)
849 } else {
850 None
851 }
852 }
853
854 fn model_selector(
855 &self,
856 session_id: &acp::SessionId,
857 ) -> Option<Rc<dyn acp_thread::AgentModelSelector>> {
858 let sessions = self.sessions.clone();
859 let sessions_ref = sessions.borrow();
860 let Some(session) = sessions_ref.get(session_id) else {
861 return None;
862 };
863
864 if let Some(models) = session.models.as_ref() {
865 Some(Rc::new(AcpModelSelector::new(
866 session_id.clone(),
867 self.connection.clone(),
868 models.clone(),
869 )) as _)
870 } else {
871 None
872 }
873 }
874
875 fn session_config_options(
876 &self,
877 session_id: &acp::SessionId,
878 _cx: &App,
879 ) -> Option<Rc<dyn acp_thread::AgentSessionConfigOptions>> {
880 let sessions = self.sessions.borrow();
881 let session = sessions.get(session_id)?;
882
883 let config_opts = session.config_options.as_ref()?;
884
885 Some(Rc::new(AcpSessionConfigOptions {
886 session_id: session_id.clone(),
887 connection: self.connection.clone(),
888 state: config_opts.config_options.clone(),
889 watch_tx: config_opts.tx.clone(),
890 watch_rx: config_opts.rx.clone(),
891 }) as _)
892 }
893
894 fn session_list(&self, _cx: &mut App) -> Option<Rc<dyn AgentSessionList>> {
895 self.session_list.clone().map(|s| s as _)
896 }
897
898 fn into_any(self: Rc<Self>) -> Rc<dyn Any> {
899 self
900 }
901}
902
903fn map_acp_error(err: acp::Error) -> anyhow::Error {
904 if err.code == acp::ErrorCode::AuthRequired {
905 let mut error = AuthRequired::new();
906
907 if err.message != acp::ErrorCode::AuthRequired.to_string() {
908 error = error.with_description(err.message);
909 }
910
911 anyhow!(error)
912 } else {
913 anyhow!(err)
914 }
915}
916
917fn mcp_servers_for_project(project: &Entity<Project>, cx: &App) -> Vec<acp::McpServer> {
918 let context_server_store = project.read(cx).context_server_store().read(cx);
919 let is_local = project.read(cx).is_local();
920 context_server_store
921 .configured_server_ids()
922 .iter()
923 .filter_map(|id| {
924 let configuration = context_server_store.configuration_for_server(id)?;
925 match &*configuration {
926 project::context_server_store::ContextServerConfiguration::Custom {
927 command,
928 remote,
929 ..
930 }
931 | project::context_server_store::ContextServerConfiguration::Extension {
932 command,
933 remote,
934 ..
935 } if is_local || *remote => Some(acp::McpServer::Stdio(
936 acp::McpServerStdio::new(id.0.to_string(), &command.path)
937 .args(command.args.clone())
938 .env(if let Some(env) = command.env.as_ref() {
939 env.iter()
940 .map(|(name, value)| acp::EnvVariable::new(name, value))
941 .collect()
942 } else {
943 vec![]
944 }),
945 )),
946 project::context_server_store::ContextServerConfiguration::Http {
947 url,
948 headers,
949 timeout: _,
950 } => Some(acp::McpServer::Http(
951 acp::McpServerHttp::new(id.0.to_string(), url.to_string()).headers(
952 headers
953 .iter()
954 .map(|(name, value)| acp::HttpHeader::new(name, value))
955 .collect(),
956 ),
957 )),
958 _ => None,
959 }
960 })
961 .collect()
962}
963
964fn config_state(
965 modes: Option<acp::SessionModeState>,
966 models: Option<acp::SessionModelState>,
967 config_options: Option<Vec<acp::SessionConfigOption>>,
968) -> (
969 Option<Rc<RefCell<acp::SessionModeState>>>,
970 Option<Rc<RefCell<acp::SessionModelState>>>,
971 Option<Rc<RefCell<Vec<acp::SessionConfigOption>>>>,
972) {
973 if let Some(opts) = config_options {
974 return (None, None, Some(Rc::new(RefCell::new(opts))));
975 }
976
977 let modes = modes.map(|modes| Rc::new(RefCell::new(modes)));
978 let models = models.map(|models| Rc::new(RefCell::new(models)));
979 (modes, models, None)
980}
981
982struct AcpSessionModes {
983 session_id: acp::SessionId,
984 connection: Rc<acp::ClientSideConnection>,
985 state: Rc<RefCell<acp::SessionModeState>>,
986}
987
988impl acp_thread::AgentSessionModes for AcpSessionModes {
989 fn current_mode(&self) -> acp::SessionModeId {
990 self.state.borrow().current_mode_id.clone()
991 }
992
993 fn all_modes(&self) -> Vec<acp::SessionMode> {
994 self.state.borrow().available_modes.clone()
995 }
996
997 fn set_mode(&self, mode_id: acp::SessionModeId, cx: &mut App) -> Task<Result<()>> {
998 let connection = self.connection.clone();
999 let session_id = self.session_id.clone();
1000 let old_mode_id;
1001 {
1002 let mut state = self.state.borrow_mut();
1003 old_mode_id = state.current_mode_id.clone();
1004 state.current_mode_id = mode_id.clone();
1005 };
1006 let state = self.state.clone();
1007 cx.foreground_executor().spawn(async move {
1008 let result = connection
1009 .set_session_mode(acp::SetSessionModeRequest::new(session_id, mode_id))
1010 .await;
1011
1012 if result.is_err() {
1013 state.borrow_mut().current_mode_id = old_mode_id;
1014 }
1015
1016 result?;
1017
1018 Ok(())
1019 })
1020 }
1021}
1022
1023struct AcpModelSelector {
1024 session_id: acp::SessionId,
1025 connection: Rc<acp::ClientSideConnection>,
1026 state: Rc<RefCell<acp::SessionModelState>>,
1027}
1028
1029impl AcpModelSelector {
1030 fn new(
1031 session_id: acp::SessionId,
1032 connection: Rc<acp::ClientSideConnection>,
1033 state: Rc<RefCell<acp::SessionModelState>>,
1034 ) -> Self {
1035 Self {
1036 session_id,
1037 connection,
1038 state,
1039 }
1040 }
1041}
1042
1043impl acp_thread::AgentModelSelector for AcpModelSelector {
1044 fn list_models(&self, _cx: &mut App) -> Task<Result<acp_thread::AgentModelList>> {
1045 Task::ready(Ok(acp_thread::AgentModelList::Flat(
1046 self.state
1047 .borrow()
1048 .available_models
1049 .clone()
1050 .into_iter()
1051 .map(acp_thread::AgentModelInfo::from)
1052 .collect(),
1053 )))
1054 }
1055
1056 fn select_model(&self, model_id: acp::ModelId, cx: &mut App) -> Task<Result<()>> {
1057 let connection = self.connection.clone();
1058 let session_id = self.session_id.clone();
1059 let old_model_id;
1060 {
1061 let mut state = self.state.borrow_mut();
1062 old_model_id = state.current_model_id.clone();
1063 state.current_model_id = model_id.clone();
1064 };
1065 let state = self.state.clone();
1066 cx.foreground_executor().spawn(async move {
1067 let result = connection
1068 .set_session_model(acp::SetSessionModelRequest::new(session_id, model_id))
1069 .await;
1070
1071 if result.is_err() {
1072 state.borrow_mut().current_model_id = old_model_id;
1073 }
1074
1075 result?;
1076
1077 Ok(())
1078 })
1079 }
1080
1081 fn selected_model(&self, _cx: &mut App) -> Task<Result<acp_thread::AgentModelInfo>> {
1082 let state = self.state.borrow();
1083 Task::ready(
1084 state
1085 .available_models
1086 .iter()
1087 .find(|m| m.model_id == state.current_model_id)
1088 .cloned()
1089 .map(acp_thread::AgentModelInfo::from)
1090 .ok_or_else(|| anyhow::anyhow!("Model not found")),
1091 )
1092 }
1093}
1094
1095struct AcpSessionConfigOptions {
1096 session_id: acp::SessionId,
1097 connection: Rc<acp::ClientSideConnection>,
1098 state: Rc<RefCell<Vec<acp::SessionConfigOption>>>,
1099 watch_tx: Rc<RefCell<watch::Sender<()>>>,
1100 watch_rx: watch::Receiver<()>,
1101}
1102
1103impl acp_thread::AgentSessionConfigOptions for AcpSessionConfigOptions {
1104 fn config_options(&self) -> Vec<acp::SessionConfigOption> {
1105 self.state.borrow().clone()
1106 }
1107
1108 fn set_config_option(
1109 &self,
1110 config_id: acp::SessionConfigId,
1111 value: acp::SessionConfigValueId,
1112 cx: &mut App,
1113 ) -> Task<Result<Vec<acp::SessionConfigOption>>> {
1114 let connection = self.connection.clone();
1115 let session_id = self.session_id.clone();
1116 let state = self.state.clone();
1117
1118 let watch_tx = self.watch_tx.clone();
1119
1120 cx.foreground_executor().spawn(async move {
1121 let response = connection
1122 .set_session_config_option(acp::SetSessionConfigOptionRequest::new(
1123 session_id, config_id, value,
1124 ))
1125 .await?;
1126
1127 *state.borrow_mut() = response.config_options.clone();
1128 watch_tx.borrow_mut().send(()).ok();
1129 Ok(response.config_options)
1130 })
1131 }
1132
1133 fn watch(&self, _cx: &mut App) -> Option<watch::Receiver<()>> {
1134 Some(self.watch_rx.clone())
1135 }
1136}
1137
1138struct ClientDelegate {
1139 sessions: Rc<RefCell<HashMap<acp::SessionId, AcpSession>>>,
1140 session_list: Rc<RefCell<Option<Rc<AcpSessionList>>>>,
1141 cx: AsyncApp,
1142}
1143
1144#[async_trait::async_trait(?Send)]
1145impl acp::Client for ClientDelegate {
1146 async fn request_permission(
1147 &self,
1148 arguments: acp::RequestPermissionRequest,
1149 ) -> Result<acp::RequestPermissionResponse, acp::Error> {
1150 let thread;
1151 {
1152 let sessions_ref = self.sessions.borrow();
1153 let session = sessions_ref
1154 .get(&arguments.session_id)
1155 .context("Failed to get session")?;
1156 thread = session.thread.clone();
1157 }
1158
1159 let cx = &mut self.cx.clone();
1160
1161 let task = thread.update(cx, |thread, cx| {
1162 thread.request_tool_call_authorization(
1163 arguments.tool_call,
1164 acp_thread::PermissionOptions::Flat(arguments.options),
1165 cx,
1166 )
1167 })??;
1168
1169 let outcome = task.await;
1170
1171 Ok(acp::RequestPermissionResponse::new(outcome))
1172 }
1173
1174 async fn write_text_file(
1175 &self,
1176 arguments: acp::WriteTextFileRequest,
1177 ) -> Result<acp::WriteTextFileResponse, acp::Error> {
1178 let cx = &mut self.cx.clone();
1179 let task = self
1180 .session_thread(&arguments.session_id)?
1181 .update(cx, |thread, cx| {
1182 thread.write_text_file(arguments.path, arguments.content, cx)
1183 })?;
1184
1185 task.await?;
1186
1187 Ok(Default::default())
1188 }
1189
1190 async fn read_text_file(
1191 &self,
1192 arguments: acp::ReadTextFileRequest,
1193 ) -> Result<acp::ReadTextFileResponse, acp::Error> {
1194 let task = self.session_thread(&arguments.session_id)?.update(
1195 &mut self.cx.clone(),
1196 |thread, cx| {
1197 thread.read_text_file(arguments.path, arguments.line, arguments.limit, false, cx)
1198 },
1199 )?;
1200
1201 let content = task.await?;
1202
1203 Ok(acp::ReadTextFileResponse::new(content))
1204 }
1205
1206 async fn session_notification(
1207 &self,
1208 notification: acp::SessionNotification,
1209 ) -> Result<(), acp::Error> {
1210 let sessions = self.sessions.borrow();
1211 let session = sessions
1212 .get(¬ification.session_id)
1213 .context("Failed to get session")?;
1214
1215 if let acp::SessionUpdate::CurrentModeUpdate(acp::CurrentModeUpdate {
1216 current_mode_id,
1217 ..
1218 }) = ¬ification.update
1219 {
1220 if let Some(session_modes) = &session.session_modes {
1221 session_modes.borrow_mut().current_mode_id = current_mode_id.clone();
1222 }
1223 }
1224
1225 if let acp::SessionUpdate::ConfigOptionUpdate(acp::ConfigOptionUpdate {
1226 config_options,
1227 ..
1228 }) = ¬ification.update
1229 {
1230 if let Some(opts) = &session.config_options {
1231 *opts.config_options.borrow_mut() = config_options.clone();
1232 opts.tx.borrow_mut().send(()).ok();
1233 }
1234 }
1235
1236 if let acp::SessionUpdate::SessionInfoUpdate(info_update) = ¬ification.update
1237 && let Some(session_list) = self.session_list.borrow().as_ref()
1238 {
1239 session_list.send_info_update(notification.session_id.clone(), info_update.clone());
1240 }
1241
1242 // Clone so we can inspect meta both before and after handing off to the thread
1243 let update_clone = notification.update.clone();
1244
1245 // Pre-handle: if a ToolCall carries terminal_info, create/register a display-only terminal.
1246 if let acp::SessionUpdate::ToolCall(tc) = &update_clone {
1247 if let Some(meta) = &tc.meta {
1248 if let Some(terminal_info) = meta.get("terminal_info") {
1249 if let Some(id_str) = terminal_info.get("terminal_id").and_then(|v| v.as_str())
1250 {
1251 let terminal_id = acp::TerminalId::new(id_str);
1252 let cwd = terminal_info
1253 .get("cwd")
1254 .and_then(|v| v.as_str().map(PathBuf::from));
1255
1256 // Create a minimal display-only lower-level terminal and register it.
1257 let _ = session.thread.update(&mut self.cx.clone(), |thread, cx| {
1258 let builder = TerminalBuilder::new_display_only(
1259 CursorShape::default(),
1260 AlternateScroll::On,
1261 None,
1262 0,
1263 cx.background_executor(),
1264 thread.project().read(cx).path_style(cx),
1265 )?;
1266 let lower = cx.new(|cx| builder.subscribe(cx));
1267 thread.on_terminal_provider_event(
1268 TerminalProviderEvent::Created {
1269 terminal_id,
1270 label: tc.title.clone(),
1271 cwd,
1272 output_byte_limit: None,
1273 terminal: lower,
1274 },
1275 cx,
1276 );
1277 anyhow::Ok(())
1278 });
1279 }
1280 }
1281 }
1282 }
1283
1284 // Forward the update to the acp_thread as usual.
1285 session.thread.update(&mut self.cx.clone(), |thread, cx| {
1286 thread.handle_session_update(notification.update.clone(), cx)
1287 })??;
1288
1289 // Post-handle: stream terminal output/exit if present on ToolCallUpdate meta.
1290 if let acp::SessionUpdate::ToolCallUpdate(tcu) = &update_clone {
1291 if let Some(meta) = &tcu.meta {
1292 if let Some(term_out) = meta.get("terminal_output") {
1293 if let Some(id_str) = term_out.get("terminal_id").and_then(|v| v.as_str()) {
1294 let terminal_id = acp::TerminalId::new(id_str);
1295 if let Some(s) = term_out.get("data").and_then(|v| v.as_str()) {
1296 let data = s.as_bytes().to_vec();
1297 let _ = session.thread.update(&mut self.cx.clone(), |thread, cx| {
1298 thread.on_terminal_provider_event(
1299 TerminalProviderEvent::Output { terminal_id, data },
1300 cx,
1301 );
1302 });
1303 }
1304 }
1305 }
1306
1307 // terminal_exit
1308 if let Some(term_exit) = meta.get("terminal_exit") {
1309 if let Some(id_str) = term_exit.get("terminal_id").and_then(|v| v.as_str()) {
1310 let terminal_id = acp::TerminalId::new(id_str);
1311 let status = acp::TerminalExitStatus::new()
1312 .exit_code(
1313 term_exit
1314 .get("exit_code")
1315 .and_then(|v| v.as_u64())
1316 .map(|i| i as u32),
1317 )
1318 .signal(
1319 term_exit
1320 .get("signal")
1321 .and_then(|v| v.as_str().map(|s| s.to_string())),
1322 );
1323
1324 let _ = session.thread.update(&mut self.cx.clone(), |thread, cx| {
1325 thread.on_terminal_provider_event(
1326 TerminalProviderEvent::Exit {
1327 terminal_id,
1328 status,
1329 },
1330 cx,
1331 );
1332 });
1333 }
1334 }
1335 }
1336 }
1337
1338 Ok(())
1339 }
1340
1341 async fn create_terminal(
1342 &self,
1343 args: acp::CreateTerminalRequest,
1344 ) -> Result<acp::CreateTerminalResponse, acp::Error> {
1345 let thread = self.session_thread(&args.session_id)?;
1346 let project = thread.read_with(&self.cx, |thread, _cx| thread.project().clone())?;
1347
1348 let terminal_entity = acp_thread::create_terminal_entity(
1349 args.command.clone(),
1350 &args.args,
1351 args.env
1352 .into_iter()
1353 .map(|env| (env.name, env.value))
1354 .collect(),
1355 args.cwd.clone(),
1356 &project,
1357 &mut self.cx.clone(),
1358 )
1359 .await?;
1360
1361 // Register with renderer
1362 let terminal_entity = thread.update(&mut self.cx.clone(), |thread, cx| {
1363 thread.register_terminal_created(
1364 acp::TerminalId::new(uuid::Uuid::new_v4().to_string()),
1365 format!("{} {}", args.command, args.args.join(" ")),
1366 args.cwd.clone(),
1367 args.output_byte_limit,
1368 terminal_entity,
1369 cx,
1370 )
1371 })?;
1372 let terminal_id = terminal_entity.read_with(&self.cx, |terminal, _| terminal.id().clone());
1373 Ok(acp::CreateTerminalResponse::new(terminal_id))
1374 }
1375
1376 async fn kill_terminal_command(
1377 &self,
1378 args: acp::KillTerminalCommandRequest,
1379 ) -> Result<acp::KillTerminalCommandResponse, acp::Error> {
1380 self.session_thread(&args.session_id)?
1381 .update(&mut self.cx.clone(), |thread, cx| {
1382 thread.kill_terminal(args.terminal_id, cx)
1383 })??;
1384
1385 Ok(Default::default())
1386 }
1387
1388 async fn ext_method(&self, _args: acp::ExtRequest) -> Result<acp::ExtResponse, acp::Error> {
1389 Err(acp::Error::method_not_found())
1390 }
1391
1392 async fn ext_notification(&self, _args: acp::ExtNotification) -> Result<(), acp::Error> {
1393 Err(acp::Error::method_not_found())
1394 }
1395
1396 async fn release_terminal(
1397 &self,
1398 args: acp::ReleaseTerminalRequest,
1399 ) -> Result<acp::ReleaseTerminalResponse, acp::Error> {
1400 self.session_thread(&args.session_id)?
1401 .update(&mut self.cx.clone(), |thread, cx| {
1402 thread.release_terminal(args.terminal_id, cx)
1403 })??;
1404
1405 Ok(Default::default())
1406 }
1407
1408 async fn terminal_output(
1409 &self,
1410 args: acp::TerminalOutputRequest,
1411 ) -> Result<acp::TerminalOutputResponse, acp::Error> {
1412 self.session_thread(&args.session_id)?
1413 .read_with(&mut self.cx.clone(), |thread, cx| {
1414 let out = thread
1415 .terminal(args.terminal_id)?
1416 .read(cx)
1417 .current_output(cx);
1418
1419 Ok(out)
1420 })?
1421 }
1422
1423 async fn wait_for_terminal_exit(
1424 &self,
1425 args: acp::WaitForTerminalExitRequest,
1426 ) -> Result<acp::WaitForTerminalExitResponse, acp::Error> {
1427 let exit_status = self
1428 .session_thread(&args.session_id)?
1429 .update(&mut self.cx.clone(), |thread, cx| {
1430 anyhow::Ok(thread.terminal(args.terminal_id)?.read(cx).wait_for_exit())
1431 })??
1432 .await;
1433
1434 Ok(acp::WaitForTerminalExitResponse::new(exit_status))
1435 }
1436}
1437
1438impl ClientDelegate {
1439 fn session_thread(&self, session_id: &acp::SessionId) -> Result<WeakEntity<AcpThread>> {
1440 let sessions = self.sessions.borrow();
1441 sessions
1442 .get(session_id)
1443 .context("Failed to get session")
1444 .map(|session| session.thread.clone())
1445 }
1446}