Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

assistant2: Sort tools in the tool selector by ID (#27247)

Browse source 
This PR makes it so the tools in the tool selector are sorted by ID so
that they have a deterministic order.

Release Notes:

- N/A
This commit is contained in:
Marshall Bowers 2025-03-21 10:41:27 -04:00 • committed by GitHub
parent 05aa8880a4
commit 4e93e38b0a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
crates/assistant2/src/tool_selector.rs
View file

@ -2,14 +2,14 @@ use std::sync::Arc;
use assistant_settings::{AgentProfile, AssistantSettings}; use assistant_settings::{AgentProfile, AssistantSettings};
use assistant_tool::{ToolSource, ToolWorkingSet}; use assistant_tool::{ToolSource, ToolWorkingSet};
use collections::HashMap; use collections::BTreeMap;
use gpui::{Entity, Subscription}; use gpui::{Entity, Subscription};
use scripting_tool::ScriptingTool; use scripting_tool::ScriptingTool;
use settings::{Settings as _, SettingsStore}; use settings::{Settings as _, SettingsStore};
use ui::{prelude::*, ContextMenu, PopoverMenu, Tooltip}; use ui::{prelude::*, ContextMenu, PopoverMenu, Tooltip};
pub struct ToolSelector { pub struct ToolSelector {
profiles: HashMap<Arc<str>, AgentProfile>, profiles: BTreeMap<Arc<str>, AgentProfile>,
tools: Arc<ToolWorkingSet>, tools: Arc<ToolWorkingSet>,
_subscriptions: Vec<Subscription>, _subscriptions: Vec<Subscription>,
} }
@ -21,7 +21,7 @@ impl ToolSelector {
}); });
let mut this = Self { let mut this = Self {
profiles: HashMap::default(), profiles: BTreeMap::default(),
tools, tools,
_subscriptions: vec![settings_subscription], _subscriptions: vec![settings_subscription],
}; };
@ -32,16 +32,18 @@ impl ToolSelector {
fn refresh_profiles(&mut self, cx: &mut Context<Self>) { fn refresh_profiles(&mut self, cx: &mut Context<Self>) {
let settings = AssistantSettings::get_global(cx); let settings = AssistantSettings::get_global(cx);
let mut profiles = settings.profiles.clone(); let mut profiles = BTreeMap::from_iter(settings.profiles.clone());
const READ_ONLY_ID: &str = "read-only";
let read_only = AgentProfile::read_only(); let read_only = AgentProfile::read_only();
if !profiles.contains_key(read_only.name.as_ref()) { if !profiles.contains_key(READ_ONLY_ID) {
profiles.insert(read_only.name.clone().into(), read_only); profiles.insert(READ_ONLY_ID.into(), read_only);
} }
const CODE_WRITER_ID: &str = "code-writer";
let code_writer = AgentProfile::code_writer(); let code_writer = AgentProfile::code_writer();
if !profiles.contains_key(code_writer.name.as_ref()) { if !profiles.contains_key(CODE_WRITER_ID) {
profiles.insert(code_writer.name.clone().into(), code_writer); profiles.insert(CODE_WRITER_ID.into(), code_writer);
} }
self.profiles = profiles; self.profiles = profiles;