oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

acp: Require gemini version 0.2.0 (#36960)

Browse Source 
Release Notes:

- N/A
This commit is contained in:
Conrad Irwin
2025-08-27 02:01:51 +00:00
committed by GitHub
parent d0aef3cec1
commit e6e64017ea
8 changed files with 130 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/agent_servers/src/acp.rs
+5 -1
View File
@@ -56,7 +56,7 @@ impl AcpConnection {
root_dir: &Path,
cx: &mut AsyncApp,
) -> Result<Self> {
let mut child = util::command::new_smol_command(&command.path)
let mut child = util::command::new_smol_command(command.path)
.args(command.args.iter().map(|arg| arg.as_str()))
.envs(command.env.iter().flatten())
.current_dir(root_dir)
@@ -150,6 +150,10 @@ impl AcpConnection {
_io_task: io_task,
})
}
pub fn prompt_capabilities(&self) -> &acp::PromptCapabilities {
&self.prompt_capabilities
}
}
impl AgentConnection for AcpConnection {
crates/agent_servers/src/agent_servers.rs
+2
View File
@@ -46,6 +46,8 @@ pub trait AgentServer: Send {
) -> Task<Result<Rc<dyn AgentConnection>>>;
fn into_any(self: Rc<Self>) -> Rc<dyn Any>;
fn install_command(&self) -> Option<&'static str>;
}
impl dyn AgentServer {
crates/agent_servers/src/claude.rs
+7 -16
View File
@@ -63,6 +63,10 @@ impl AgentServer for ClaudeCode {
ui::IconName::AiClaude
}
fn install_command(&self) -> Option<&'static str> {
Some("npm install -g @anthropic-ai/claude-code@latest")
}
fn connect(
&self,
_root_dir: &Path,
@@ -108,11 +112,7 @@ impl AgentConnection for ClaudeAgentConnection {
)
.await
else {
return Err(LoadError::NotInstalled {
error_message: "Failed to find Claude Code binary".into(),
install_message: "Install Claude Code".into(),
install_command: "npm install -g @anthropic-ai/claude-code@latest".into(),
}.into());
return Err(LoadError::NotInstalled.into());
};
let api_key =
@@ -230,17 +230,8 @@ impl AgentConnection for ClaudeAgentConnection {
|| !help.contains("--session-id"))
{
LoadError::Unsupported {
error_message: format!(
"Your installed version of Claude Code ({}, version {}) does not have required features for use with Zed.",
command.path.to_string_lossy(),
version,
)
.into(),
upgrade_message: "Upgrade Claude Code to latest".into(),
upgrade_command: format!(
"{} update",
command.path.to_string_lossy()
),
command: command.path.to_string_lossy().to_string().into(),
current_version: version.to_string().into(),
}
} else {
LoadError::Exited { status }
crates/agent_servers/src/custom.rs
+4
View File
@@ -57,6 +57,10 @@ impl crate::AgentServer for CustomAgentServer {
})
}
fn install_command(&self) -> Option<&'static str> {
None
}
fn into_any(self: Rc<Self>) -> Rc<dyn std::any::Any> {
self
}
crates/agent_servers/src/gemini.rs
+64 -34
View File
@@ -1,6 +1,7 @@
use std::rc::Rc;
use std::{any::Any, path::Path};
use crate::acp::AcpConnection;
use crate::{AgentServer, AgentServerCommand};
use acp_thread::{AgentConnection, LoadError};
use anyhow::Result;
@@ -37,6 +38,10 @@ impl AgentServer for Gemini {
ui::IconName::AiGemini
}
fn install_command(&self) -> Option<&'static str> {
Some("npm install -g @google/gemini-cli@latest")
}
fn connect(
&self,
root_dir: &Path,
@@ -52,48 +57,73 @@ impl AgentServer for Gemini {
})?;
let Some(mut command) =
AgentServerCommand::resolve("gemini", &[ACP_ARG], None, settings, &project, cx).await
AgentServerCommand::resolve("gemini", &[ACP_ARG], None, settings, &project, cx)
.await
else {
return Err(LoadError::NotInstalled {
error_message: "Failed to find Gemini CLI binary".into(),
install_message: "Install Gemini CLI".into(),
install_command: Self::install_command().into(),
}.into());
return Err(LoadError::NotInstalled.into());
};
if let Some(api_key)= cx.update(GoogleLanguageModelProvider::api_key)?.await.ok() {
command.env.get_or_insert_default().insert("GEMINI_API_KEY".to_owned(), api_key.key);
if let Some(api_key) = cx.update(GoogleLanguageModelProvider::api_key)?.await.ok() {
command
.env
.get_or_insert_default()
.insert("GEMINI_API_KEY".to_owned(), api_key.key);
}
let result = crate::acp::connect(server_name, command.clone(), &root_dir, cx).await;
if result.is_err() {
let version_fut = util::command::new_smol_command(&command.path)
.args(command.args.iter())
.arg("--version")
.kill_on_drop(true)
.output();
match &result {
Ok(connection) => {
if let Some(connection) = connection.clone().downcast::<AcpConnection>()
&& !connection.prompt_capabilities().image
{
let version_output = util::command::new_smol_command(&command.path)
.args(command.args.iter())
.arg("--version")
.kill_on_drop(true)
.output()
.await;
let current_version =
String::from_utf8(version_output?.stdout)?.trim().to_owned();
if !connection.prompt_capabilities().image {
return Err(LoadError::Unsupported {
current_version: current_version.into(),
command: format!(
"{} {}",
command.path.to_string_lossy(),
command.args.join(" ")
)
.into(),
}
.into());
}
}
}
Err(_) => {
let version_fut = util::command::new_smol_command(&command.path)
.args(command.args.iter())
.arg("--version")
.kill_on_drop(true)
.output();
let help_fut = util::command::new_smol_command(&command.path)
.args(command.args.iter())
.arg("--help")
.kill_on_drop(true)
.output();
let help_fut = util::command::new_smol_command(&command.path)
.args(command.args.iter())
.arg("--help")
.kill_on_drop(true)
.output();
let (version_output, help_output) = futures::future::join(version_fut, help_fut).await;
let (version_output, help_output) =
futures::future::join(version_fut, help_fut).await;
let current_version = String::from_utf8(version_output?.stdout)?;
let supported = String::from_utf8(help_output?.stdout)?.contains(ACP_ARG);
let current_version = String::from_utf8(version_output?.stdout)?;
let supported = String::from_utf8(help_output?.stdout)?.contains(ACP_ARG);
if !supported {
return Err(LoadError::Unsupported {
error_message: format!(
"Your installed version of Gemini CLI ({}, version {}) doesn't support the Agentic Coding Protocol (ACP).",
command.path.to_string_lossy(),
current_version
).into(),
upgrade_message: "Upgrade Gemini CLI to latest".into(),
upgrade_command: Self::upgrade_command().into(),
}.into())
if !supported {
return Err(LoadError::Unsupported {
current_version: current_version.into(),
command: command.path.to_string_lossy().to_string().into(),
}
.into());
}
}
}
result
@@ -111,11 +141,11 @@ impl Gemini {
}
pub fn install_command() -> &'static str {
"npm install -g @google/gemini-cli@preview"
"npm install -g @google/gemini-cli@latest"
}
pub fn upgrade_command() -> &'static str {
"npm install -g @google/gemini-cli@preview"
"npm install -g @google/gemini-cli@latest"
}
}