git_ui: Add commit message model picker (#50674)

## Summary

Reworked per review to reuse the shared `LanguageModelSelector` instead
of a custom dropdown.

- The generate-commit-message button is now a split button: the primary
click generates, the chevron opens the same picker the Agent Panel uses
and saves to `agent.commit_message_model`.
- The picker lives in a new `language_model_selector` crate, moved out
of `agent_ui`, so `git_ui` can use it without a feature-crate dependency
the workspace forbids. `agent_ui` re-exports the moved items.
- The chevron stays enabled with no model configured, so a model can be
picked from there.

## Verification

- `cargo test` and `./script/clippy` pass for `language_model_selector`,
`agent_ui`, `git_ui`, `settings_content`, and `xtask`, including the
workspace dependency-direction test.
- Clicked through a debug build on Linux (NVIDIA GPU) with a real model
behind an OpenAI-compatible endpoint: the picker opens, searches, and
persists the selection; generating streams a message into the commit
editor in both the Git Panel and the commit modal; with no provider
configured, generate is disabled and the chevron still opens the picker.

### Showcase


https://github.com/user-attachments/assets/23812839-6d95-4167-b437-af7976655423

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Release Notes:

- Improved the Git Panel's commit editor with a picker that allows
selecting the model to be used for commit message generation.

---------

Co-authored-by: Claude Sonnet 5.5 <noreply@anthropic.com>
Co-authored-by: dino <dinojoaocosta@gmail.com>
This commit is contained in:
이대희
2026-11-18 13:23:57 +00:00
committed by GitHub
parent f88e54eed5
commit 1043f4a86a
19 changed files with 303 additions and 226 deletions
Generated
+19
View File
@@ -503,6 +503,7 @@ dependencies = [
"jsonschema",
"language",
"language_model",
"language_model_selector",
"language_models",
"languages",
"log",
@@ -7067,6 +7068,7 @@ dependencies = [
"itertools 0.14.0",
"language",
"language_model",
"language_model_selector",
"log",
"markdown",
"menu",
@@ -9602,6 +9604,23 @@ dependencies = [
"thiserror 2.0.21",
]
[[package]]
name = "language_model_selector"
version = "0.1.0"
dependencies = [
"agent_settings",
"collections",
"fs",
"fuzzy",
"gpui",
"language_model",
"ordered-float 5.5.0",
"picker",
"settings",
"ui",
"zed_actions",
]
[[package]]
name = "language_models"
version = "0.1.0"
+2
View File
@@ -127,6 +127,7 @@ members = [
"crates/language_extension",
"crates/language_model",
"crates/language_model_core",
"crates/language_model_selector",
"crates/language_models",
"crates/language_models_cloud",
"crates/language_onboarding",
@@ -404,6 +405,7 @@ language_detection = { path = "crates/language_detection" }
language_extension = { path = "crates/language_extension" }
language_model = { path = "crates/language_model" }
language_model_core = { path = "crates/language_model_core" }
language_model_selector = { path = "crates/language_model_selector" }
language_models = { path = "crates/language_models" }
language_models_cloud = { path = "crates/language_models_cloud" }
language_onboarding = { path = "crates/language_onboarding" }
+1
View File
@@ -70,6 +70,7 @@ itertools.workspace = true
jsonschema.workspace = true
language.workspace = true
language_model.workspace = true
language_model_selector.workspace = true
language_models.workspace = true
log.workspace = true
lru.workspace = true
@@ -19,8 +19,8 @@ use workspace::{ModalView, Workspace};
use crate::agent_configuration::manage_profiles_modal::profile_modal_header::ProfileModalHeader;
use crate::agent_configuration::tool_picker::{ToolPicker, ToolPickerDelegate};
use crate::language_model_selector::{LanguageModelSelector, language_model_selector};
use crate::{AgentPanel, ManageProfiles};
use language_model_selector::{LanguageModelPicker, language_model_picker};
enum Mode {
ChooseProfile(ChooseProfileMode),
@@ -38,7 +38,7 @@ enum Mode {
},
ConfigureDefaultModel {
profile_id: AgentProfileId,
model_picker: Entity<LanguageModelSelector>,
model_picker: Entity<LanguageModelPicker>,
_subscription: Subscription,
},
}
@@ -229,7 +229,7 @@ impl ManageProfilesModal {
let model_picker = cx.new(|cx| {
let profile_id = profile_id_for_closure.clone();
language_model_selector(
language_model_picker(
{
let profile_id = profile_id.clone();
move |cx| {
@@ -280,7 +280,7 @@ impl ManageProfilesModal {
{
let fs = fs.clone();
move |model, should_be_favorite, cx| {
crate::favorite_models::toggle_in_settings(
language_model_selector::toggle_in_settings(
model,
should_be_favorite,
fs.clone(),
-148
View File
@@ -1,148 +0,0 @@
use crate::{
ModelUsageContext,
language_model_selector::{LanguageModelSelector, language_model_selector},
ui::ModelSelectorTooltip,
};
use fs::Fs;
use gpui::{Entity, FocusHandle, SharedString};
use language_model::{IconOrSvg, LanguageModelRegistry};
use picker::popover_menu::PickerPopoverMenu;
use settings::update_settings_file;
use std::sync::Arc;
use ui::{PopoverMenuHandle, Tooltip, prelude::*};
pub struct AgentModelSelector {
selector: Entity<LanguageModelSelector>,
menu_handle: PopoverMenuHandle<LanguageModelSelector>,
}
impl AgentModelSelector {
pub(crate) fn new(
fs: Arc<dyn Fs>,
menu_handle: PopoverMenuHandle<LanguageModelSelector>,
focus_handle: FocusHandle,
model_usage_context: ModelUsageContext,
window: &mut Window,
cx: &mut Context<Self>,
) -> Self {
Self {
selector: cx.new(move |cx| {
language_model_selector(
{
let model_context = model_usage_context.clone();
move |cx| model_context.model(cx)
},
{
let fs = fs.clone();
move |model, cx| {
let provider = model.provider_id().0.to_string();
let model_id = model.id().0.to_string();
match &model_usage_context {
ModelUsageContext::InlineAssistant => {
update_settings_file(fs.clone(), cx, move |settings, _cx| {
settings
.agent
.get_or_insert_default()
.set_inline_assistant_model(provider.clone(), model_id);
});
}
}
}
},
{
let fs = fs.clone();
move |model, should_be_favorite, cx| {
crate::favorite_models::toggle_in_settings(
model,
should_be_favorite,
fs.clone(),
cx,
);
}
},
true, // Use popover styles for picker
focus_handle.clone(),
window,
cx,
)
}),
menu_handle,
}
}
pub fn toggle(&self, window: &mut Window, cx: &mut Context<Self>) {
self.menu_handle.toggle(window, cx);
}
pub fn active_model(&self, cx: &App) -> Option<language_model::LanguageModel> {
self.selector.read(cx).delegate.active_model(cx)
}
pub fn cycle_favorite_models(&self, window: &mut Window, cx: &mut Context<Self>) {
self.selector.update(cx, |selector, cx| {
selector.delegate.cycle_favorite_models(window, cx);
});
}
}
impl Render for AgentModelSelector {
fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
let model = self.selector.read(cx).delegate.active_model(cx);
let model_name = model
.as_ref()
.map(|model| model.name().0)
.unwrap_or_else(|| SharedString::from("Select a Model"));
let provider_icon = model.as_ref().and_then(|model| {
LanguageModelRegistry::read_global(cx)
.provider(&model.provider_id)
.map(|provider| provider.icon())
});
let color = if self.menu_handle.is_deployed() {
Color::Accent
} else {
Color::Muted
};
let show_cycle_row = self.selector.read(cx).delegate.favorites_count() > 1;
let tooltip = Tooltip::element({
move |_, _cx| {
ModelSelectorTooltip::new()
.show_cycle_row(show_cycle_row)
.into_any_element()
}
});
PickerPopoverMenu::new(
self.selector.clone(),
Button::new("active-model", model_name)
.label_size(LabelSize::Small)
.color(color)
.when_some(provider_icon, |this, icon| {
this.start_icon(
match icon {
IconOrSvg::Svg(path) => Icon::from_external_svg(path),
IconOrSvg::Icon(name) => Icon::new(name),
}
.color(color)
.size(IconSize::XSmall),
)
})
.end_icon(
Icon::new(IconName::ChevronDown)
.color(color)
.size(IconSize::XSmall),
),
tooltip,
gpui::Anchor::TopRight,
cx,
)
.with_handle(self.menu_handle.clone())
.offset(gpui::Point {
x: px(0.0),
y: px(2.0),
})
.render(window, cx)
}
}
+2 -23
View File
@@ -1,7 +1,6 @@
mod agent_configuration;
pub mod agent_connection_store;
mod agent_diff;
mod agent_model_selector;
mod agent_panel;
mod agent_registry_ui;
mod buffer_codegen;
@@ -14,10 +13,8 @@ mod diagnostics;
pub mod draft_prompt_store;
mod entry_view_state;
mod external_source_prompt;
mod favorite_models;
mod inline_assistant;
mod inline_prompt_editor;
mod language_model_selector;
mod mention_set;
mod message_editor;
mod mode_selector;
@@ -57,9 +54,7 @@ use language::{
LanguageRegistry,
language_settings::{AllLanguageSettings, EditPredictionProvider},
};
use language_model::{
LanguageModel, LanguageModelId, LanguageModelProviderId, LanguageModelRegistry,
};
use language_model::{LanguageModelId, LanguageModelProviderId, LanguageModelRegistry};
use project::{AgentId, DisableAiSettings, Project, ProjectPath};
use prompt_store::{self, PromptBuilder, rules_to_skills_migration};
use rope::Point;
@@ -95,6 +90,7 @@ pub use thread_import::{
channels_with_threads, import_threads_from_other_channels,
};
use zed_actions;
pub use zed_actions::agent::CycleFavoriteModels;
pub use zed_actions::{CreateWorktree, NewWorktreeBranchTarget, SwitchWorktree};
pub(crate) fn resolve_agent_image(
@@ -302,8 +298,6 @@ actions!(
ToggleProfileSelector,
/// Cycles through available session modes.
CycleModeSelector,
/// Cycles through favorited models in the ACP model selector.
CycleFavoriteModels,
/// Expands the message editor to full size.
ExpandMessageEditor,
/// Archives the currently selected thread.
@@ -628,21 +622,6 @@ impl ManageProfiles {
}
}
#[derive(Clone)]
pub(crate) enum ModelUsageContext {
InlineAssistant,
}
impl ModelUsageContext {
pub fn model(&self, cx: &App) -> Option<LanguageModel> {
match self {
Self::InlineAssistant => {
LanguageModelRegistry::read_global(cx).inline_assistant_model()
}
}
}
}
pub(crate) fn humanize_token_count(count: u64) -> String {
match count {
0..=999 => count.to_string(),
+54 -33
View File
@@ -14,17 +14,18 @@ use gpui::{
Subscription, TextStyle, TextStyleRefinement, WeakEntity, Window, actions,
};
use language_model::{LanguageModel, LanguageModelRegistry};
use language_model_selector::{LanguageModelSelector, language_model_picker, toggle_in_settings};
use markdown::{HeadingLevelStyles, Markdown, MarkdownElement, MarkdownStyle};
use parking_lot::Mutex;
use project::Project;
use settings::Settings;
use settings::{Settings, update_settings_file};
use std::cmp;
use std::ops::Range;
use std::rc::Rc;
use std::sync::Arc;
use theme_settings::ThemeSettings;
use ui::utils::WithRemSize;
use ui::{IconButtonShape, KeyBinding, PopoverMenuHandle, Tooltip, prelude::*};
use ui::{IconButtonShape, KeyBinding, Tooltip, prelude::*};
use uuid::Uuid;
use workspace::notifications::NotificationId;
use workspace::{Toast, Workspace};
@@ -33,7 +34,6 @@ use zed_actions::{
editor::{MoveDown, MoveUp},
};
use crate::agent_model_selector::AgentModelSelector;
use crate::buffer_codegen::{BufferCodegen, CodegenAlternative};
use crate::completion_provider::{
PromptCompletionProvider, PromptCompletionProviderDelegate, PromptContextType,
@@ -41,9 +41,7 @@ use crate::completion_provider::{
use crate::mention_set::paste_images_as_context;
use crate::mention_set::{MentionSet, crease_for_mention};
use crate::terminal_codegen::TerminalCodegen;
use crate::{
CycleFavoriteModels, CycleNextInlineAssist, CyclePreviousInlineAssist, ModelUsageContext,
};
use crate::{CycleFavoriteModels, CycleNextInlineAssist, CyclePreviousInlineAssist};
actions!(inline_assistant, [ThumbsUpResult, ThumbsDownResult]);
@@ -63,7 +61,7 @@ pub struct PromptEditor<T> {
mode: PromptEditorMode,
mention_set: Entity<MentionSet>,
workspace: WeakEntity<Workspace>,
model_selector: Entity<AgentModelSelector>,
model_selector: Entity<LanguageModelSelector>,
edited_since_done: bool,
prompt_history: VecDeque<String>,
prompt_history_ix: Option<usize>,
@@ -301,6 +299,47 @@ fn markdown_style(window: &Window, cx: &App) -> MarkdownStyle {
}
}
fn inline_assistant_model_selector(
fs: Arc<dyn Fs>,
focus_handle: FocusHandle,
window: &mut Window,
cx: &mut App,
) -> Entity<LanguageModelSelector> {
let picker = cx.new(|cx| {
language_model_picker(
|cx| LanguageModelRegistry::read_global(cx).inline_assistant_model(),
{
let fs = fs.clone();
move |model, cx| {
let provider = model.provider_id().0.to_string();
let model_id = model.id().0.to_string();
update_settings_file(fs.clone(), cx, move |settings, _cx| {
settings
.agent
.get_or_insert_default()
.set_inline_assistant_model(provider, model_id);
});
}
},
{
let fs = fs.clone();
move |model, should_be_favorite, cx| {
toggle_in_settings(model, should_be_favorite, fs.clone(), cx)
}
},
true,
focus_handle,
window,
cx,
)
});
cx.new(|_cx| LanguageModelSelector::new(picker))
}
impl<T: 'static> Focusable for PromptEditor<T> {
fn focus_handle(&self, cx: &App) -> FocusHandle {
self.editor.focus_handle(cx)
@@ -1272,23 +1311,14 @@ impl PromptEditor<BufferCodegen> {
});
let mention_set = cx.new(|_cx| MentionSet::new(project, Some(thread_store.clone())));
let model_selector_menu_handle = PopoverMenuHandle::default();
let model_selector =
inline_assistant_model_selector(fs.clone(), prompt_editor.focus_handle(cx), window, cx);
let mut this: PromptEditor<BufferCodegen> = PromptEditor {
editor: prompt_editor.clone(),
editor: prompt_editor,
mention_set,
workspace,
model_selector: cx.new(|cx| {
AgentModelSelector::new(
fs,
model_selector_menu_handle,
prompt_editor.focus_handle(cx),
ModelUsageContext::InlineAssistant,
window,
cx,
)
}),
model_selector,
edited_since_done: false,
prompt_history,
prompt_history_ix: None,
@@ -1421,23 +1451,14 @@ impl PromptEditor<TerminalCodegen> {
});
let mention_set = cx.new(|_cx| MentionSet::new(project, Some(thread_store.clone())));
let model_selector_menu_handle = PopoverMenuHandle::default();
let model_selector =
inline_assistant_model_selector(fs.clone(), prompt_editor.focus_handle(cx), window, cx);
let mut this = Self {
editor: prompt_editor.clone(),
editor: prompt_editor,
mention_set,
workspace,
model_selector: cx.new(|cx| {
AgentModelSelector::new(
fs,
model_selector_menu_handle.clone(),
prompt_editor.focus_handle(cx),
ModelUsageContext::InlineAssistant,
window,
cx,
)
}),
model_selector,
edited_since_done: false,
prompt_history,
prompt_history_ix: None,
+3 -2
View File
@@ -1,7 +1,6 @@
mod agent_notification;
mod end_trial_upsell;
mod mention_crease;
mod model_selector_components;
mod sandbox_status_tooltip;
mod session_notice;
mod terminal_tool_header;
@@ -9,8 +8,10 @@ mod undo_reject_toast;
pub use agent_notification::*;
pub use end_trial_upsell::*;
pub use language_model_selector::{
ModelSelectorFooter, ModelSelectorHeader, ModelSelectorListItem, ModelSelectorTooltip,
};
pub use mention_crease::*;
pub use model_selector_components::*;
pub use sandbox_status_tooltip::*;
pub use session_notice::*;
pub use terminal_tool_header::*;
+1
View File
@@ -39,6 +39,7 @@ gpui.workspace = true
itertools.workspace = true
language.workspace = true
language_model.workspace = true
language_model_selector.workspace = true
log.workspace = true
markdown.workspace = true
menu.workspace = true
+4 -3
View File
@@ -347,7 +347,7 @@ impl CommitModal {
.anchor(Anchor::TopRight)
}
pub fn render_footer(&self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
pub fn render_footer(&self, cx: &mut Context<Self>) -> impl IntoElement {
let (
can_commit,
tooltip,
@@ -362,7 +362,8 @@ impl CommitModal {
let (can_commit, tooltip) = git_panel.configure_commit_button(cx);
let title = git_panel.commit_button_title();
let co_authors = git_panel.render_co_authors(cx);
let generate_commit_message = git_panel.render_generate_commit_message_button(cx);
let generate_commit_message =
git_panel.render_generate_commit_message_button(false, cx);
let active_repo = git_panel.active_repository.clone();
let commit_options = git_panel.commit_options();
let is_generating = git_panel.is_generating_commit_message();
@@ -695,7 +696,7 @@ impl Render for CommitModal {
),
)
})
.child(self.render_footer(window, cx)),
.child(self.render_footer(cx)),
)
}
}
+1
View File
@@ -5458,6 +5458,7 @@ mod tests {
let settings_store = SettingsStore::test(cx);
cx.set_global(settings_store);
theme_settings::init(theme::LoadThemes::JustBase, cx);
editor::init(cx);
language_model::init(cx);
crate::init(cx);
});
+51 -2
View File
@@ -2,6 +2,7 @@ mod branch_mode;
use git_ui_core::askpass_modal::AskPassModal;
pub(crate) use git_ui_core::notifications::{open_output, show_error_toast};
use language_model_selector::{LanguageModelSelector, language_model_picker, toggle_in_settings};
use crate::branch_diff::BranchDiff;
use crate::commit_context_menu::{
@@ -1369,6 +1370,7 @@ pub struct GitPanel {
git_access: Option<GitAccess>,
commit_menu_handle: PopoverMenuHandle<ContextMenu>,
changes_actions_menu_handle: PopoverMenuHandle<ContextMenu>,
commit_message_model_selector: Entity<LanguageModelSelector>,
remote_action_menu_handle: PopoverMenuHandle<ContextMenu>,
changes_mode: ChangesMode,
changes_mode_menu_handle: PopoverMenuHandle<ContextMenu>,
@@ -1678,6 +1680,40 @@ impl GitPanel {
)
.detach();
let picker = cx.new(|cx| {
language_model_picker(
|cx| LanguageModelRegistry::read_global(cx).commit_message_model(cx),
{
let fs = fs.clone();
move |model, cx| {
let provider = model.provider_id().0.to_string();
let model_id = model.id().0.to_string();
update_settings_file(fs.clone(), cx, move |settings, _cx| {
settings
.agent
.get_or_insert_default()
.set_commit_message_model(provider, model_id);
});
}
},
{
let fs = fs.clone();
move |model, should_be_favorite, cx| {
toggle_in_settings(model, should_be_favorite, fs.clone(), cx)
}
},
true,
focus_handle.clone(),
window,
cx,
)
});
let model_selector =
cx.new(|_| LanguageModelSelector::new(picker).cycle_favorite_models_enabled(false));
let mut this = Self {
active_repository,
commit_editor,
@@ -1743,6 +1779,7 @@ impl GitPanel {
git_access: None,
commit_menu_handle: PopoverMenuHandle::default(),
changes_actions_menu_handle: PopoverMenuHandle::default(),
commit_message_model_selector: model_selector,
remote_action_menu_handle: PopoverMenuHandle::default(),
changes_mode: ChangesMode::Uncommitted,
changes_mode_menu_handle: PopoverMenuHandle::default(),
@@ -6839,6 +6876,7 @@ impl GitPanel {
pub(crate) fn render_generate_commit_message_button(
&self,
model_selector_enabled: bool,
cx: &Context<Self>,
) -> Option<AnyElement> {
if !agent_settings::AgentSettings::get_global(cx).enabled(cx) {
@@ -6908,7 +6946,18 @@ impl GitPanel {
})
};
Some(button.into_any_element())
if !model_selector_enabled {
return Some(button.into_any_element());
}
Some(
h_flex()
.gap_0p5()
.child(button)
.child(Divider::vertical())
.child(self.commit_message_model_selector.clone())
.into_any_element(),
)
}
pub(crate) fn render_co_authors(&self, cx: &Context<Self>) -> Option<AnyElement> {
@@ -7505,7 +7554,7 @@ impl GitPanel {
h_flex()
.gap_0p5()
.child(toggle_commit_editor_button)
.children(self.render_generate_commit_message_button(cx)),
.children(self.render_generate_commit_message_button(true, cx)),
)
.child(
h_flex()
+30
View File
@@ -0,0 +1,30 @@
[package]
name = "language_model_selector"
version = "0.1.0"
edition.workspace = true
publish.workspace = true
license = "GPL-3.0-or-later"
[lints]
workspace = true
[lib]
name = "language_model_selector"
path = "src/language_model_selector.rs"
doctest = false
[dependencies]
agent_settings.workspace = true
collections.workspace = true
fs.workspace = true
fuzzy.workspace = true
gpui.workspace = true
language_model.workspace = true
ordered-float.workspace = true
picker.workspace = true
settings.workspace = true
ui.workspace = true
zed_actions.workspace = true
[dev-dependencies]
gpui = { workspace = true, features = ["test-support"] }
+1
View File
@@ -0,0 +1 @@
../../LICENSE-GPL
@@ -4,36 +4,43 @@ use agent_settings::AgentSettings;
use collections::{HashMap, HashSet, IndexMap};
use fuzzy::{StringMatch, StringMatchCandidate, match_strings};
use gpui::{
Action, AnyElement, App, BackgroundExecutor, DismissEvent, FocusHandle, ForegroundExecutor,
Subscription, Task,
Action, Anchor, AnyElement, App, BackgroundExecutor, DismissEvent, Entity, FocusHandle,
ForegroundExecutor, Point, Subscription, Task,
};
use language_model::{
IconOrSvg, LanguageModel, LanguageModelId, LanguageModelProvider, LanguageModelProviderId,
LanguageModelRegistry,
};
use ordered_float::OrderedFloat;
use picker::popover_menu::PickerPopoverMenu;
use picker::{Picker, PickerDelegate};
use settings::Settings;
use ui::prelude::*;
use ui::{PopoverMenuHandle, Tooltip, prelude::*};
use zed_actions::agent::OpenSettings;
use crate::ui::{ModelSelectorFooter, ModelSelectorHeader, ModelSelectorListItem};
mod favorite_models;
mod model_selector_components;
pub use favorite_models::toggle_in_settings;
pub use model_selector_components::{
ModelSelectorFooter, ModelSelectorHeader, ModelSelectorListItem, ModelSelectorTooltip,
};
type OnModelChanged = Arc<dyn Fn(LanguageModel, &mut App) + 'static>;
type GetActiveModel = Arc<dyn Fn(&App) -> Option<LanguageModel> + 'static>;
type OnToggleFavorite = Arc<dyn Fn(LanguageModel, bool, &mut App) + 'static>;
pub type LanguageModelSelector = Picker<LanguageModelPickerDelegate>;
pub type LanguageModelPicker = Picker<LanguageModelPickerDelegate>;
pub fn language_model_selector(
pub fn language_model_picker(
get_active_model: impl Fn(&App) -> Option<LanguageModel> + 'static,
on_model_changed: impl Fn(LanguageModel, &mut App) + 'static,
on_toggle_favorite: impl Fn(LanguageModel, bool, &mut App) + 'static,
popover_styles: bool,
focus_handle: FocusHandle,
window: &mut Window,
cx: &mut Context<LanguageModelSelector>,
) -> LanguageModelSelector {
cx: &mut Context<LanguageModelPicker>,
) -> LanguageModelPicker {
let delegate = LanguageModelPickerDelegate::new(
get_active_model,
on_model_changed,
@@ -562,6 +569,108 @@ impl PickerDelegate for LanguageModelPickerDelegate {
}
}
pub struct LanguageModelSelector {
picker: Entity<LanguageModelPicker>,
menu_handle: PopoverMenuHandle<LanguageModelPicker>,
cycle_favorite_models_enabled: bool,
}
impl LanguageModelSelector {
pub fn new(picker: Entity<LanguageModelPicker>) -> Self {
let menu_handle = PopoverMenuHandle::default();
Self {
picker,
menu_handle,
cycle_favorite_models_enabled: true,
}
}
pub fn toggle(&self, window: &mut Window, cx: &mut Context<Self>) {
self.menu_handle.toggle(window, cx);
}
pub fn active_model(&self, cx: &App) -> Option<LanguageModel> {
self.picker.read(cx).delegate.active_model(cx)
}
pub fn cycle_favorite_models(&self, window: &mut Window, cx: &mut Context<Self>) {
if self.cycle_favorite_models_enabled {
self.picker.update(cx, |selector, cx| {
selector.delegate.cycle_favorite_models(window, cx);
});
}
}
pub fn cycle_favorite_models_enabled(mut self, enabled: bool) -> Self {
self.cycle_favorite_models_enabled = enabled;
self
}
}
impl Render for LanguageModelSelector {
fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
let model = self.picker.read(cx).delegate.active_model(cx);
let model_name = model
.as_ref()
.map(|model| model.name().0)
.unwrap_or_else(|| SharedString::from("Select a Model"));
let provider_icon = model.as_ref().and_then(|model| {
LanguageModelRegistry::read_global(cx)
.provider(&model.provider_id())
.map(|provider| provider.icon())
});
let color = if self.menu_handle.is_deployed() {
Color::Accent
} else {
Color::Muted
};
let show_cycle_row = self.cycle_favorite_models_enabled
&& self.picker.read(cx).delegate.favorites_count() > 1;
let tooltip = Tooltip::element({
move |_window, _cx| {
ModelSelectorTooltip::new()
.show_cycle_row(show_cycle_row)
.into_any_element()
}
});
PickerPopoverMenu::new(
self.picker.clone(),
Button::new("active-model", model_name)
.label_size(LabelSize::Small)
.color(color)
.when_some(provider_icon, |button, icon| {
let icon = match icon {
IconOrSvg::Svg(path) => Icon::from_external_svg(path),
IconOrSvg::Icon(name) => Icon::new(name),
}
.color(color)
.size(IconSize::XSmall);
button.start_icon(icon)
})
.end_icon(
Icon::new(IconName::ChevronDown)
.color(color)
.size(IconSize::XSmall),
),
tooltip,
Anchor::TopRight,
cx,
)
.with_handle(self.menu_handle.clone())
.offset(Point {
x: px(0.0),
y: px(2.0),
})
.render(window, cx)
}
}
#[cfg(test)]
mod tests {
use super::*;
@@ -1,9 +1,7 @@
use gpui::{Action, ClickEvent, FocusHandle, prelude::*};
use language_model::DisabledReason;
use ui::{Chip, ElevationIndex, KeyBinding, ListItem, ListItemSpacing, Tooltip, prelude::*};
use zed_actions::agent::ToggleModelSelector;
use crate::CycleFavoriteModels;
use zed_actions::agent::{CycleFavoriteModels, ToggleModelSelector};
enum ModelIcon {
Name(IconName),
+10
View File
@@ -459,6 +459,16 @@ impl AgentSettingsContent {
});
}
pub fn set_commit_message_model(&mut self, provider: String, model: String) {
self.commit_message_model = Some(LanguageModelSelection {
provider: provider.into(),
model,
enable_thinking: false,
effort: None,
speed: None,
});
}
pub fn set_profile(&mut self, profile_id: Arc<str>) {
self.default_profile = Some(profile_id);
}
+2
View File
@@ -591,6 +591,8 @@ pub mod agent {
/// Toggles the language model selector dropdown.
#[action(deprecated_aliases = ["assistant::ToggleModelSelector", "assistant2::ToggleModelSelector"])]
ToggleModelSelector,
/// Cycles through favorited models in the ACP model selector.
CycleFavoriteModels,
/// Triggers re-authentication on Gemini
ReauthenticateAgent,
/// Logs out of the current external agent