Danilo Leal
28f50977cf
This PR builds on top of the `default_mode` feature where it was possible to set an external agent mode as the default if you held a modifier while clicking on the desired option. Now, if you want to have, for example, Haiku as your default Claude Code model, you can do that. This feature adds parity between external agents and Zed's built-in one, which already supported this feature for a little while. Note: This still doesn't work with external agents installed from extensions. At the moment, this is limited to Claude Code, Codex, and Gemini—the ones we include out of the box. Release Notes: - agent: Added the ability to set a model as the default for a given built-in external agent (Claude Code, Codex CLI, or Gemini CLI).
109 lines
3.2 KiB
Rust
109 lines
3.2 KiB
Rust
use std::rc::Rc;
|
|
use std::{any::Any, path::Path};
|
|
|
|
use crate::{AgentServer, AgentServerDelegate, load_proxy_env};
|
|
use acp_thread::AgentConnection;
|
|
use anyhow::{Context as _, Result};
|
|
use gpui::{App, SharedString, Task};
|
|
use language_models::provider::google::GoogleLanguageModelProvider;
|
|
use project::agent_server_store::GEMINI_NAME;
|
|
|
|
#[derive(Clone)]
|
|
pub struct Gemini;
|
|
|
|
impl AgentServer for Gemini {
|
|
fn telemetry_id(&self) -> &'static str {
|
|
"gemini-cli"
|
|
}
|
|
|
|
fn name(&self) -> SharedString {
|
|
"Gemini CLI".into()
|
|
}
|
|
|
|
fn logo(&self) -> ui::IconName {
|
|
ui::IconName::AiGemini
|
|
}
|
|
|
|
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 telemetry_id = self.telemetry_id();
|
|
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 store = delegate.store.downgrade();
|
|
let mut extra_env = load_proxy_env(cx);
|
|
let default_mode = self.default_mode(cx);
|
|
let default_model = self.default_model(cx);
|
|
|
|
cx.spawn(async move |cx| {
|
|
extra_env.insert("SURFACE".to_owned(), "zed".to_owned());
|
|
|
|
if let Some(api_key) = cx
|
|
.update(GoogleLanguageModelProvider::api_key_for_gemini_cli)?
|
|
.await
|
|
.ok()
|
|
{
|
|
extra_env.insert("GEMINI_API_KEY".into(), api_key);
|
|
}
|
|
let (command, root_dir, login) = store
|
|
.update(cx, |store, cx| {
|
|
let agent = store
|
|
.get_external_agent(&GEMINI_NAME.into())
|
|
.context("Gemini CLI is not registered")?;
|
|
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,
|
|
telemetry_id,
|
|
command,
|
|
root_dir.as_ref(),
|
|
default_mode,
|
|
default_model,
|
|
is_remote,
|
|
cx,
|
|
)
|
|
.await?;
|
|
Ok((connection, login))
|
|
})
|
|
}
|
|
|
|
fn into_any(self: Rc<Self>) -> Rc<dyn Any> {
|
|
self
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
pub(crate) mod tests {
|
|
use project::agent_server_store::AgentServerCommand;
|
|
|
|
use super::*;
|
|
use std::path::Path;
|
|
|
|
crate::common_e2e_tests!(async |_, _, _| Gemini, allow_option_id = "proceed_once");
|
|
|
|
pub fn local_command() -> AgentServerCommand {
|
|
let cli_path = Path::new(env!("CARGO_MANIFEST_DIR"))
|
|
.join("../../../gemini-cli/packages/cli")
|
|
.to_string_lossy()
|
|
.to_string();
|
|
|
|
AgentServerCommand {
|
|
path: "node".into(),
|
|
args: vec![cli_path],
|
|
env: None,
|
|
}
|
|
}
|
|
}
|