Cargo.lock 🔗
@@ -20,6 +20,7 @@ dependencies = [
"indoc",
"itertools 0.14.0",
"language",
+ "language_model",
"markdown",
"parking_lot",
"project",
Embed Anthropic configuration view
Agus Zubiaga created
Change summary
Cargo.lock | 1
crates/acp_thread/Cargo.toml | 1
crates/acp_thread/src/connection.rs | 10
crates/agent_servers/src/claude.rs | 61 -
crates/agent_ui/src/acp/thread_view.rs | 217 ++++---
crates/agent_ui/src/agent_configuration.rs | 6
crates/agent_ui/src/agent_ui.rs | 2
crates/agent_ui/src/language_model_selector.rs | 2
crates/ai_onboarding/src/agent_api_keys_onboarding.rs | 2
crates/ai_onboarding/src/agent_panel_onboarding_content.rs | 2
crates/language_model/src/fake_provider.rs | 15
crates/language_model/src/language_model.rs | 17
crates/language_model/src/registry.rs | 10
crates/language_models/src/provider/anthropic.rs | 43
crates/language_models/src/provider/bedrock.rs | 7
crates/language_models/src/provider/cloud.rs | 7
crates/language_models/src/provider/copilot_chat.rs | 7
crates/language_models/src/provider/deepseek.rs | 7
crates/language_models/src/provider/google.rs | 7
crates/language_models/src/provider/lmstudio.rs | 7
crates/language_models/src/provider/mistral.rs | 7
crates/language_models/src/provider/ollama.rs | 7
crates/language_models/src/provider/open_ai.rs | 7
crates/language_models/src/provider/open_ai_compatible.rs | 7
crates/language_models/src/provider/open_router.rs | 7
crates/language_models/src/provider/vercel.rs | 7
crates/language_models/src/provider/x_ai.rs | 7
crates/onboarding/src/ai_setup_page.rs | 6
28 files changed, 299 insertions(+), 187 deletions(-)
Detailed changes
crates/acp_thread/Cargo.toml 🔗
@@ -28,6 +28,7 @@ futures.workspace = true
gpui.workspace = true
itertools.workspace = true
language.workspace = true
+language_model.workspace = true
markdown.workspace = true
parking_lot = { workspace = true, optional = true }
project.workspace = true
crates/acp_thread/src/connection.rs 🔗
@@ -3,6 +3,7 @@ use agent_client_protocol::{self as acp};
use anyhow::Result;
use collections::IndexMap;
use gpui::{Entity, SharedString, Task};
+use language_model::LanguageModelProviderId;
use project::Project;
use std::{any::Any, error::Error, fmt, path::Path, rc::Rc, sync::Arc};
use ui::{App, IconName};
@@ -82,15 +83,14 @@ pub trait AgentSessionResume {
#[derive(Debug)]
pub struct AuthRequired {
pub description: Option<String>,
- /// A Task that resolves when authentication is updated
- pub update_task: Option<Task<()>>,
+ pub provider_id: Option<LanguageModelProviderId>,
}
impl AuthRequired {
pub fn new() -> Self {
Self {
description: None,
- update_task: None,
+ provider_id: None,
}
}
@@ -99,8 +99,8 @@ impl AuthRequired {
self
}
- pub fn with_update(mut self, update: Task<()>) -> Self {
- self.update_task = Some(update);
+ pub fn with_language_model_provider(mut self, provider_id: LanguageModelProviderId) -> Self {
+ self.provider_id = Some(provider_id);
self
}
}
crates/agent_servers/src/claude.rs 🔗
@@ -3,7 +3,6 @@ pub mod tools;
use collections::HashMap;
use context_server::listener::McpServerTool;
-use language_model::LanguageModelRegistry;
use language_models::provider::anthropic::AnthropicLanguageModelProvider;
use project::Project;
use settings::SettingsStore;
@@ -13,7 +12,6 @@ use std::cell::RefCell;
use std::fmt::Display;
use std::path::Path;
use std::rc::Rc;
-use std::sync::Arc;
use uuid::Uuid;
use agent_client_protocol as acp;
@@ -99,53 +97,18 @@ impl AgentConnection for ClaudeAgentConnection {
anyhow::bail!("Failed to find claude binary");
};
- let anthropic: Arc<AnthropicLanguageModelProvider> = cx.update(|cx| {
- let registry = LanguageModelRegistry::global(cx);
- let provider: Arc<dyn Any + Send + Sync> = registry
- .read(cx)
- .provider(&language_model::ANTHROPIC_PROVIDER_ID)
- .context("Failed to get Anthropic provider")?;
-
- Arc::downcast::<AnthropicLanguageModelProvider>(provider)
- .map_err(|_| anyhow!("Failed to downcast provider"))
- })??;
-
- let api_key = cx
- .update(|cx| AnthropicLanguageModelProvider::api_key(cx))?
- .await
- .map_err(|err| {
- if err.is::<language_model::AuthenticateError>() {
- let (update_tx, update_rx) = oneshot::channel();
- let mut update_tx = Some(update_tx);
-
- let sub = cx
- .update(|cx| {
- anthropic.observe(
- move |_cx| {
- if let Some(update_tx) = update_tx.take() {
- update_tx.send(()).ok();
- }
- },
- cx,
- )
- })
- .ok();
-
- let update_task = cx.foreground_executor().spawn(async move {
- update_rx.await.ok();
- drop(sub)
- });
-
- anyhow!(
- AuthRequired::new()
- .with_description(
- "To use Claude Code in Zed, you need an [Anthropic API key](https://console.anthropic.com/settings/keys)\n\nAdd one in [settings](zed:///agent/settings) or set the `ANTHROPIC_API_KEY` variable".into())
- .with_update(update_task)
- )
- } else {
- anyhow!(err)
- }
- })?;
+ let api_key =
+ cx.update(|cx| AnthropicLanguageModelProvider::api_key(cx))?
+ .await
+ .map_err(|err| {
+ if err.is::<language_model::AuthenticateError>() {
+ anyhow!(AuthRequired::new().with_language_model_provider(
+ language_model::ANTHROPIC_PROVIDER_ID
+ ))
+ } else {
+ anyhow!(err)
+ }
+ })?;
let (mut thread_tx, thread_rx) = watch::channel(WeakEntity::new_invalid());
let permission_mcp_server = ClaudeZedMcpServer::new(thread_rx.clone(), cx).await?;
crates/agent_ui/src/acp/thread_view.rs 🔗
@@ -1,6 +1,7 @@
use acp_thread::{
AcpThread, AcpThreadEvent, AgentThreadEntry, AssistantMessage, AssistantMessageChunk,
- LoadError, MentionUri, ThreadStatus, ToolCall, ToolCallContent, ToolCallStatus, UserMessageId,
+ AuthRequired, LoadError, MentionUri, ThreadStatus, ToolCall, ToolCallContent, ToolCallStatus,
+ UserMessageId,
};
use acp_thread::{AgentConnection, Plan};
use action_log::ActionLog;
@@ -18,13 +19,16 @@ use editor::{Editor, EditorMode, MultiBuffer, PathKey, SelectionEffects};
use file_icons::FileIcons;
use fs::Fs;
use gpui::{
- Action, Animation, AnimationExt, App, BorderStyle, ClickEvent, ClipboardItem, EdgesRefinement,
- Empty, Entity, FocusHandle, Focusable, Hsla, Length, ListOffset, ListState, MouseButton,
- PlatformDisplay, SharedString, Stateful, StyleRefinement, Subscription, Task, TextStyle,
- TextStyleRefinement, Transformation, UnderlineStyle, WeakEntity, Window, WindowHandle, div,
- linear_color_stop, linear_gradient, list, percentage, point, prelude::*, pulsating_between,
+ Action, Animation, AnimationExt, AnyView, App, BorderStyle, ClickEvent, ClipboardItem,
+ EdgesRefinement, Empty, Entity, FocusHandle, Focusable, Hsla, Length, ListOffset, ListState,
+ MouseButton, PlatformDisplay, SharedString, Stateful, StyleRefinement, Subscription, Task,
+ TextStyle, TextStyleRefinement, Transformation, UnderlineStyle, WeakEntity, Window,
+ WindowHandle, div, linear_color_stop, linear_gradient, list, percentage, point, prelude::*,
+ pulsating_between,
};
use language::Buffer;
+
+use language_model::LanguageModelRegistry;
use markdown::{HeadingLevelStyles, Markdown, MarkdownElement, MarkdownStyle};
use project::Project;
use prompt_store::PromptId;
@@ -138,6 +142,8 @@ enum ThreadState {
Unauthenticated {
connection: Rc<dyn AgentConnection>,
description: Option<Entity<Markdown>>,
+ configuration_view: Option<AnyView>,
+ _subscription: Option<Subscription>,
},
ServerExited {
status: ExitStatus,
@@ -268,44 +274,16 @@ impl AcpThreadView {
};
let result = match result.await {
- Err(e) => {
- let mut cx = cx.clone();
- match e.downcast::<acp_thread::AuthRequired>() {
- Ok(mut err) => {
- if let Some(update_task) = err.update_task.take() {
- let this = this.clone();
- let project = project.clone();
- cx.spawn(async move |cx| {
- update_task.await;
- this.update_in(cx, |this, window, cx| {
- this.thread_state = Self::initial_state(
- agent,
- this.workspace.clone(),
- project.clone(),
- window,
- cx,
- );
- cx.notify();
- })
- .ok();
- })
- .detach();
- }
- this.update(&mut cx, |this, cx| {
- this.thread_state = ThreadState::Unauthenticated {
- connection,
- description: err.description.clone().map(|desc| {
- cx.new(|cx| Markdown::new(desc.into(), None, None, cx))
- }),
- };
- cx.notify();
- })
- .ok();
- return;
- }
- Err(err) => Err(err),
+ Err(e) => match e.downcast::<acp_thread::AuthRequired>() {
+ Ok(err) => {
+ cx.update(|window, cx| {
+ Self::handle_auth_required(this, err, agent, connection, window, cx)
+ })
+ .log_err();
+ return;
}
- }
+ Err(err) => Err(err),
+ },
Ok(thread) => Ok(thread),
};
@@ -371,6 +349,68 @@ impl AcpThreadView {
ThreadState::Loading { _task: load_task }
}
+ fn handle_auth_required(
+ this: WeakEntity<Self>,
+ err: AuthRequired,
+ agent: Rc<dyn AgentServer>,
+ connection: Rc<dyn AgentConnection>,
+ window: &mut Window,
+ cx: &mut App,
+ ) {
+ let agent_name = agent.name();
+ let (configuration_view, subscription) = if let Some(provider_id) = err.provider_id {
+ let registry = LanguageModelRegistry::global(cx);
+
+ let sub = window.subscribe(®istry, cx, {
+ let provider_id = provider_id.clone();
+ let this = this.clone();
+ move |_, ev, window, cx| {
+ if let language_model::Event::ProviderStateChanged(updated_provider_id) = &ev {
+ if &provider_id == updated_provider_id {
+ this.update(cx, |this, cx| {
+ this.thread_state = Self::initial_state(
+ agent.clone(),
+ this.workspace.clone(),
+ this.project.clone(),
+ window,
+ cx,
+ );
+ cx.notify();
+ })
+ .ok();
+ }
+ }
+ }
+ });
+
+ let view = registry.read(cx).provider(&provider_id).map(|provider| {
+ provider.configuration_view(
+ language_model::ConfigurationViewTargetAgent::Other(agent_name),
+ window,
+ cx,
+ )
+ });
+
+ (view, Some(sub))
+ } else {
+ (None, None)
+ };
+
+ this.update(cx, |this, cx| {
+ this.thread_state = ThreadState::Unauthenticated {
+ connection,
+ configuration_view,
+ description: err
+ .description
+ .clone()
+ .map(|desc| cx.new(|cx| Markdown::new(desc.into(), None, None, cx))),
+ _subscription: subscription,
+ };
+ cx.notify();
+ })
+ .ok();
+ }
+
fn handle_load_error(&mut self, err: anyhow::Error, cx: &mut Context<Self>) {
if let Some(load_err) = err.downcast_ref::<LoadError>() {
self.thread_state = ThreadState::LoadError(load_err.clone());
@@ -1867,19 +1907,53 @@ impl AcpThreadView {
.into_any()
}
- fn render_pending_auth_state(&self) -> AnyElement {
+ fn render_auth_required_state(
+ &self,
+ connection: &Rc<dyn AgentConnection>,
+ description: Option<&Entity<Markdown>>,
+ configuration_view: Option<&AnyView>,
+ window: &mut Window,
+ cx: &Context<Self>,
+ ) -> Div {
v_flex()
+ .p_2()
+ .gap_2()
+ .flex_1()
.items_center()
.justify_center()
- .child(self.render_error_agent_logo())
.child(
- h_flex()
- .mt_4()
- .mb_1()
+ v_flex()
+ .items_center()
.justify_center()
- .child(Headline::new("Authentication Required").size(HeadlineSize::Medium)),
+ .child(self.render_error_agent_logo())
+ .child(
+ h_flex().mt_4().mb_1().justify_center().child(
+ Headline::new("Authentication Required").size(HeadlineSize::Medium),
+ ),
+ )
+ .into_any(),
)
- .into_any()
+ .children(description.map(|desc| {
+ div().text_ui(cx).text_center().child(
+ self.render_markdown(desc.clone(), default_markdown_style(false, window, cx)),
+ )
+ }))
+ .children(
+ configuration_view
+ .cloned()
+ .map(|view| div().px_4().w_full().max_w_128().child(view)),
+ )
+ .child(h_flex().mt_1p5().justify_center().children(
+ connection.auth_methods().into_iter().map(|method| {
+ Button::new(SharedString::from(method.id.0.clone()), method.name.clone())
+ .on_click({
+ let method_id = method.id.clone();
+ cx.listener(move |this, _, window, cx| {
+ this.authenticate(method_id.clone(), window, cx)
+ })
+ })
+ }),
+ ))
}
fn render_server_exited(&self, status: ExitStatus, _cx: &Context<Self>) -> AnyElement {
@@ -2804,13 +2878,6 @@ impl AcpThreadView {
cx.open_url(url.as_str());
}
})
- } else if url == "zed:///agent/settings" {
- workspace.update(cx, |workspace, cx| {
- if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
- workspace.focus_panel::<AgentPanel>(window, cx);
- panel.update(cx, |panel, cx| panel.open_configuration(window, cx));
- }
- });
} else {
cx.open_url(&url);
}
@@ -3383,33 +3450,15 @@ impl Render for AcpThreadView {
ThreadState::Unauthenticated {
connection,
description,
- } => v_flex()
- .p_2()
- .gap_2()
- .flex_1()
- .items_center()
- .justify_center()
- .child(self.render_pending_auth_state())
- .text_ui(cx)
- .text_center()
- .text_color(cx.theme().colors().text_muted)
- .children(description.clone().map(|desc| {
- self.render_markdown(desc, default_markdown_style(false, window, cx))
- }))
- .child(h_flex().mt_1p5().justify_center().children(
- connection.auth_methods().into_iter().map(|method| {
- Button::new(
- SharedString::from(method.id.0.clone()),
- method.name.clone(),
- )
- .on_click({
- let method_id = method.id.clone();
- cx.listener(move |this, _, window, cx| {
- this.authenticate(method_id.clone(), window, cx)
- })
- })
- }),
- )),
+ configuration_view,
+ ..
+ } => self.render_auth_required_state(
+ &connection,
+ description.as_ref(),
+ configuration_view.as_ref(),
+ window,
+ cx,
+ ),
ThreadState::Loading { .. } => v_flex().flex_1().child(self.render_empty_state(cx)),
ThreadState::LoadError(e) => v_flex()
.p_2()
crates/agent_ui/src/agent_configuration.rs 🔗
@@ -137,7 +137,11 @@ impl AgentConfiguration {
window: &mut Window,
cx: &mut Context<Self>,
) {
- let configuration_view = provider.configuration_view(window, cx);
+ let configuration_view = provider.configuration_view(
+ language_model::ConfigurationViewTargetAgent::ZedAgent,
+ window,
+ cx,
+ );
self.configuration_views_by_provider
.insert(provider.id(), configuration_view);
}
crates/agent_ui/src/agent_ui.rs 🔗
@@ -320,7 +320,7 @@ fn init_language_model_settings(cx: &mut App) {
cx.subscribe(
&LanguageModelRegistry::global(cx),
|_, event: &language_model::Event, cx| match event {
- language_model::Event::ProviderStateChanged
+ language_model::Event::ProviderStateChanged(_)
| language_model::Event::AddedProvider(_)
| language_model::Event::RemovedProvider(_) => {
update_active_language_model_from_settings(cx);
crates/agent_ui/src/language_model_selector.rs 🔗
@@ -104,7 +104,7 @@ impl LanguageModelPickerDelegate {
window,
|picker, _, event, window, cx| {
match event {
- language_model::Event::ProviderStateChanged
+ language_model::Event::ProviderStateChanged(_)
| language_model::Event::AddedProvider(_)
| language_model::Event::RemovedProvider(_) => {
let query = picker.query(cx);
crates/ai_onboarding/src/agent_api_keys_onboarding.rs 🔗
@@ -11,7 +11,7 @@ impl ApiKeysWithProviders {
cx.subscribe(
&LanguageModelRegistry::global(cx),
|this: &mut Self, _registry, event: &language_model::Event, cx| match event {
- language_model::Event::ProviderStateChanged
+ language_model::Event::ProviderStateChanged(_)
| language_model::Event::AddedProvider(_)
| language_model::Event::RemovedProvider(_) => {
this.configured_providers = Self::compute_configured_providers(cx)
crates/ai_onboarding/src/agent_panel_onboarding_content.rs 🔗
@@ -25,7 +25,7 @@ impl AgentPanelOnboarding {
cx.subscribe(
&LanguageModelRegistry::global(cx),
|this: &mut Self, _registry, event: &language_model::Event, cx| match event {
- language_model::Event::ProviderStateChanged
+ language_model::Event::ProviderStateChanged(_)
| language_model::Event::AddedProvider(_)
| language_model::Event::RemovedProvider(_) => {
this.configured_providers = Self::compute_available_providers(cx)
crates/language_model/src/fake_provider.rs 🔗
@@ -1,8 +1,8 @@
use crate::{
- AuthenticateError, LanguageModel, LanguageModelCompletionError, LanguageModelCompletionEvent,
- LanguageModelId, LanguageModelName, LanguageModelProvider, LanguageModelProviderId,
- LanguageModelProviderName, LanguageModelProviderState, LanguageModelRequest,
- LanguageModelToolChoice,
+ AuthenticateError, ConfigurationViewTargetAgent, LanguageModel, LanguageModelCompletionError,
+ LanguageModelCompletionEvent, LanguageModelId, LanguageModelName, LanguageModelProvider,
+ LanguageModelProviderId, LanguageModelProviderName, LanguageModelProviderState,
+ LanguageModelRequest, LanguageModelToolChoice,
};
use futures::{FutureExt, StreamExt, channel::mpsc, future::BoxFuture, stream::BoxStream};
use gpui::{AnyView, App, AsyncApp, Entity, Task, Window};
@@ -62,7 +62,12 @@ impl LanguageModelProvider for FakeLanguageModelProvider {
Task::ready(Ok(()))
}
- fn configuration_view(&self, _window: &mut Window, _: &mut App) -> AnyView {
+ fn configuration_view(
+ &self,
+ _target_agent: ConfigurationViewTargetAgent,
+ _window: &mut Window,
+ _: &mut App,
+ ) -> AnyView {
unimplemented!()
}
crates/language_model/src/language_model.rs 🔗
@@ -20,7 +20,6 @@ use icons::IconName;
use parking_lot::Mutex;
use schemars::JsonSchema;
use serde::{Deserialize, Serialize, de::DeserializeOwned};
-use std::any::Any;
use std::ops::{Add, Sub};
use std::str::FromStr;
use std::sync::Arc;
@@ -621,7 +620,7 @@ pub enum AuthenticateError {
Other(#[from] anyhow::Error),
}
-pub trait LanguageModelProvider: Any + Send + Sync {
+pub trait LanguageModelProvider: 'static {
fn id(&self) -> LanguageModelProviderId;
fn name(&self) -> LanguageModelProviderName;
fn icon(&self) -> IconName {
@@ -635,7 +634,12 @@ pub trait LanguageModelProvider: Any + Send + Sync {
}
fn is_authenticated(&self, cx: &App) -> bool;
fn authenticate(&self, cx: &mut App) -> Task<Result<(), AuthenticateError>>;
- fn configuration_view(&self, window: &mut Window, cx: &mut App) -> AnyView;
+ fn configuration_view(
+ &self,
+ target_agent: ConfigurationViewTargetAgent,
+ window: &mut Window,
+ cx: &mut App,
+ ) -> AnyView;
fn must_accept_terms(&self, _cx: &App) -> bool {
false
}
@@ -649,6 +653,13 @@ pub trait LanguageModelProvider: Any + Send + Sync {
fn reset_credentials(&self, cx: &mut App) -> Task<Result<()>>;
}
+#[derive(Default, Clone, Copy)]
+pub enum ConfigurationViewTargetAgent {
+ #[default]
+ ZedAgent,
+ Other(&'static str),
+}
+
#[derive(PartialEq, Eq)]
pub enum LanguageModelProviderTosView {
/// When there are some past interactions in the Agent Panel.
crates/language_model/src/registry.rs 🔗
@@ -107,8 +107,7 @@ pub enum Event {
InlineAssistantModelChanged,
CommitMessageModelChanged,
ThreadSummaryModelChanged,
- ProviderStateChanged,
- ProviderAuthUpdated,
+ ProviderStateChanged(LanguageModelProviderId),
AddedProvider(LanguageModelProviderId),
RemovedProvider(LanguageModelProviderId),
}
@@ -149,8 +148,11 @@ impl LanguageModelRegistry {
) {
let id = provider.id();
- let subscription = provider.subscribe(cx, |_, cx| {
- cx.emit(Event::ProviderStateChanged);
+ let subscription = provider.subscribe(cx, {
+ let id = id.clone();
+ move |_, cx| {
+ cx.emit(Event::ProviderStateChanged(id.clone()));
+ }
});
if let Some(subscription) = subscription {
subscription.detach();
crates/language_models/src/provider/anthropic.rs 🔗
@@ -15,11 +15,11 @@ use gpui::{
};
use http_client::HttpClient;
use language_model::{
- AuthenticateError, LanguageModel, LanguageModelCacheConfiguration,
- LanguageModelCompletionError, LanguageModelId, LanguageModelName, LanguageModelProvider,
- LanguageModelProviderId, LanguageModelProviderName, LanguageModelProviderState,
- LanguageModelRequest, LanguageModelToolChoice, LanguageModelToolResultContent, MessageContent,
- RateLimiter, Role,
+ AuthenticateError, ConfigurationViewTargetAgent, LanguageModel,
+ LanguageModelCacheConfiguration, LanguageModelCompletionError, LanguageModelId,
+ LanguageModelName, LanguageModelProvider, LanguageModelProviderId, LanguageModelProviderName,
+ LanguageModelProviderState, LanguageModelRequest, LanguageModelToolChoice,
+ LanguageModelToolResultContent, MessageContent, RateLimiter, Role,
};
use language_model::{LanguageModelCompletionEvent, LanguageModelToolUse, StopReason};
use schemars::JsonSchema;
@@ -223,14 +223,6 @@ impl AnthropicLanguageModelProvider {
})
}
}
-
- pub fn observe(
- &self,
- mut on_notify: impl FnMut(&mut App) + 'static,
- cx: &mut App,
- ) -> Subscription {
- cx.observe(&self.state, move |_, cx| on_notify(cx))
- }
}
impl LanguageModelProviderState for AnthropicLanguageModelProvider {
@@ -324,8 +316,13 @@ impl LanguageModelProvider for AnthropicLanguageModelProvider {
self.state.update(cx, |state, cx| state.authenticate(cx))
}
- fn configuration_view(&self, window: &mut Window, cx: &mut App) -> AnyView {
- cx.new(|cx| ConfigurationView::new(self.state.clone(), window, cx))
+ fn configuration_view(
+ &self,
+ target_agent: ConfigurationViewTargetAgent,
+ window: &mut Window,
+ cx: &mut App,
+ ) -> AnyView {
+ cx.new(|cx| ConfigurationView::new(self.state.clone(), target_agent, window, cx))
.into()
}
@@ -927,12 +924,18 @@ struct ConfigurationView {
api_key_editor: Entity<Editor>,
state: gpui::Entity<State>,
load_credentials_task: Option<Task<()>>,
+ target_agent: ConfigurationViewTargetAgent,
}
impl ConfigurationView {
const PLACEHOLDER_TEXT: &'static str = "sk-ant-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
- fn new(state: gpui::Entity<State>, window: &mut Window, cx: &mut Context<Self>) -> Self {
+ fn new(
+ state: gpui::Entity<State>,
+ target_agent: ConfigurationViewTargetAgent,
+ window: &mut Window,
+ cx: &mut Context<Self>,
+ ) -> Self {
cx.observe(&state, |_, _, cx| {
cx.notify();
})
@@ -964,6 +967,7 @@ impl ConfigurationView {
}),
state,
load_credentials_task,
+ target_agent,
}
}
@@ -1037,7 +1041,10 @@ impl Render for ConfigurationView {
v_flex()
.size_full()
.on_action(cx.listener(Self::save_api_key))
- .child(Label::new("To use Zed's agent with Anthropic, you need to add an API key. Follow these steps:"))
+ .child(Label::new(format!("To use {}, you need to add an API key. Follow these steps:", match self.target_agent {
+ ConfigurationViewTargetAgent::ZedAgent => "Zed's agent with Anthropic",
+ ConfigurationViewTargetAgent::Other(agent) => agent,
+ })))
.child(
List::new()
.child(
@@ -1048,7 +1055,7 @@ impl Render for ConfigurationView {
)
)
.child(
- InstructionListItem::text_only("Paste your API key below and hit enter to start using the assistant")
+ InstructionListItem::text_only("Paste your API key below and hit enter to start using the agent")
)
)
.child(
crates/language_models/src/provider/bedrock.rs 🔗
@@ -348,7 +348,12 @@ impl LanguageModelProvider for BedrockLanguageModelProvider {
self.state.update(cx, |state, cx| state.authenticate(cx))
}
- fn configuration_view(&self, window: &mut Window, cx: &mut App) -> AnyView {
+ fn configuration_view(
+ &self,
+ _target_agent: language_model::ConfigurationViewTargetAgent,
+ window: &mut Window,
+ cx: &mut App,
+ ) -> AnyView {
cx.new(|cx| ConfigurationView::new(self.state.clone(), window, cx))
.into()
}
crates/language_models/src/provider/cloud.rs 🔗
@@ -391,7 +391,12 @@ impl LanguageModelProvider for CloudLanguageModelProvider {
Task::ready(Ok(()))
}
- fn configuration_view(&self, _: &mut Window, cx: &mut App) -> AnyView {
+ fn configuration_view(
+ &self,
+ _target_agent: language_model::ConfigurationViewTargetAgent,
+ _: &mut Window,
+ cx: &mut App,
+ ) -> AnyView {
cx.new(|_| ConfigurationView::new(self.state.clone()))
.into()
}
crates/language_models/src/provider/copilot_chat.rs 🔗
@@ -176,7 +176,12 @@ impl LanguageModelProvider for CopilotChatLanguageModelProvider {
Task::ready(Err(err.into()))
}
- fn configuration_view(&self, _: &mut Window, cx: &mut App) -> AnyView {
+ fn configuration_view(
+ &self,
+ _target_agent: language_model::ConfigurationViewTargetAgent,
+ _: &mut Window,
+ cx: &mut App,
+ ) -> AnyView {
let state = self.state.clone();
cx.new(|cx| ConfigurationView::new(state, cx)).into()
}
crates/language_models/src/provider/deepseek.rs 🔗
@@ -229,7 +229,12 @@ impl LanguageModelProvider for DeepSeekLanguageModelProvider {
self.state.update(cx, |state, cx| state.authenticate(cx))
}
- fn configuration_view(&self, window: &mut Window, cx: &mut App) -> AnyView {
+ fn configuration_view(
+ &self,
+ _target_agent: language_model::ConfigurationViewTargetAgent,
+ window: &mut Window,
+ cx: &mut App,
+ ) -> AnyView {
cx.new(|cx| ConfigurationView::new(self.state.clone(), window, cx))
.into()
}
crates/language_models/src/provider/google.rs 🔗
@@ -277,7 +277,12 @@ impl LanguageModelProvider for GoogleLanguageModelProvider {
self.state.update(cx, |state, cx| state.authenticate(cx))
}
- fn configuration_view(&self, window: &mut Window, cx: &mut App) -> AnyView {
+ fn configuration_view(
+ &self,
+ _target_agent: language_model::ConfigurationViewTargetAgent,
+ window: &mut Window,
+ cx: &mut App,
+ ) -> AnyView {
cx.new(|cx| ConfigurationView::new(self.state.clone(), window, cx))
.into()
}
crates/language_models/src/provider/lmstudio.rs 🔗
@@ -226,7 +226,12 @@ impl LanguageModelProvider for LmStudioLanguageModelProvider {
self.state.update(cx, |state, cx| state.authenticate(cx))
}
- fn configuration_view(&self, _window: &mut Window, cx: &mut App) -> AnyView {
+ fn configuration_view(
+ &self,
+ _target_agent: language_model::ConfigurationViewTargetAgent,
+ _window: &mut Window,
+ cx: &mut App,
+ ) -> AnyView {
let state = self.state.clone();
cx.new(|cx| ConfigurationView::new(state, cx)).into()
}
crates/language_models/src/provider/mistral.rs 🔗
@@ -243,7 +243,12 @@ impl LanguageModelProvider for MistralLanguageModelProvider {
self.state.update(cx, |state, cx| state.authenticate(cx))
}
- fn configuration_view(&self, window: &mut Window, cx: &mut App) -> AnyView {
+ fn configuration_view(
+ &self,
+ _target_agent: language_model::ConfigurationViewTargetAgent,
+ window: &mut Window,
+ cx: &mut App,
+ ) -> AnyView {
cx.new(|cx| ConfigurationView::new(self.state.clone(), window, cx))
.into()
}
crates/language_models/src/provider/ollama.rs 🔗
@@ -255,7 +255,12 @@ impl LanguageModelProvider for OllamaLanguageModelProvider {
self.state.update(cx, |state, cx| state.authenticate(cx))
}
- fn configuration_view(&self, window: &mut Window, cx: &mut App) -> AnyView {
+ fn configuration_view(
+ &self,
+ _target_agent: language_model::ConfigurationViewTargetAgent,
+ window: &mut Window,
+ cx: &mut App,
+ ) -> AnyView {
let state = self.state.clone();
cx.new(|cx| ConfigurationView::new(state, window, cx))
.into()
crates/language_models/src/provider/open_ai.rs 🔗
@@ -233,7 +233,12 @@ impl LanguageModelProvider for OpenAiLanguageModelProvider {
self.state.update(cx, |state, cx| state.authenticate(cx))
}
- fn configuration_view(&self, window: &mut Window, cx: &mut App) -> AnyView {
+ fn configuration_view(
+ &self,
+ _target_agent: language_model::ConfigurationViewTargetAgent,
+ window: &mut Window,
+ cx: &mut App,
+ ) -> AnyView {
cx.new(|cx| ConfigurationView::new(self.state.clone(), window, cx))
.into()
}
crates/language_models/src/provider/open_ai_compatible.rs 🔗
@@ -243,7 +243,12 @@ impl LanguageModelProvider for OpenAiCompatibleLanguageModelProvider {
self.state.update(cx, |state, cx| state.authenticate(cx))
}
- fn configuration_view(&self, window: &mut Window, cx: &mut App) -> AnyView {
+ fn configuration_view(
+ &self,
+ _target_agent: language_model::ConfigurationViewTargetAgent,
+ window: &mut Window,
+ cx: &mut App,
+ ) -> AnyView {
cx.new(|cx| ConfigurationView::new(self.state.clone(), window, cx))
.into()
}
crates/language_models/src/provider/open_router.rs 🔗
@@ -306,7 +306,12 @@ impl LanguageModelProvider for OpenRouterLanguageModelProvider {
self.state.update(cx, |state, cx| state.authenticate(cx))
}
- fn configuration_view(&self, window: &mut Window, cx: &mut App) -> AnyView {
+ fn configuration_view(
+ &self,
+ _target_agent: language_model::ConfigurationViewTargetAgent,
+ window: &mut Window,
+ cx: &mut App,
+ ) -> AnyView {
cx.new(|cx| ConfigurationView::new(self.state.clone(), window, cx))
.into()
}
crates/language_models/src/provider/vercel.rs 🔗
@@ -230,7 +230,12 @@ impl LanguageModelProvider for VercelLanguageModelProvider {
self.state.update(cx, |state, cx| state.authenticate(cx))
}
- fn configuration_view(&self, window: &mut Window, cx: &mut App) -> AnyView {
+ fn configuration_view(
+ &self,
+ _target_agent: language_model::ConfigurationViewTargetAgent,
+ window: &mut Window,
+ cx: &mut App,
+ ) -> AnyView {
cx.new(|cx| ConfigurationView::new(self.state.clone(), window, cx))
.into()
}
crates/language_models/src/provider/x_ai.rs 🔗
@@ -230,7 +230,12 @@ impl LanguageModelProvider for XAiLanguageModelProvider {
self.state.update(cx, |state, cx| state.authenticate(cx))
}
- fn configuration_view(&self, window: &mut Window, cx: &mut App) -> AnyView {
+ fn configuration_view(
+ &self,
+ _target_agent: language_model::ConfigurationViewTargetAgent,
+ window: &mut Window,
+ cx: &mut App,
+ ) -> AnyView {
cx.new(|cx| ConfigurationView::new(self.state.clone(), window, cx))
.into()
}
crates/onboarding/src/ai_setup_page.rs 🔗
@@ -329,7 +329,11 @@ impl AiConfigurationModal {
cx: &mut Context<Self>,
) -> Self {
let focus_handle = cx.focus_handle();
- let configuration_view = selected_provider.configuration_view(window, cx);
+ let configuration_view = selected_provider.configuration_view(
+ language_model::ConfigurationViewTargetAgent::ZedAgent,
+ window,
+ cx,
+ );
Self {
focus_handle,